* make sure to try munmap when testing the hooks

* add check to see impact of our hooks with malloc/free timings

This commit was SVN r6817.

test/memory/Makefile.am

@@ -17,7 +17,8 @@
 include $(top_srcdir)/test/support/Makefile.options
 
 check_PROGRAMS = \
-	opal_memory_basic
+	opal_memory_basic \
+	opal_memory_speed
 
 TESTS = \
 	$(check_PROGRAMS)
@@ -27,3 +28,9 @@ opal_memory_basic_LDADD = \
         $(top_builddir)/opal/libopal.la \
         $(top_builddir)/test/support/libsupport.a 
 opal_memory_basic_DEPENDENCIES = $(opal_memory_basic_LDADD)
+
+opal_memory_speed_SOURCES = opal_memory_speed.c
+opal_memory_speed_LDADD = \
+        $(top_builddir)/opal/libopal.la \
+        $(top_builddir)/test/support/libsupport.a 
+opal_memory_speed_DEPENDENCIES = $(opal_memory_speed_LDADD)

test/memory/opal_memory_basic.c

@@ -18,6 +18,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <sys/mman.h>
 
 #include "ompi/include/constants.h"
 #include "opal/runtime/opal.h"
@@ -53,6 +54,9 @@ main(int argc, char *argv[])
     foo = malloc(size);
     free(foo);
 
+    /* and check munmap directly */
+    munmap(NULL, 0);
+
     retval = opal_mem_free_unregister_handler(callback);
     if (retval != OMPI_SUCCESS) return retval;
 

test/memory/opal_memory_speed.c

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/time.h>
+
+#include "ompi/include/constants.h"
+#include "opal/runtime/opal.h"
+#include "opal/memory/memory.h"
+
+#define iters 10000
+
+static void* ptrs[iters];
+
+int
+main(int argc, char *argv[])
+{
+    int i;
+    struct timeval start, end;
+    long time;
+
+    gettimeofday(&start, NULL);
+    for (i = 0 ; i < iters ; ++i) {
+        /* malloc out a random size from 1 to 256 bytes */
+        ptrs[i] = malloc((rand() & 0xff) + 1);
+    }
+    gettimeofday(&end, NULL);
+    time = ((end.tv_sec - start.tv_sec) * 1000 * 1000) +
+        (end.tv_usec - start.tv_usec);
+    printf("malloc: %d calls in %ld microseconds.  %lf microseconds/call\n",
+           iters, time, (double) time / iters);
+    gettimeofday(&start, NULL);
+    for (i = 0 ; i < iters ; ++i) {
+        free(ptrs[i]);
+    }
+    gettimeofday(&end, NULL);
+    time = ((end.tv_sec - start.tv_sec) * 1000 * 1000) +
+        (end.tv_usec - start.tv_usec);
+    printf("free: %d calls in %ld microseconds.  %lf microseconds/call\n",
+           iters, time, (double) time / iters);
+
+    return 0;
+}