Changeset 593 in svn for branches/1.3/mem.c

Timestamp:

2009-07-05T04:06:15Z (8 years ago)

Author:

Xuefer

Message:

merged r304,r305,r306,r307 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• mem.c (modified) (10 diffs)

branches/1.3/mem.c

@@ -13 +13 @@
 #include "xc_shm.h"
 #include "align.h"
+#include "utils.h"
 
 #ifdef TEST
-#   define ALLOC_DEBUG
-#endif
-#ifdef ALLOC_DEBUG
+#   define DEBUG
+#endif
+#ifdef DEBUG
 #   define ALLOC_DEBUG_BLOCK_CHECK
 #endif
@@ -91 +92 @@
     realsize = ALIGN(realsize);
 
-#ifdef ALLOC_DEBUG
-    fprintf(stderr, "avail: %d (%dKB). Allocate size: %d realsize: %d (%dKB)"
+    TRACE("avail: %d (%dKB). Allocate size: %d realsize: %d (%dKB)"
             , mem->avail, mem->avail / 1024
             , size
             , realsize, realsize / 1024
             );
-#endif
     do {
         p = NULL;
         if (mem->avail < realsize) {
-#ifdef ALLOC_DEBUG
-            fprintf(stderr, " oom\n");
-#endif
+            TRACE("%s", " oom");
             break;
         }
@@ -132 +129 @@
 
         if (b == NULL) {
-#ifdef ALLOC_DEBUG
-            fprintf(stderr, " no fit chunk\n");
-#endif
+            TRACE("%s", " no fit chunk");
             break;
         }
@@ -149 +144 @@
         if (cur->size == realsize) {
             prev->next = cur->next;
-#ifdef ALLOC_DEBUG
-            fprintf(stderr, " perfect fit. Got: %p\n", p);
-#endif
+            TRACE(" perfect fit. Got: %p", p);
             break;
         }
@@ -169 +162 @@
          */
 
-#ifdef ALLOC_DEBUG
-        fprintf(stderr, " -> avail: %d (%dKB). new next: %p offset: %d %dKB. Got: %p\n"
+        TRACE(" -> avail: %d (%dKB). new next: %p offset: %d %dKB. Got: %p"
                 , mem->avail, mem->avail / 1024
                 , newb
@@ -176 +168 @@
                 , p
                 );
-#endif
         prev->next = newb;
         /* prev|cur|newb|next
@@ -193 +184 @@
 
     cur = (xc_block_t *) (CHAR_PTR(p) - BLOCK_HEADER_SIZE());
-#ifdef ALLOC_DEBUG
-    fprintf(stderr, "freeing: %p", p);
-    fprintf(stderr, ", size=%d", cur->size);
-#endif
+    TRACE("freeing: %p, size=%d", p, cur->size);
     xc_block_check(cur);
     assert((char*)mem < (char*)cur && (char*)cur < (char*)mem + mem->size);
@@ -211 +199 @@
     size = cur->size;
 
-#ifdef ALLOC_DEBUG
-    fprintf(stderr, ", avail %d (%dKB)", mem->avail, mem->avail / 1024);
-#endif
+    TRACE(" avail %d (%dKB)", mem->avail, mem->avail / 1024);
     mem->avail += size;
 
@@ -221 +207 @@
         b->next = cur->next;
         cur = b;
-#ifdef ALLOC_DEBUG
-        fprintf(stderr, ", combine prev");
-#endif
+        TRACE("%s", " combine prev");
     }
 
@@ -231 +215 @@
         cur->size += b->size;
         cur->next = b->next;
-#ifdef ALLOC_DEBUG
-        fprintf(stderr, ", combine next");
-#endif
-    }
-#ifdef ALLOC_DEBUG
-    fprintf(stderr, " -> avail %d (%dKB)\n", mem->avail, mem->avail / 1024);
-#endif
+        TRACE("%s", " combine next");
+    }
+    TRACE(" -> avail %d (%dKB)", mem->avail, mem->avail / 1024);
     return size;
 }