Changeset 115 for trunk/IPs/systemC/processor/Morpheo/Common

Timestamp:

Apr 20, 2009, 11:29:17 PM (16 years ago)

Author:

rosiere

Message:

1) Write queue with mealy
2) Network : fix bug
3) leak memory

Location:

trunk/IPs/systemC/processor/Morpheo/Common

Files:

• include/MemCheck.h (modified) (1 diff)
• src/MemCheck.cpp (modified) (1 diff)
• src/Message.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Common/include/MemCheck.h

@@ -6 +6 @@
 
 // Usurp the new operator (both scalar and array versions)
-void* operator new(std::size_t, const char*, long);
+void* operator new  (std::size_t, const char*, long);
 void* operator new[](std::size_t, const char*, long);
 #define new new (__FILE__, __LINE__)
-  
+
 extern bool traceFlag;
 #define TRACE_ON() traceFlag = true

trunk/IPs/systemC/processor/Morpheo/Common/src/MemCheck.cpp

@@ -1 +1 @@
 #ifdef DEBUG_MEMORY_LEAK
 
+#include "Common/include/Message.h"
 #include <cstdio>
 #include <cstdlib>
 #include <cassert>
 #include <cstddef>
+#include <map>
+
 using namespace std;
+using namespace morpheo;
+
 #undef new
 
 // Global flags set by macros in MemCheck.h
