diff options
author | Nathan Binkert <nate@binkert.org> | 2008-09-27 00:15:45 -0700 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2008-09-27 00:15:45 -0700 |
commit | 83f3bff6431a7fbf0a06cc382117af52c4c1ad3b (patch) | |
tree | 6bd4b8f30d7b40ab8876fceeee090a7199e92ecd /src/base/fast_alloc.cc | |
parent | ca4baf387134f75b5e78a22c4c18d63fb5f48201 (diff) | |
download | gem5-83f3bff6431a7fbf0a06cc382117af52c4c1ad3b.tar.xz |
add a bit of style
Diffstat (limited to 'src/base/fast_alloc.cc')
-rw-r--r-- | src/base/fast_alloc.cc | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/base/fast_alloc.cc b/src/base/fast_alloc.cc index 3e43ad94c..a91a99d20 100644 --- a/src/base/fast_alloc.cc +++ b/src/base/fast_alloc.cc @@ -34,7 +34,8 @@ * by permission. */ -#include <assert.h> +#include <cassert> + #include "base/fast_alloc.hh" #if !NO_FAST_ALLOC @@ -51,7 +52,8 @@ unsigned FastAlloc::deleteCount[Num_Buckets]; unsigned FastAlloc::allocCount[Num_Buckets]; #endif -void *FastAlloc::moreStructs(int bucket) +void * +FastAlloc::moreStructs(int bucket) { assert(bucket > 0 && bucket < Num_Buckets); @@ -71,14 +73,13 @@ void *FastAlloc::moreStructs(int bucket) return (p + sz); } - #if FAST_ALLOC_DEBUG -#include <typeinfo> -#include <iostream> #include <iomanip> +#include <iostream> #include <map> #include <string> +#include <typeinfo> using namespace std; @@ -97,7 +98,6 @@ FastAlloc::FastAlloc(FastAlloc *prev, FastAlloc *next) inUseNext = next; } - // constructor: marks as in use, add to in-use list FastAlloc::FastAlloc() { @@ -131,7 +131,6 @@ FastAlloc::~FastAlloc() inUseNext->inUsePrev = inUsePrev; } - // summarize in-use list void FastAlloc::dump_summary() @@ -148,20 +147,16 @@ FastAlloc::dump_summary() cout << " count type\n" << " ----- ----\n"; for (mapiter = typemap.begin(); mapiter != typemap.end(); ++mapiter) - { cout << setw(6) << mapiter->second << " " << mapiter->first << endl; - } } - // show oldest n items on in-use list void FastAlloc::dump_oldest(int n) { // sanity check: don't want to crash the debugger if you forget to // pass in a parameter - if (n < 0 || n > numInUse) - { + if (n < 0 || n > numInUse) { cout << "FastAlloc::dump_oldest: bad arg " << n << " (" << numInUse << " objects in use" << endl; return; @@ -170,12 +165,9 @@ FastAlloc::dump_oldest(int n) for (FastAlloc *p = inUseHead.inUseNext; p != &inUseHead && n > 0; p = p->inUseNext, --n) - { cout << p << " " << typeid(*p).name() << endl; - } } - // // C interfaces to FastAlloc::dump_summary() and FastAlloc::dump_oldest(). // gdb seems to have trouble with calling C++ functions directly. @@ -192,6 +184,6 @@ fast_alloc_oldest(int n) FastAlloc::dump_oldest(n); } -#endif +#endif // FAST_ALLOC_DEBUG #endif // NO_FAST_ALLOC |