OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mt_allocator.h (__mt_alloc<>::allocate, [...]): Avoid redundant conditionals.

Browse Source 
2004-03-24  Paolo Carlini  <pcarlini@suse.de>

	* include/ext/mt_allocator.h (__mt_alloc<>::allocate,
	__mt_alloc<>::deallocate): Avoid redundant conditionals.

From-SVN: r79917
This commit is contained in:
Paolo Carlini 2004-03-24 15:25:37 +00:00 committed by Paolo Carlini
parent 398a94926c
commit affb18b2fa
2 changed files with 15 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2004-03-24 Paolo Carlini <pcarlini@suse.de>
* include/ext/mt_allocator.h (__mt_alloc<>::allocate,
__mt_alloc<>::deallocate): Avoid redundant conditionals.
2004-03-23 Benjamin Kosnik <bkoz@redhat.com> 2004-03-23 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.h: Tweaks for 80 column. * include/bits/locale_facets.h: Tweaks for 80 column.

57
libstdc++-v3/include/ext/mt_allocator.h
View File

@ -353,16 +353,8 @@ namespace __gnu_cxx
tmp = __bin.first[0]->next; tmp = __bin.first[0]->next;
block = __bin.first[0]; block = __bin.first[0];
if (__bin.first[__thread_id] == NULL) block->next = __bin.first[__thread_id];
{ __bin.first[__thread_id] = block;
__bin.first[__thread_id] = block;
block->next = NULL;
}
else
{
block->next = __bin.first[__thread_id];
__bin.first[__thread_id] = block;
}
block->thread_id = __thread_id; block->thread_id = __thread_id;
__bin.free[__thread_id]++; __bin.free[__thread_id]++;
@ -466,16 +458,8 @@ namespace __gnu_cxx
while (remove > 0) while (remove > 0)
{ {
tmp = __bin.first[thread_id]->next; tmp = __bin.first[thread_id]->next;
if (__bin.first[0] == NULL) __bin.first[thread_id]->next = __bin.first[0];
{ __bin.first[0] = __bin.first[thread_id];
__bin.first[0] = __bin.first[thread_id];
__bin.first[0]->next = NULL;
}
else
{
__bin.first[thread_id]->next = __bin.first[0];
__bin.first[0] = __bin.first[thread_id];
}
__bin.first[thread_id] = tmp; __bin.first[thread_id] = tmp;
__bin.free[thread_id]--; __bin.free[thread_id]--;
@ -486,41 +470,20 @@ namespace __gnu_cxx
// Return this block to our list and update counters and // Return this block to our list and update counters and
// owner id as needed. // owner id as needed.
if (__bin.first[thread_id] == NULL) block->next = __bin.first[thread_id];
{ __bin.first[thread_id] = block;
__bin.first[thread_id] = block;
block->next = NULL;
}
else
{
block->next = __bin.first[thread_id];
__bin.first[thread_id] = block;
}
__bin.free[thread_id]++; __bin.free[thread_id]++;
if (thread_id == block->thread_id) __bin.used[block->thread_id]--;
__bin.used[thread_id]--; block->thread_id = thread_id;
else
{
__bin.used[block->thread_id]--;
block->thread_id = thread_id;
}
} }
else else
#endif #endif
{ {
// Single threaded application - return to global pool. // Single threaded application - return to global pool.
if (__bin.first[0] == NULL) block->next = __bin.first[0];
{ __bin.first[0] = block;
__bin.first[0] = block;
block->next = NULL;
}
else
{
block->next = __bin.first[0];
__bin.first[0] = block;
}
} }
} }