-bool traceFlag  = false;
+bool traceFlag  = true;
 bool activeFlag = false;
 
 namespace {
 
-        // Memory map entry type
-        struct Info {
-                void* ptr;
-                const char* file;
-                long line;
-        };
+  // Memory map entry type
+  struct Info 
+  {
+//  void* ptr;
+    const char* file;
+    long        line;
+    size_t      size;
+  };
 
-        // Memory map data
-        const size_t MAXPTRS = 10000u;
-        Info memMap[MAXPTRS];
-        size_t nptrs = 0;
+  bool Info_lt(std::pair<void *,Info> a, std::pair<void *,Info> b)
+  {
+    return a.second.size < b.second.size;
+  }
+  
+  // Memory map data
+  typedef map<void *,Info>           memMap_t;
+  typedef map<void *,Info>::iterator memMap_it;
 
-        // Searches the map for an address
-        int findPtr(void* p) {
-                for(size_t i = 0; i < nptrs; ++i)
-                        if(memMap[i].ptr == p)
-                                return i;
-                return -1;
+  memMap_t memMap;
+
+  // Searches the map for an address
+  memMap_it findPtr(void* p) 
+  {
+    return memMap.find(p);
+  }
+  
+  void delPtr(void* p) 
+  {
+    memMap_it it = findPtr(p);
+
+    assert(it != memMap.end());
+    
+    // Remove pointer from map
+    memMap.erase(it);
+  }
+
+  // Dummy type for static destructor
+  struct Sentinel 
+  {
+    ~Sentinel() 
+    {
+      size_t size = memMap.size();
+      if(size > 0) 
+        {
+          size_t size_sum = 0;
+          msgWarning("Leaked memory at:\n");
+          for (memMap_it it=memMap.begin();
+               it!=memMap.end();
+               ++it)
+            {
+              size_t s = it->second.size;
+              size_sum += s;
+              
+              msgWarning("\t%p :  %u bytes (file: %s, line %ld)\n",
+                     it->first,
+                     s,
+                     it->second.file,
+                     it->second.line);
+            }
+          msgWarning("Total : %u bytes on %d localisations\n",size_sum, size);
+
+          uint32_t nb_top = (size>10)?10:size;
+          msgWarning("Top %d of leaked memory\n",nb_top);
+          for (uint32_t i=0; i<nb_top; ++i)
+            {
+              memMap_it max = max_element(memMap.begin(), memMap.end(),Info_lt);
+
+              msgWarning("  * [%d] %u bytes (file: %s, line %ld)\n",
+                         i,
+                         max->second.size,
+                         max->second.file,
+                         max->second.line);
+
+              memMap.erase(max);
+            }
         }
-
-        void delPtr(void* p) {
-                int pos = findPtr(p);
-                assert(pos >= 0);
-                // Remove pointer from map
-                for(size_t i = pos; i < nptrs-1; ++i)
-                        memMap[i] = memMap[i+1];
-                --nptrs;
-        }
-
-        // Dummy type for static destructor
-        struct Sentinel {
-                ~Sentinel() {
-                        if(nptrs > 0) {
-                                printf("Leaked memory at:\n");
-                                for(size_t i = 0; i < nptrs; ++i)
-                                        printf("\t%p (file: %s, line %ld)\n",
-                                                        memMap[i].ptr, memMap[i].file, memMap[i].line);
-                        }
-                        else
-                                printf("No user memory leaks!\n");
-                }
-        };
-
-        // Static dummy object
-        Sentinel s;
-
+      else
+        msgInformation("No user memory leaks!\n");
+    }
+  };
+  
+  // Static dummy object
+  Sentinel s;
+  
 } // End anonymous namespace
 
 // Overload scalar new
-void* operator new(size_t siz, const char* file, long line) {
-        void* p = malloc(siz);
-        if(activeFlag) {
-                if(nptrs == MAXPTRS) {
-                        printf("memory map too small (increase MAXPTRS)\n");
-                        exit(1);
-                }
-                memMap[nptrs].ptr = p;
-                memMap[nptrs].file = file;
-                memMap[nptrs].line = line;
-                ++nptrs;
-        }
-        if(traceFlag) {
-                printf("Allocated %u bytes at address %p ", siz, p);
-                printf("(file: %s, line: %ld)\n", file, line);
-        }
-        return p;
+void* operator new(size_t size, const char* file, long line) 
+{
+  void* p = malloc(size);
+
+  if(activeFlag) 
+    {
+      Info info;
+      info.file = file;
+      info.line = line;
+      info.size = size;
+
+      memMap[p] = info;
+    }
+  
+  if(traceFlag) 
+    {
+      msgInformation("Allocated %u bytes at address %p (file: %s, line: %ld)\n", size, p, file, line);
+    }
+
+  return p;
 }
 
 // Overload array new
-void* operator new[](size_t siz, const char* file, long line) {
-        return operator new(siz, file, line);
+void* operator new[](size_t size, const char* file, long line) 
+{
+  return operator new(size, file, line);
 }
 
 // Override scalar delete
-void operator delete(void* p) {
-        if(findPtr(p) >= 0) {
-                free(p);
-                assert(nptrs > 0);
-                delPtr(p);
-                if(traceFlag)
-                        printf("Deleted memory at address %p\n", p);
-        }
-        else if(!p && activeFlag)
-                printf("Attempt to delete unknown pointer: %p\n", p);
+void operator delete(void* p) 
+{
+  memMap_it it = findPtr(p);
+  
+  if (it != memMap.end())
+    {
+      free(p);
+      delPtr(p);
+
+      if(traceFlag)
+        msgInformation("Deleted memory at address %p\n", p);
+    }
+  else 
+    if(!p && activeFlag)
+      msgError("Attempt to delete unknown pointer: %p\n", p);
 }
 
 // Override array delete
-void operator delete[](void* p) {
-        operator delete(p);
+void operator delete[](void* p) 
+{
+  operator delete(p);
 } 
+
 #endif // DEBUG_MEMORY_LEAK

trunk/IPs/systemC/processor/Morpheo/Common/src/Message.cpp

@@ -6 +6 @@
  */
 
-#include "Common/include/Debug.h"
+#include <sys/types.h>
 #include "Common/include/Environment.h"
 #include "Common/include/ErrorMorpheo.h"
 #include "Common/include/Filename.h"
-#include <sys/types.h>
+#include "Common/include/Debug.h"
 
 namespace morpheo {