Checkpoint gds/shmem work.

For a single client it appears that the sharing of hash tables and lists
works. pmix_gds_shmem_fetch() requires work to accommodate multiple
clients.

Other notable changes include:
* Revert changes introduced in 'TMA: Integrate more custom memory allocator
  infrastructure'. The base object system doesn't appear to require the
  changes introduced in that commit.

Signed-off-by: Samuel K. Gutierrez <[email protected]>

Author: samuelkgutierrez

src/class/pmix_object.c

@@ -66,13 +66,13 @@ static const int increment = 10;
 /*
  * Local functions
  */
-static void save_class(pmix_class_t *cls, pmix_tma_t *tma);
-static void expand_array(pmix_tma_t *tma);
+static void save_class(pmix_class_t *cls);
+static void expand_array(void);
 
 /*
  * Lazy initialization of class descriptor.
  */
-void pmix_class_initialize(pmix_class_t *cls, pmix_tma_t *tma)
+void pmix_class_initialize(pmix_class_t *cls)
 {
     pmix_class_t *c;
     pmix_construct_t *cls_construct_array;
@@ -123,7 +123,7 @@ void pmix_class_initialize(pmix_class_t *cls, pmix_tma_t *tma)
      * plus for each a NULL-sentinel
      */
 
-    cls->cls_construct_array = (void (**)(pmix_object_t *)) pmix_tma_malloc(tma,
+    cls->cls_construct_array = (void (**)(pmix_object_t *)) malloc(
         (cls_construct_array_count + cls_destruct_array_count + 2) * sizeof(pmix_construct_t));
     if (NULL == cls->cls_construct_array) {
         perror("Out of memory");
@@ -154,7 +154,7 @@ void pmix_class_initialize(pmix_class_t *cls, pmix_tma_t *tma)
     *cls_destruct_array = NULL; /* end marker for the destructors */
 
     cls->cls_initialized = pmix_class_init_epoch;
-    save_class(cls, tma);
+    save_class(cls);
 
     /* All done */
 
@@ -189,25 +189,25 @@ int pmix_class_finalize(void)
     return 0;
 }
 
-static void save_class(pmix_class_t *cls, pmix_tma_t *tma)
+static void save_class(pmix_class_t *cls)
 {
     if (num_classes >= max_classes) {
-        expand_array(tma);
+        expand_array();
     }
 
     classes[num_classes] = cls->cls_construct_array;
     ++num_classes;
 }
 
-static void expand_array(pmix_tma_t *tma)
+static void expand_array(void)
 {
     int i;
 
     max_classes += increment;
     if (NULL == classes) {
-        classes = (void **) pmix_tma_calloc(tma, max_classes, sizeof(void *));
+        classes = (void **) calloc(max_classes, sizeof(void *));
     } else {
-        classes = (void **) pmix_tma_realloc(tma, classes, sizeof(void *) * max_classes);
+        classes = (void **) realloc(classes, sizeof(void *) * max_classes);
     }
     if (NULL == classes) {
         perror("class malloc failed");

src/class/pmix_object.h

@@ -233,8 +233,11 @@ typedef struct pmix_tma {
     void *(*tma_memmove)(struct pmix_tma *tma, const void *src, size_t n);
     /** Pointer to the TMA's free() function. */
     void (*tma_free)(struct pmix_tma *, void *);
-    /** Pointer inside the memory allocation arena. */
-    void *arena;
+    /**
+     * Points to generic data used by a TMA. An example includes a pointer to a
+     * value that maintains the next available address.
+     */
+    void **data_ptr;
 } pmix_tma_t;
 
 static inline void *pmix_tma_malloc(pmix_tma_t *tma, size_t size)
@@ -322,7 +325,7 @@ PMIX_EXPORT extern int pmix_class_init_epoch;
             .obj_tma.tma_strdup = NULL,             \
             .obj_tma.tma_memmove = NULL,            \
             .obj_tma.tma_free = NULL,               \
-            .obj_tma.arena = NULL,                  \
+            .obj_tma.data_ptr = NULL,               \
             .cls_init_file_name = __FILE__,         \
             .cls_init_lineno = __LINE__             \
         }
@@ -338,7 +341,7 @@ PMIX_EXPORT extern int pmix_class_init_epoch;
             .obj_tma.tma_strdup = NULL,             \
             .obj_tma.tma_memmove = NULL,            \
             .obj_tma.tma_free = NULL,               \
-            .obj_tma.arena = NULL                   \
+            .obj_tma.data_ptr = NULL                \
         }
 #endif
 
@@ -542,7 +545,7 @@ static inline void pmix_obj_construct_tma(pmix_object_t *obj, pmix_tma_t *tma)
         obj->obj_tma.tma_strdup = NULL;
         obj->obj_tma.tma_memmove = NULL;
         obj->obj_tma.tma_free = NULL;
-        obj->obj_tma.arena = NULL;
+        obj->obj_tma.data_ptr = NULL;
     } else {
         obj->obj_tma = *tma;
     }
@@ -552,7 +555,7 @@ static inline void pmix_obj_construct_tma(pmix_object_t *obj, pmix_tma_t *tma)
     do {                                                           \
         PMIX_SET_MAGIC_ID((object), PMIX_OBJ_MAGIC_ID);            \
         if (pmix_class_init_epoch != (type)->cls_initialized) {    \
-            pmix_class_initialize((type), (t));                    \
+            pmix_class_initialize((type));                         \
         }                                                          \
         ((pmix_object_t *) (object))->obj_class = (type);          \
         ((pmix_object_t *) (object))->obj_reference_count = 1;     \
@@ -609,7 +612,7 @@ PMIX_CLASS_DECLARATION(pmix_object_t);
  *
  * @param class    Pointer to class descriptor
  */
-PMIX_EXPORT void pmix_class_initialize(pmix_class_t *cls, pmix_tma_t *tma);
+PMIX_EXPORT void pmix_class_initialize(pmix_class_t *cls);
 
 /**
  * Shut down the class system and release all memory
@@ -686,7 +689,7 @@ static inline pmix_object_t *pmix_obj_new_tma(pmix_class_t *cls, pmix_tma_t *tma
     object = (pmix_object_t *) pmix_tma_malloc(tma, cls->cls_sizeof);
 
     if (pmix_class_init_epoch != cls->cls_initialized) {
-        pmix_class_initialize(cls, tma);
+        pmix_class_initialize(cls);
     }
     if (NULL != object) {
 #if PMIX_ENABLE_DEBUG
@@ -717,7 +720,7 @@ static inline pmix_object_t *pmix_obj_new_tma(pmix_class_t *cls, pmix_tma_t *tma
             object->obj_tma.tma_realloc = NULL;
             object->obj_tma.tma_strdup = NULL;
             object->obj_tma.tma_free = NULL;
-            object->obj_tma.arena = NULL;
+            object->obj_tma.data_ptr = NULL;
         } else {
             object->obj_tma = *tma;
         }
@@ -750,6 +753,22 @@ static inline int pmix_obj_update(pmix_object_t *object, int inc)
     return ret;
 }
 
+/**
+ * Get a pointer to a given object's memory allocator. Returns a pointer to the
+ * TMA, if available. Returns NULL Otherwise.
+ */
+static inline pmix_tma_t *
+pmix_obj_get_tma(
+    pmix_object_t *obj
+) {
+    // Look for a given function pointer. If it isn't NULL, then assume that
+    // this object has a custom memory allocator.
+    if (obj->obj_tma.tma_malloc) {
+        return &obj->obj_tma;
+    }
+    return NULL;
+}
+
 END_C_DECLS
 
 #endif

src/mca/gds/shmem/Makefile.am

@@ -25,16 +25,22 @@
 
 AM_CPPFLAGS = $(gds_shmem_CPPFLAGS)
 
-# TODO(skg) Eventually incorporate pmix_hash2.
+# TODO(skg) Eventually reincorporate pmix_hash2.
+# TODO(skg) Eventually reincorporate pmix_hash_table2.
+# TODO(skg) Eventually reincorporate pmix_pointer_array2.
 
 headers = \
+        pmix_pointer_array2.h \
+        pmix_hash_table2.h \
         pmix_hash2.h \
         gds_shmem.h \
         gds_shmem_utils.h \
         gds_shmem_store.h \
         gds_shmem_fetch.h
 
 sources = \
+        pmix_pointer_array2.c \
+        pmix_hash_table2.c \
         pmix_hash2.c \
         gds_shmem_component.c \
         gds_shmem.c \