Rename opal/memory to opal/memoryhooks because XLC++ on Mac OS X is broken.

When compiling C++ code that includes something that looks for the C++
header file "memory" (stupid C++ headers not having .h extensions), it
goes through the header file search path, which includes $(topsrcdir)/opal,
so it finds the directory $(topsrcdir)/opal/memory/ and tries to load
that as the memory header file and all goes downhill.

This commit was SVN r8111.

ompi/mca/mpool/base/mpool_base_mem_cb.h

@@ -28,7 +28,7 @@
 #include "mca/mca.h"
 #include "mca/mpool/mpool.h"
 #include "opal/threads/mutex.h" 
-#include "opal/memory/memory.h"
+#include "opal/memoryhooks/memory.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {

ompi/mca/mpool/mvapi/mpool_mvapi_module.c

@@ -19,7 +19,7 @@
 #include "ompi_config.h"
 #include <string.h>
 #include "opal/util/output.h"
-#include "opal/memory/memory.h"
+#include "opal/memoryhooks/memory.h"
 #include "mca/mpool/mvapi/mpool_mvapi.h"
 #include <vapi.h>
 #include <vapi_types.h> 

ompi/tools/ompi_info/param.cc

@@ -35,7 +35,7 @@
 #include "opal/class/opal_value_array.h"
 #include "opal/util/printf.h"
 #include "opal/util/show_help.h"
-#include "opal/memory/memory.h"
+#include "opal/memoryhooks/memory.h"
 #include "mca/base/mca_base_param.h"
 #include "tools/ompi_info/ompi_info.h"
 

opal/Makefile.am

@@ -73,7 +73,7 @@ endif
 
 include include/Makefile.am
 include class/Makefile.am
-include memory/Makefile.am
+include memoryhooks/Makefile.am
 include runtime/Makefile.am
 include threads/Makefile.am
 include mca/Makefile.am

opal/mca/memory/darwin/memory_darwin_component.c

@@ -25,7 +25,7 @@
 
 #include "opal/include/constants.h"
 #include "opal/mca/memory/memory.h"
-#include "opal/memory/memory_internal.h"
+#include "opal/memoryhooks/memory_internal.h"
 
 static int opal_memory_darwin_open(void);
 static void opal_memory_darwin_free(struct _malloc_zone_t *zone, void *ptr);

opal/mca/memory/malloc_hooks/memory_malloc_hooks.c

@@ -23,7 +23,7 @@
 #include <dlfcn.h>
 #include <malloc.h>
 
-#include "opal/memory/memory_internal.h"
+#include "opal/memoryhooks/memory_internal.h"
      
 /* Prototypes for our hooks.  */
 void opal_memory_malloc_hooks_init(void);

opal/mca/memory/malloc_interpose/memory_malloc_interpose.c

@@ -26,7 +26,7 @@
 
 #include "opal/include/constants.h"
 #include "opal/mca/memory/memory.h"
-#include "opal/memory/memory_internal.h"
+#include "opal/memoryhooks/memory_internal.h"
 
 static int opal_memory_malloc_interpose_open(void);
 

opal/mca/memory/memory.h

@@ -20,7 +20,7 @@
    set of function pointers that must be called or set interface or
    any of that.  The only two functions that a component must call
    (note: call, not implement) are defined in
-   opal/memory/memory_internal.h.  Other than that, to each his
+   opal/memoryhooks/memory_internal.h.  Other than that, to each his
    own.. 
 
    Components should make some attempt to provide a component struct

opal/mca/memory/ptmalloc2/malloc.c

@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-#include "opal/memory/memory_internal.h"
+#include "opal/memoryhooks/memory_internal.h"
 
 /*
  * Not all systems have sbrk() declared, since it's technically not a

opal/mca/memory/ptmalloc2/ptmalloc2_munmap.c

@@ -18,7 +18,7 @@
 
 #include <sys/types.h>
 
-#include "opal/memory/memory_internal.h"
+#include "opal/memoryhooks/memory_internal.h"
 
 #include <stdlib.h>
 #include <sys/mman.h>

opal/memoryhooks/Makefile.am

@@ -20,8 +20,8 @@
 
 # Source code files
 headers += \
-	memory/memory.h \
-	memory/memory_internal.h
+	memoryhooks/memory.h \
+	memoryhooks/memory_internal.h
 
 libopal_la_SOURCES += \
-	memory/memory.c
+	memoryhooks/memory.c

opal/memoryhooks/memory.c

@@ -22,8 +22,8 @@
 #include <sys/mman.h>
 
 #include "opal/util/output.h"
-#include "opal/memory/memory.h"
-#include "opal/memory/memory_internal.h"
+#include "opal/memoryhooks/memory.h"
+#include "opal/memoryhooks/memory_internal.h"
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_object.h"
 #include "ompi/include/constants.h"

opal/runtime/opal_finalize.c

@@ -25,7 +25,7 @@
 #include "opal/util/output.h"
 #include "opal/util/malloc.h"
 #include "opal/util/if.h"
-#include "opal/memory/memory.h"
+#include "opal/memoryhooks/memory.h"
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"
 #include "orte/include/orte_constants.h"

opal/runtime/opal_init.c

@@ -24,7 +24,7 @@
 #include "opal/util/output.h"
 #include "opal/util/trace.h"
 #include "opal/util/show_help.h"
-#include "opal/memory/memory.h"
+#include "opal/memoryhooks/memory.h"
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"
 #include "opal/mca/memory/base/base.h"

orte/tools/orteprobe/orteprobe.c

@@ -53,7 +53,7 @@
 #include "opal/util/daemon_init.h"
 #include "util/universe_setup_file_io.h"
 #include "opal/util/malloc.h"
-#include "opal/memory/memory.h"
+#include "opal/memoryhooks/memory.h"
 #include "opal/mca/timer/base/base.h"
 #include "opal/mca/memory/base/base.h"
 

test/memory/opal_memory_basic.c

@@ -24,7 +24,7 @@
 
 #include "ompi/include/constants.h"
 #include "opal/runtime/opal.h"
-#include "opal/memory/memory.h"
+#include "opal/memoryhooks/memory.h"
 
 int ret = 2;
 int size = 10 * 1024 * 1024;

test/memory/opal_memory_cxx.cc

@@ -23,7 +23,7 @@
 
 #include "ompi/include/constants.h"
 #include "opal/runtime/opal.h"
-#include "opal/memory/memory.h"
+#include "opal/memoryhooks/memory.h"
 
 using namespace std;
 

test/memory/opal_memory_speed.c

@@ -24,7 +24,7 @@
 
 #include "ompi/include/constants.h"
 #include "opal/runtime/opal.h"
-#include "opal/memory/memory.h"
+#include "opal/memoryhooks/memory.h"
 
 #define iters 100000
 #define mask 0xfff