diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-30 08:36:07 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-30 08:36:07 +0000 |
commit | cd7dae28b034deebc9c2c2469ed9d8f1f3dab1ed (patch) | |
tree | 80cead86cff364718c968849e1c185121a79892d /sca-cpp/trunk/kernel/list.hpp | |
parent | a9941f3ba6624b88ef62a2a7bf260f50761ffbf9 (diff) |
Added debug macros and cleaned up debug logging. Added locking macros used when compiling for multithreading. Fixed value conversions to numbers. Fixed compile warnings.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@885348 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/kernel/list.hpp')
-rw-r--r-- | sca-cpp/trunk/kernel/list.hpp | 51 |
1 files changed, 35 insertions, 16 deletions
diff --git a/sca-cpp/trunk/kernel/list.hpp b/sca-cpp/trunk/kernel/list.hpp index c21efe173b..da00a5a40d 100644 --- a/sca-cpp/trunk/kernel/list.hpp +++ b/sca-cpp/trunk/kernel/list.hpp @@ -28,27 +28,46 @@ #include <iostream> #include "function.hpp" +#include "debug.hpp" namespace tuscany { -long countlists = 0; -long countIlists = 0; -long countClists = 0; -long countElists = 0; +#ifdef _DEBUG + +/** + * Debug counters. + */ +long countLists = 0; +long countILists = 0; +long countCLists = 0; +long countELists = 0; bool resetListCounters() { - countlists = countIlists = countClists = countElists = 0; + countLists = countILists = countCLists = countELists = 0; return true; } +bool checkListCounters() { + return countLists == 0; +} + bool printListCounters() { - std::cout << "countlists " << countlists << std::endl; - std::cout << "countElists " << countElists << std::endl; - std::cout << "countIlists " << countIlists << std::endl; - std::cout << "countClists " << countClists << std::endl; + std::cout << "countLists " << countLists << std::endl; + std::cout << "countELists " << countELists << std::endl; + std::cout << "countILists " << countILists << std::endl; + std::cout << "countCLists " << countCLists << std::endl; return true; } +#else + +#define resetListCounters() +#define checkListCounters() true +#define printListCounters() + +#endif + + /** * A car/cdr lisp-like pair, base structure to construct lists. */ @@ -57,20 +76,20 @@ template<typename T> class list { public: list() { - countlists++; - countElists++; + debug_inc(countLists); + debug_inc(countELists); } list(const T car, const lambda<list<T> ()>& cdr) : car(car), cdr(cdr) { - countlists++; - countIlists++; + debug_inc(countLists); + debug_inc(countILists); } list(const list& p) : car(p.car), cdr(p.cdr) { - countlists++; - countClists++; + debug_inc(countLists); + debug_inc(countCLists); } const list& operator=(const list<T>& p) { @@ -82,7 +101,7 @@ public: } ~list() { - countlists--; + debug_dec(countLists); } const bool operator==(const list<T>& p) const { |