Changeset 2745 for trunk/src/kmk

Timestamp:

Jan 3, 2015, 8:32:00 PM (11 years ago)

Author:

bird

Message:

Some heap stats stuff.

Location:

trunk/src/kmk

Files:

• hash.c (modified) (1 diff)
• incdep.c (modified) (1 diff)
• make.h (modified) (1 diff)
• misc.c (modified) (1 diff)

trunk/src/kmk/hash.c

@@ -22 +22 @@
 
 
-#define CALLOC(t, n) ((t *) calloc (sizeof (t), (n)))
+/*#define       CALLOC(t, n) ((t *) calloc (sizeof (t), (n)))*/
+#define CALLOC(t, n) ((t *) xcalloc (sizeof (t) * (n)))
 #define MALLOC(t, n) ((t *) xmalloc (sizeof (t) * (n)))
 #define REALLOC(o, t, n) ((t *) xrealloc ((o), sizeof (t) * (n)))

trunk/src/kmk/incdep.c

@@ -256 +256 @@
 
 #if 0
-/* memset(malloc(sz),'\0',sz) wrapper. */
+/* cmalloc wrapper */
 static void *
 incdep_xcalloc (struct incdep *cur, size_t size)

trunk/src/kmk/make.h

@@ -214 +214 @@
 # ifdef __APPLE__
 #  include <malloc/malloc.h>
-#  define SIZE_OF_HEAP_BLOCK(ptr)   malloc_good_size(ptr)
+#  define SIZE_OF_HEAP_BLOCK(ptr)   malloc_size(ptr)
 
 # elif defined(__linux__) /* glibc */

trunk/src/kmk/misc.c

@@ -455 +455 @@
   if (result == 0)
     fatal (NILF, _("virtual memory exhausted"));
+
+#ifdef CONFIG_WITH_MAKE_STATS
+  make_stats_allocations++;
+  if (make_expensive_statistics)
+    make_stats_allocated += SIZE_OF_HEAP_BLOCK (result);
+  else
+    make_stats_allocated += size;
+#endif
   return result;
 }