Changeset 454 for trunk/src/t-test1.c

Timestamp:

Jun 29, 2014, 7:30:04 AM (10 years ago)

Author:

katerina

Message:

Fix for ticket #355 (use calloc instead of malloc).

File:

• trunk/src/t-test1.c (modified) (8 diffs)

trunk/src/t-test1.c

@@ -27 +27 @@
  * allocated bins per thread.
  */
+/*
+  t-test[12] <n-total> <n-parallel> <n-allocs> <size-max> <bins>
+
+    n-total = total number of threads executed (default 10)
+    n-parallel = number of threads running in parallel (2)
+    n-allocs = number of malloc()'s / free()'s per thread (10000)
+    size-max = max. size requested with malloc() in bytes (10000)
+    bins = number of bins to maintain
+*/
+
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
@@ -52 +62 @@
 
 #ifdef USE_SYSTEM_MALLOC
-#define memalign(a,b)  malloc(b)
+extern void *memalign(size_t boundary, size_t size);
+/* #define memalign(a,b)  malloc(b) */
 #else
 extern void *memalign(size_t boundary, size_t size);
@@ -203 +214 @@
 /* Allocate a bin with malloc(), realloc() or memalign().  r must be a
    random number >= 1024. */
+int n_malloc=0, n_memalign=0, n_realloc=0, n_calloc=0;
 
 static void
@@ -219 +231 @@
                 m->ptr = (unsigned char *)memalign(sizeof(int) << r, size);
                 /* fprintf(stderr, "FIXME memalign %p\n", m->ptr); */
+                ++n_memalign;
         } else if(r < 20) { /* calloc */
                 if(m->size > 0) free(m->ptr);
@@ -232 +245 @@
                 }
 #endif
+                ++n_calloc;
                 /* fprintf(stderr, "FIXME calloc %p\n", m->ptr); */
         } else if(r < 100 && m->size < REALLOC_MAX) { /* realloc */
@@ -237 +251 @@
                 m->ptr = realloc(m->ptr, size);
                 /* fprintf(stderr, "FIXME realloc %p\n", m->ptr); */
+                ++n_realloc;
         } else { /* plain malloc */
                 if(m->size > 0) free(m->ptr);
                 m->ptr = (unsigned char *)malloc(size);
                 /* fprintf(stderr, "FIXME malloc %p\n", m->ptr); */
+                ++n_malloc;
         }
         if(!m->ptr) {
@@ -540 +556 @@
                 if (verbose)
                   if(n_total%N_TOTAL_PRINT == 0)
-                        printf("n_total = %d\n", n_total);
+                        printf("n_total = %8d - malloc %12d / memalign %12d / realloc %12d / calloc %12d\n", 
+                                   n_total, 
+                                   n_malloc, n_memalign, n_realloc, n_calloc);
                 
         }
@@ -578 +596 @@
         printf("ptmalloc_init\n");
 #endif
+
+        if((argc > 1) && (0 == strcmp(argv[1], "-h") || 0 == strcmp(argv[1], "--help")))
+          {
+                printf("%s <n-total> <n-parallel> <n-allocs> <size-max> <bins>\n\n", argv[0]);
+                printf(" n-total = total number of threads executed (default 10)\n");
+                printf(" n-parallel = number of threads running in parallel (2)\n");
+                printf(" n-allocs = number of malloc()'s / free()'s per thread (10000)\n");
+                printf(" size-max = max. size requested with malloc() in bytes (10000)\n");
+                printf(" bins = number of bins to maintain\n");
+                return 0;
+          }
 
         if(argc > 1) n_total_max = atoi(argv[1]);