Changeset 2633 in kBuild

Timestamp:

Sep 8, 2012 11:18:59 PM (12 years ago)

Author:

bird

Message:

kmk: CONFIG_WITH_ALLOCCACHE_DEBUG - for optionally turning the allocations over to the heap where they can be checked and fenced in.

Location:

trunk/src/kmk

Files:

• alloccache.c (modified) (5 diffs)
• make.h (modified) (2 diffs)

trunk/src/kmk/alloccache.c

@@ -54 +54 @@
 alloccache_free (struct alloccache *cache, void *item)
 {
+#ifndef CONFIG_WITH_ALLOCCACHE_DEBUG
   struct alloccache_free_ent *f = (struct alloccache_free_ent *)item;
-#if 0 /*ndef NDEBUG*/
+# if 0 /*ndef NDEBUG*/
   struct alloccache_free_ent *c;
   unsigned int i = 0;
@@ -61 +62 @@
     MY_ASSERT_MSG (c != f && i < 0x10000000,
                    ("i=%u total_count=%u\n", i, cache->total_count));
-#endif
+# endif
 
   f->next = cache->free_head;
   cache->free_head = f;
   MAKE_STATS(cache->free_count++;);
+#else
+  free(item);
+#endif
 }
 
@@ -79 +83 @@
 alloccache_alloc_grow (struct alloccache *cache)
 {
+#ifndef CONFIG_WITH_ALLOCCACHE_DEBUG
   void *item;
   unsigned int items = (64*1024 - 32) / cache->size;
@@ -85 +90 @@
   cache->total_count+= items;
 
-#ifndef NDEBUG /* skip the first item so the heap can detect free(). */
+# ifndef NDEBUG /* skip the first item so the heap can detect free(). */
   cache->total_count--;
   cache->free_start += cache->size;
-#endif
+# endif
 
   item = cache->free_start;
@@ -94 +99 @@
   /* caller counts */
   return (struct alloccache_free_ent *)item;
+#else
+  return (struct alloccache_free_ent *)xmalloc(cache->size);
+#endif
 }
 

trunk/src/kmk/make.h

@@ -639 +639 @@
 alloccache_alloc (struct alloccache *cache)
 {
-  struct alloccache_free_ent *f = cache->free_head;
+  struct alloccache_free_ent *f;
+# ifndef CONFIG_WITH_ALLOCCACHE_DEBUG
+  f = cache->free_head;
   if (f)
     cache->free_head = f->next;
@@ -648 +650 @@
     }
   else
+# endif
     f = alloccache_alloc_grow (cache);
   MAKE_STATS(cache->alloc_count++;);