From e3973285fd2b284f4694c660667afc1874983c5b Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 14 Jan 2004 23:24:15 +0000 Subject: [PATCH] Move malloc.h from src/lam/util to src/lam/mem This commit was SVN r382. --- src/lam/ctnetwork/ctmessage.c | 2 +- src/lam/mem/Makefile.am | 1 + src/lam/{util => mem}/malloc.h | 0 src/lam/mem/mem_pool.c | 2 +- src/lam/util/Makefile.am | 1 - src/lam/util/cmd_line.c | 2 +- src/lam/util/if.c | 71 ++++++++++--------- src/lam/util/output.c | 2 +- src/lam/util/path.c | 6 +- src/lam/util/reactor.c | 2 +- src/mca/lam/base/mca_lam_param.c | 2 +- src/mca/lam/oob/cofs/src/oob_cofs.c | 2 +- src/mca/lam/pcm/cofs/src/pcm_cofs.c | 2 +- src/mca/lam/pcm/cofs/src/pcm_cofs_module.c | 2 +- src/mca/lam/registry/cofs/src/registry_cofs.c | 2 +- src/mca/mpi/base/mca_mpi_mem.c | 2 +- .../mpi/coll/basic/src/coll_basic_alltoall.c | 2 +- .../mpi/coll/basic/src/coll_basic_alltoallv.c | 2 +- .../mpi/coll/basic/src/coll_basic_alltoallw.c | 2 +- .../mpi/coll/basic/src/coll_basic_exscan.c | 2 +- .../mpi/coll/basic/src/coll_basic_reduce.c | 2 +- .../basic/src/coll_basic_reduce_scatter.c | 2 +- src/mca/mpi/coll/basic/src/coll_basic_scan.c | 2 +- src/mca/mpi/pml/teg/src/pml_ptl_array.c | 2 +- src/mca/mpi/pml/teg/src/pml_teg.c | 6 +- src/mca/mpi/pml/teg/src/pml_teg_module.c | 6 +- src/mca/mpi/ptl/tcp/src/ptl_tcp.c | 6 +- src/mca/mpi/ptl/tcp/src/ptl_tcp_module.c | 6 +- 28 files changed, 81 insertions(+), 60 deletions(-) rename src/lam/{util => mem}/malloc.h (100%) diff --git a/src/lam/ctnetwork/ctmessage.c b/src/lam/ctnetwork/ctmessage.c index dc3bf12e9e..2f9876823f 100644 --- a/src/lam/ctnetwork/ctmessage.c +++ b/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, diff --git a/src/lam/mem/Makefile.am b/src/lam/mem/Makefile.am index 4a0d703391..59de426b86 100644 --- a/src/lam/mem/Makefile.am +++ b/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 \ diff --git a/src/lam/util/malloc.h b/src/lam/mem/malloc.h similarity index 100% rename from src/lam/util/malloc.h rename to src/lam/mem/malloc.h diff --git a/src/lam/mem/mem_pool.c b/src/lam/mem/mem_pool.c index a545e42d23..73e85ee6d1 100644 --- a/src/lam/mem/mem_pool.c +++ b/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, diff --git a/src/lam/util/Makefile.am b/src/lam/util/Makefile.am index 17e4714840..81446a5d18 100644 --- a/src/lam/util/Makefile.am +++ b/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 \ diff --git a/src/lam/util/cmd_line.c b/src/lam/util/cmd_line.c index ad60f91794..fc36630838 100644 --- a/src/lam/util/cmd_line.c +++ b/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" diff --git a/src/lam/util/if.c b/src/lam/util/if.c index d75a5cabd2..f7b25e1260 100644 --- a/src/lam/util/if.c +++ b/src/lam/util/if.c @@ -1,3 +1,7 @@ +/* + * $HEADER$ + */ + #include #include #include @@ -8,9 +12,10 @@ #include #include #include + #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 -// interfaces that are not up or are local loopbacks. -// +/* + * Discover the list of configured interfaces. Don't care about any + * 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 -// as a dotted decimal formatted string. -// +/* + * Look for interface by name and returns its address + * 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 -// string or a hostname and lookup corresponding interface. -// +/* + * Attempt to resolve the adddress as either a dotted decimal formated + * 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 -// interface in our list. -// +/* + * Return the kernels interface index for the first + * 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 -// return the interface index of the next element in our list -// (if it exists). -// +/* + * Located the current position in the list by if_index and + * return the interface index of the next element in our list + * (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 -// primary address assigned to the interface. -// +/* + * Lookup the interface by kernel index and return the + * 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 -// the associated name. -// +/* + * Lookup the interface by kernel index and return + * the associated name. + */ int lam_ifindextoname(int if_index, char* if_name, int length) { diff --git a/src/lam/util/output.c b/src/lam/util/output.c index 4f281d98f3..d9620c3409 100644 --- a/src/lam/util/output.c +++ b/src/lam/util/output.c @@ -17,7 +17,7 @@ #include #include "lam/constants.h" -#include "lam/util/malloc.h" +#include "lam/mem/malloc.h" #include "lam/util/output.h" #include "lam/threads/mutex.h" diff --git a/src/lam/util/path.c b/src/lam/util/path.c index e5bda5c37e..5b3964b458 100644 --- a/src/lam/util/path.c +++ b/src/lam/util/path.c @@ -2,16 +2,16 @@ * $HEADER$ */ +/** @file **/ + #include #include #include #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 diff --git a/src/lam/util/reactor.c b/src/lam/util/reactor.c index 5b2b1e4205..61ea02d4e4 100644 --- a/src/lam/util/reactor.c +++ b/src/lam/util/reactor.c @@ -9,8 +9,8 @@ #include #include "lam_config.h" +#include "lam/mem/malloc.h" #include "lam/util/reactor.h" -#include "lam/util/malloc.h" #include "lam/util/output.h" diff --git a/src/mca/lam/base/mca_lam_param.c b/src/mca/lam/base/mca_lam_param.c index 50bdfd03ac..6455db5308 100644 --- a/src/mca/lam/base/mca_lam_param.c +++ b/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" diff --git a/src/mca/lam/oob/cofs/src/oob_cofs.c b/src/mca/lam/oob/cofs/src/oob_cofs.c index 77259538c8..3cbb0ea9bb 100644 --- a/src/mca/lam/oob/cofs/src/oob_cofs.c +++ b/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 diff --git a/src/mca/lam/pcm/cofs/src/pcm_cofs.c b/src/mca/lam/pcm/cofs/src/pcm_cofs.c index b144e00f4a..c4e57b875f 100644 --- a/src/mca/lam/pcm/cofs/src/pcm_cofs.c +++ b/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 diff --git a/src/mca/lam/pcm/cofs/src/pcm_cofs_module.c b/src/mca/lam/pcm/cofs/src/pcm_cofs_module.c index 726d2a5771..85d26b6bca 100644 --- a/src/mca/lam/pcm/cofs/src/pcm_cofs_module.c +++ b/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" diff --git a/src/mca/lam/registry/cofs/src/registry_cofs.c b/src/mca/lam/registry/cofs/src/registry_cofs.c index df7e01ed3f..7798758cc2 100644 --- a/src/mca/lam/registry/cofs/src/registry_cofs.c +++ b/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 diff --git a/src/mca/mpi/base/mca_mpi_mem.c b/src/mca/mpi/base/mca_mpi_mem.c index c3d9c18d95..c6c9120fc0 100644 --- a/src/mca/mpi/base/mca_mpi_mem.c +++ b/src/mca/mpi/base/mca_mpi_mem.c @@ -7,7 +7,7 @@ #include #include -#include "lam/util/malloc.h" +#include "lam/mem/malloc.h" #include "mpi.h" #include "mca/mca.h" #include "mca/mpi/mpi.h" diff --git a/src/mca/mpi/coll/basic/src/coll_basic_alltoall.c b/src/mca/mpi/coll/basic/src/coll_basic_alltoall.c index a5fadaf499..9c681edebb 100644 --- a/src/mca/mpi/coll/basic/src/coll_basic_alltoall.c +++ b/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" diff --git a/src/mca/mpi/coll/basic/src/coll_basic_alltoallv.c b/src/mca/mpi/coll/basic/src/coll_basic_alltoallv.c index 98289727f0..222b0515af 100644 --- a/src/mca/mpi/coll/basic/src/coll_basic_alltoallv.c +++ b/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" diff --git a/src/mca/mpi/coll/basic/src/coll_basic_alltoallw.c b/src/mca/mpi/coll/basic/src/coll_basic_alltoallw.c index 7cd05821a4..b2a8827e5f 100644 --- a/src/mca/mpi/coll/basic/src/coll_basic_alltoallw.c +++ b/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" diff --git a/src/mca/mpi/coll/basic/src/coll_basic_exscan.c b/src/mca/mpi/coll/basic/src/coll_basic_exscan.c index eae11ee32b..115a8c5d68 100644 --- a/src/mca/mpi/coll/basic/src/coll_basic_exscan.c +++ b/src/mca/mpi/coll/basic/src/coll_basic_exscan.c @@ -8,7 +8,7 @@ #include #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" diff --git a/src/mca/mpi/coll/basic/src/coll_basic_reduce.c b/src/mca/mpi/coll/basic/src/coll_basic_reduce.c index b753394a38..2ac6124727 100644 --- a/src/mca/mpi/coll/basic/src/coll_basic_reduce.c +++ b/src/mca/mpi/coll/basic/src/coll_basic_reduce.c @@ -8,7 +8,7 @@ #include #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" diff --git a/src/mca/mpi/coll/basic/src/coll_basic_reduce_scatter.c b/src/mca/mpi/coll/basic/src/coll_basic_reduce_scatter.c index 57d5436337..73a18103f7 100644 --- a/src/mca/mpi/coll/basic/src/coll_basic_reduce_scatter.c +++ b/src/mca/mpi/coll/basic/src/coll_basic_reduce_scatter.c @@ -9,7 +9,7 @@ #include #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" diff --git a/src/mca/mpi/coll/basic/src/coll_basic_scan.c b/src/mca/mpi/coll/basic/src/coll_basic_scan.c index 43b565266a..ea2ac14883 100644 --- a/src/mca/mpi/coll/basic/src/coll_basic_scan.c +++ b/src/mca/mpi/coll/basic/src/coll_basic_scan.c @@ -8,7 +8,7 @@ #include #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" diff --git a/src/mca/mpi/pml/teg/src/pml_ptl_array.c b/src/mca/mpi/pml/teg/src/pml_ptl_array.c index 651fef2b78..5156a00f47 100644 --- a/src/mca/mpi/pml/teg/src/pml_ptl_array.c +++ b/src/mca/mpi/pml/teg/src/pml_ptl_array.c @@ -3,7 +3,7 @@ */ #include -#include "lam/util/malloc.h" +#include "lam/mem/malloc.h" #include "pml_ptl_array.h" diff --git a/src/mca/mpi/pml/teg/src/pml_teg.c b/src/mca/mpi/pml/teg/src/pml_teg.c index 30792b43c8..230394ea81 100644 --- a/src/mca/mpi/pml/teg/src/pml_teg.c +++ b/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" diff --git a/src/mca/mpi/pml/teg/src/pml_teg_module.c b/src/mca/mpi/pml/teg/src/pml_teg_module.c index d85a51ff64..375d703eec 100644 --- a/src/mca/mpi/pml/teg/src/pml_teg_module.c +++ b/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" diff --git a/src/mca/mpi/ptl/tcp/src/ptl_tcp.c b/src/mca/mpi/ptl/tcp/src/ptl_tcp.c index c34ec4ac94..80bb7d5776 100644 --- a/src/mca/mpi/ptl/tcp/src/ptl_tcp.c +++ b/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" diff --git a/src/mca/mpi/ptl/tcp/src/ptl_tcp_module.c b/src/mca/mpi/ptl/tcp/src/ptl_tcp_module.c index 210942942e..8927a92398 100644 --- a/src/mca/mpi/ptl/tcp/src/ptl_tcp_module.c +++ b/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"