Move malloc.h from src/lam/util to src/lam/mem

This commit was SVN r382.

src/lam/ctnetwork/ctmessage.c

@@ -3,7 +3,7 @@
  */
 
 #include "lam/ctnetwork/ctmessage.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 
 
 lam_class_info_t     lam_ctctrl_cls = {"lam_ct_ctrl_t", &lam_object_cls, 

src/lam/mem/Makefile.am

@@ -12,6 +12,7 @@ noinst_LTLIBRARIES = libmem.la
 headers = \
 	allocator.h \
 	free_lists.h \
+        malloc.h \
 	mem_globals.h \
 	mem_pool.h \
 	seg_list.h \

src/lam/mem/mem_pool.c

@@ -8,8 +8,8 @@
 #include "lam/constants.h"
 #include "lam/mem/mem_pool.h"
 #include "lam/mem/sharedmem_util.h"
+#include "lam/mem/malloc.h"
 #include "lam/util/output.h"
-#include "lam/util/malloc.h"
 #include "lam/os/numa.h"
 
 lam_class_info_t mem_pool_cls = {"lam_mem_pool_t", &lam_object_cls, 

src/lam/util/Makefile.am

@@ -14,7 +14,6 @@ headers = \
     cmd_line.h \
     few.h \
     if.h \
-    malloc.h \
     output.h \
     path.h \
     reactor.h \

src/lam/util/cmd_line.c

@@ -11,7 +11,7 @@
 
 #include "lam/lfc/object.h"
 #include "lam/lfc/list.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "lam/util/argv.h"
 #include "lam/util/cmd_line.h"
 #include "lam/util/strncpy.h"

src/lam/util/if.c

@@ -1,3 +1,7 @@
+/*
+ * $HEADER$
+ */
+
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
@@ -8,9 +12,10 @@
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <netdb.h>
+
 #include "lam/constants.h"
 #include "lam/lfc/list.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "lam/util/if.h"
 #include "lam/util/output.h"
 
@@ -31,10 +36,10 @@ typedef struct lam_if_t lam_if_t;
 static lam_list_t lam_if_list;
 
 
-//
+/*
-//  Discover the list of configured interfaces. Don't care about any
+ *  Discover the list of configured interfaces. Don't care about any
-//  interfaces that are not up or are local loopbacks.
+ *  interfaces that are not up or are local loopbacks.
-//
+ */
 
 static int lam_ifinit(void) 
 {
@@ -135,10 +140,10 @@ static int lam_ifinit(void)
 }
 
 
-//
+/*
-//  Look for interface by name and returns its address 
+ *  Look for interface by name and returns its address 
-//  as a dotted decimal formatted string.
+ *  as a dotted decimal formatted string.
-//
+ */
 
 int lam_ifnametoaddr(const char* if_name, char* if_addr, int length)
 {
@@ -158,10 +163,10 @@ int lam_ifnametoaddr(const char* if_name, char* if_addr, int length)
     return LAM_ERROR;
 }
 
-//
+/*
-//  Attempt to resolve the adddress as either a dotted decimal formated
+ *  Attempt to resolve the adddress as either a dotted decimal formated
-//  string or a hostname and lookup corresponding interface.
+ *  string or a hostname and lookup corresponding interface.
-//
+ */
 
 int lam_ifaddrtoname(const char* if_addr, char* if_name, int length)
 {
@@ -191,9 +196,9 @@ int lam_ifaddrtoname(const char* if_addr, char* if_name, int length)
     return LAM_SUCCESS;
 }
 
-//
+/*
-//  Return the number of discovered interface.
+ *  Return the number of discovered interface.
-//
+ */
 
 int lam_ifcount()
 {
@@ -203,10 +208,10 @@ int lam_ifcount()
 }
 
 
-//
+/*
-//  Return the kernels interface index for the first
+ *  Return the kernels interface index for the first
-//  interface in our list.
+ *  interface in our list.
-//
+ */
 
 int lam_ifbegin()
 {
@@ -219,11 +224,11 @@ int lam_ifbegin()
 }
 
 
-//
+/*
-//  Located the current position in the list by if_index and
+ *  Located the current position in the list by if_index and
-//  return the interface index of the next element in our list
+ *  return the interface index of the next element in our list
-//  (if it exists).
+ *  (if it exists).
-//
+ */
 
 int lam_ifnext(int if_index)
 {
@@ -243,10 +248,10 @@ int lam_ifnext(int if_index)
 }
 
 
-// 
+/* 
-//  Lookup the interface by kernel index and return the 
+ *  Lookup the interface by kernel index and return the 
-//  primary address assigned to the interface.
+ *  primary address assigned to the interface.
-//
+ */
 
 int lam_ifindextoaddr(int if_index, char* if_addr, int length)
 {
@@ -267,10 +272,10 @@ int lam_ifindextoaddr(int if_index, char* if_addr, int length)
 }
 
 
-// 
+/* 
-//  Lookup the interface by kernel index and return
+ *  Lookup the interface by kernel index and return
-//  the associated name.
+ *  the associated name.
-//
+ */
 
 int lam_ifindextoname(int if_index, char* if_name, int length)
 {

src/lam/util/output.c

@@ -17,7 +17,7 @@
 #include <unistd.h>
 
 #include "lam/constants.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "lam/util/output.h"
 #include "lam/threads/mutex.h"
 

src/lam/util/path.c

@@ -2,16 +2,16 @@
  * $HEADER$
  */
 
+/** @file **/
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "lam_config.h"
+#include "lam/mem/malloc.h"
 #include "lam/util/path.h"
 #include "lam/util/argv.h"
-#include "lam/util/malloc.h"
-
-/** @file **/
 
 /**
  * PATH environment variable separator

src/lam/util/reactor.c

@@ -9,8 +9,8 @@
 #include <errno.h>
 
 #include "lam_config.h"
+#include "lam/mem/malloc.h"
 #include "lam/util/reactor.h"
-#include "lam/util/malloc.h"
 #include "lam/util/output.h"
 
 

src/mca/lam/base/mca_lam_param.c

@@ -10,7 +10,7 @@
 
 #include "lam/constants.h"
 #include "lam/lfc/array.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "mca/mca.h"
 #include "mca/lam/base/param.h"
 

src/mca/lam/oob/cofs/src/oob_cofs.c

@@ -8,7 +8,7 @@
 
 #include "mca/lam/oob/oob.h"
 #include "mca/lam/oob/cofs/src/oob_cofs.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "lam/types.h"
 
 #include <stdio.h>

src/mca/lam/pcm/cofs/src/pcm_cofs.c

@@ -8,7 +8,7 @@
 
 #include "mca/lam/pcm/pcm.h"
 #include "mca/lam/pcm/cofs/src/pcm_cofs.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "lam/types.h"
 
 #include <stdio.h>

src/mca/lam/pcm/cofs/src/pcm_cofs_module.c

@@ -8,7 +8,7 @@
 
 #include "lam/constants.h"
 #include "lam/types.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "mca/mca.h"
 #include "mca/lam/pcm/pcm.h"
 #include "mca/lam/pcm/cofs/src/pcm_cofs.h"

src/mca/lam/registry/cofs/src/registry_cofs.c

@@ -8,7 +8,7 @@
 
 #include "mca/lam/registry/registry.h"
 #include "mca/lam/registry/cofs/src/registry_cofs.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "lam/types.h"
 
 #include <stdio.h>

src/mca/mpi/base/mca_mpi_mem.c

@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "mpi.h"
 #include "mca/mca.h"
 #include "mca/mpi/mpi.h"

src/mca/mpi/coll/basic/src/coll_basic_alltoall.c

@@ -10,7 +10,7 @@
 
 #include "lam/constants.h"
 #include "mpi.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "mpi/datatype/datatype.h"
 #include "mca/mpi/coll/coll.h"
 #include "coll_basic.h"

src/mca/mpi/coll/basic/src/coll_basic_alltoallv.c

@@ -10,7 +10,7 @@
 
 #include "lam/constants.h"
 #include "mpi.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "mpi/datatype/datatype.h"
 #include "mca/mpi/coll/coll.h"
 #include "coll_basic.h"

src/mca/mpi/coll/basic/src/coll_basic_alltoallw.c

@@ -10,7 +10,7 @@
 
 #include "lam/constants.h"
 #include "mpi.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "mpi/datatype/datatype.h"
 #include "mca/mpi/coll/coll.h"
 #include "coll_basic.h"

src/mca/mpi/coll/basic/src/coll_basic_exscan.c

@@ -8,7 +8,7 @@
 #include <stdio.h>
 
 #include "lam/constants.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
 #include "coll_basic.h"

src/mca/mpi/coll/basic/src/coll_basic_reduce.c

@@ -8,7 +8,7 @@
 #include <stdio.h>
 
 #include "lam/constants.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
 #include "coll_basic.h"

src/mca/mpi/coll/basic/src/coll_basic_reduce_scatter.c

@@ -9,7 +9,7 @@
 #include <errno.h>
 
 #include "lam/constants.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
 #include "coll_basic.h"

src/mca/mpi/coll/basic/src/coll_basic_scan.c

@@ -8,7 +8,7 @@
 #include <stdio.h>
 
 #include "lam/constants.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
 #include "coll_basic.h"

src/mca/mpi/pml/teg/src/pml_ptl_array.c

@@ -3,7 +3,7 @@
  */
 
 #include <string.h>
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "pml_ptl_array.h"
 
 

src/mca/mpi/pml/teg/src/pml_teg.c

@@ -1,4 +1,8 @@
-#include "lam/util/malloc.h"
+/*
+ * $HEADER$
+ */
+
+#include "lam/mem/malloc.h"
 #include "mca/mpi/pml/pml.h"
 #include "mca/mpi/ptl/ptl.h"
 #include "mca/mpi/ptl/base/ptl_base_comm.h"

src/mca/mpi/pml/teg/src/pml_teg_module.c

@@ -1,5 +1,9 @@
+/*
+ * $HEADER$
+ */
+
 #include "mpi.h"
-#include "lam/util/malloc.h"
+#include "lam/mem/malloc.h"
 #include "mca/mpi/pml/pml.h"
 #include "mca/mpi/ptl/ptl.h"
 #include "mca/mpi/ptl/base/ptl_base_sendreq.h"

src/mca/mpi/ptl/tcp/src/ptl_tcp.c

@@ -1,4 +1,8 @@
-#include "lam/util/malloc.h"
+/*
+ * $HEADER$
+ */
+
+#include "lam/mem/malloc.h"
 #include "mca/mpi/pml/pml.h"
 #include "mca/mpi/ptl/ptl.h"
 #include "ptl_tcp.h"

src/mca/mpi/ptl/tcp/src/ptl_tcp_module.c

@@ -1,4 +1,8 @@
-#include "lam/util/malloc.h"
+/*
+ * $HEADER$
+ */
+
+#include "lam/mem/malloc.h"
 #include "mca/mpi/pml/pml.h"
 #include "mca/mpi/ptl/ptl.h"
 #include "ptl_tcp.h"