Modify the key-index support

Utilize a pointer array instead of a hash table for
faster retrieval. Let the key's index correspond to
the index in the array. Append user-defined keys to
the standard ones. Use that relative location to reduce
the search space/time when retrieving an index from
a key.

Add some missing static initializers for internal
structures.

Signed-off-by: Ralph Castain <[email protected]>

Author: rhc54

include/pmix_deprecated.h

@@ -196,7 +196,8 @@ PMIX_EXPORT pmix_status_t PMIx_tool_connect_to_server(pmix_proc_t *proc,
 
 /* attributes for GDS */
 #define PMIX_GDS_MODULE                     "pmix.gds.mod"          // (char*) ***** DEPRECATED ***** comma-delimited string of desired modules
-
+#define PMIX_BFROPS_MODULE                  "pmix.bfrops.mod"       // (char*) ***** INTERNAL ***** name of bfrops plugin in-use by a given nspace
+#define PMIX_PNET_SETUP_APP                 "pmix.pnet.setapp"      // (pmix_byte_object_t) ***** INTERNAL ***** blob containing info to be given to pnet framework on remote nodes
 
 #define PMIX_IOF_STOP                       "pmix.iof.stop"         // (bool) ***** DEPRECATED ***** Stop forwarding the specified channel(s)
 #define PMIX_NOTIFY_LAUNCH                  "pmix.note.lnch"        // (bool) ***** DEPRECATED ***** notify the requestor upon launch of the child job and return

src/class/pmix_hotel.h

@@ -138,6 +138,20 @@ typedef struct pmix_hotel_t {
 } pmix_hotel_t;
 PMIX_EXPORT PMIX_CLASS_DECLARATION(pmix_hotel_t);
 
+#define PMIX_HOTEL_STATIC_INIT                      \
+{                                                   \
+    .super = PMIX_OBJ_STATIC_INIT(pmix_object_t),   \
+    .num_rooms = 0,                                 \
+    .evbase = NULL,                                 \
+    .eviction_timeout = {0, 0},                     \
+    .evict_callback_fn = NULL,                      \
+    .rooms = NULL,                                  \
+    .eviction_args = NULL,                          \
+    .unoccupied_rooms = NULL,                       \
+    .last_unoccupied_room = 0                       \
+}
+
+
 /**
  * Initialize the hotel.
  *

src/common/pmix_attributes.c

@@ -59,17 +59,6 @@ static void atrkdes(pmix_attribute_trk_t *p)
 }
 static PMIX_CLASS_INSTANCE(pmix_attribute_trk_t, pmix_list_item_t, atrkcon, atrkdes);
 
-/* define a couple of internal attributes */
-static pmix_regattr_input_t internals[] = {
-    {.index = PMIX_INDEX_BOUNDARY, .name = "PMIX_BFROPS_MODULE", .string = "pmix.bfrops.mod", .type = PMIX_STRING,
-        .description = (char *[]){"name of bfrops plugin in-use by a given nspace", NULL}},
-
-    {.index = PMIX_INDEX_BOUNDARY+1, .name = "PMIX_PNET_SETUP_APP", .string = "pmix.pnet.setapp", .type = PMIX_BYTE_OBJECT,
-            .description = (char *[]){"blob containing info to be given to pnet framework on remote nodes", NULL}},
-
-    {.index = UINT32_MAX, .name = "", .string = "", .type = PMIX_POINTER, .description = (char *[]){"NONE", NULL}}
-};
-
 PMIX_EXPORT void pmix_init_registered_attrs(void)
 {
     size_t n;
@@ -92,16 +81,6 @@ PMIX_EXPORT void pmix_init_registered_attrs(void)
             p->description = pmix_argv_copy(dictionary[n].description);
             pmix_hash_register_key(p->index, p);
         }
-        /* include the internals */
-        for (n=0; UINT32_MAX != internals[n].index; n++) {
-            p = (pmix_regattr_input_t*)pmix_malloc(sizeof(pmix_regattr_input_t));
-            p->index = internals[n].index;
-            p->name = strdup(internals[n].name);
-            p->string = strdup(internals[n].string);
-            p->type = internals[n].type;
-            p->description = pmix_argv_copy(internals[n].description);
-            pmix_hash_register_key(p->index, p);
-        }
         initialized = true;
     }
 }
@@ -159,37 +138,12 @@ PMIX_EXPORT pmix_status_t PMIx_Register_attributes(char *function, char *attrs[]
 
 PMIX_EXPORT void pmix_release_registered_attrs(void)
 {
-    pmix_status_t rc;
-    uint32_t id;
-    pmix_regattr_input_t *ptr;
-    char *node;
-
     if (initialized) {
         PMIX_LIST_DESTRUCT(&client_attrs);
         PMIX_LIST_DESTRUCT(&server_attrs);
         PMIX_LIST_DESTRUCT(&host_attrs);
         PMIX_LIST_DESTRUCT(&tool_attrs);
-        rc = pmix_hash_table_get_first_key_uint32(&pmix_globals.keyindex,
-                                                  &id, (void **) &ptr,
-                                                  (void **) &node);
-        while (PMIX_SUCCESS == rc) {
-            if (NULL != ptr->name) {
-                free(ptr->name);
-                ptr->name = NULL;
-            }
-            if (NULL != ptr->string) {
-                free(ptr->string);
-                ptr->string = NULL;
-            }
-            if (NULL != ptr->description) {
-                pmix_argv_free(ptr->description);
-                ptr->description = NULL;
-            }
-            rc = pmix_hash_table_get_next_key_uint32(&pmix_globals.keyindex, &id,
-                                                     (void **) &ptr, node,
-                                                     (void **) &node);
-        }
-    }
+   }
     initialized = false;
 }
 

src/event/pmix_event.h

@@ -56,6 +56,14 @@ typedef struct {
     size_t nprocs;
 } pmix_range_trkr_t;
 
+#define PMIX_RANGE_TRKR_STATIC_INIT     \
+{                                       \
+    .range = PMIX_RANGE_UNDEF,          \
+    .procs = NULL,                      \
+    .nprocs = 0                         \
+}
+
+
 /* define a common struct for tracking event handlers */
 typedef struct {
     pmix_list_item_t super;
@@ -86,6 +94,23 @@ typedef struct {
 } pmix_event_hdlr_t;
 PMIX_CLASS_DECLARATION(pmix_event_hdlr_t);
 
+#define PMIX_EVENT_HDLR_STATIC_INIT         \
+{                                           \
+    .super = PMIX_LIST_ITEM_STATIC_INIT,    \
+    .name = NULL,                           \
+    .index = SIZE_MAX,                      \
+    .precedence = UINT8_MAX,                \
+    .locator = NULL,                        \
+    .source = PMIX_PROC_STATIC_INIT,        \
+    .rng = PMIX_RANGE_TRKR_STATIC_INIT,     \
+    .affected - NULL,                       \
+    .naffected = 0,                         \
+    .evhdlr = NULL,                         \
+    .cbobject = NULL,                       \
+    .codes = NULL,                          \
+    .ncodes = 0                             \
+}
+
 /* define an object for tracking status codes we are actively
  * registered to receive */
 typedef struct {
@@ -110,6 +135,18 @@ typedef struct {
 } pmix_events_t;
 PMIX_CLASS_DECLARATION(pmix_events_t);
 
+#define PMIX_EVENTS_STATIC_INIT                     \
+{                                                   \
+    .super = PMIX_OBJ_STATIC_INIT(pmix_object_t),   \
+    .nhdlrs = 0,                                    \
+    .first = NULL,                                  \
+    .last = NULL,                                   \
+    .actives = PMIX_LIST_STATIC_INIT,               \
+    .single_events = PMIX_LIST_STATIC_INIT,         \
+    .multi_events = PMIX_LIST_STATIC_INIT,          \
+    .default_events = PMIX_LIST_STATIC_INIT         \
+}
+
 /* define an object for chaining event notifications thru
  * the local state machine. Each registered event handler
  * that asked to be notified for a given code is given a

src/include/pmix_globals.h

@@ -247,6 +247,23 @@ typedef struct {
     bool raw;
 } pmix_iof_flags_t;
 
+#define PMIX_IOF_FLAGS_STATIC_INIT  \
+{                                   \
+    .set = false,                   \
+    .xml = false,                   \
+    .timestamp = false,             \
+    .tag = false,                   \
+    .rank = false,                  \
+    .file = NULL,                   \
+    .directory = NULL,              \
+    .nocopy = false,                \
+    .merge = false,                 \
+    .local_output = false,          \
+    .local_output_given = false,    \
+    .pattern = false,               \
+    .raw = false                    \
+}
+
 /* objects used by servers for tracking active nspaces */
 typedef struct {
     pmix_list_item_t super;
@@ -665,7 +682,8 @@ typedef struct {
     bool external_topology;
     bool external_progress;
     pmix_iof_flags_t iof_flags;
-    pmix_hash_table_t keyindex;  // translation table of key <-> index
+    pmix_pointer_array_t keyindex;  // translation table of key <-> index
+    uint32_t next_keyid;
 } pmix_globals_t;
 
 /* provide access to a function to cleanup epilogs */

src/runtime/pmix_finalize.c

@@ -60,6 +60,7 @@ void pmix_rte_finalize(void)
     int i;
     pmix_notify_caddy_t *cd;
     pmix_iof_req_t *req;
+    pmix_regattr_input_t *p;
 
     if (--pmix_initialized != 0) {
         if (pmix_initialized < 0) {
@@ -143,6 +144,21 @@ void pmix_rte_finalize(void)
         pmix_globals.hostname = NULL;
     }
     PMIX_LIST_DESTRUCT(&pmix_globals.nspaces);
+    for (i=0; i < pmix_globals.keyindex.size; i++) {
+        p = (pmix_regattr_input_t*)pmix_pointer_array_get_item(&pmix_globals.keyindex, i);
+        if (NULL != p) {
+            if (NULL != p->name) {
+                free(p->name);
+            }
+            if (NULL != p->string) {
+                free(p->string);
+            }
+            if (NULL != p->description) {
+                pmix_argv_free(p->description);
+            }
+            free(p);
+        }
+    }
     PMIX_DESTRUCT(&pmix_globals.keyindex);
 
     /* now safe to release the event base */

src/runtime/pmix_init.c

@@ -57,6 +57,7 @@
 #include "src/client/pmix_client_ops.h"
 #include "src/common/pmix_attributes.h"
 #include "src/event/pmix_event.h"
+#include "src/include/dictionary.h"
 #include "src/include/pmix_types.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_keyval_parse.h"
@@ -74,26 +75,45 @@ const char* pmix_tool_msg = PMIX_PROXY_BUGREPORT_STRING;
 PMIX_EXPORT int pmix_initialized = 0;
 PMIX_EXPORT bool pmix_init_called = false;
 /* we have to export the pmix_globals object so
- * all plugins can access it. However, it is included
- * in the pmix_rename.h file for external protection.
- * Initialize only those entries that are not covered
- * by MCA params or are complex structures initialized
- * below */
+ * all plugins can access it. */
 PMIX_EXPORT pmix_globals_t pmix_globals = {
     .init_cntr = 0,
+    .myid = PMIX_PROC_STATIC_INIT,
+    .myidval = PMIX_VALUE_STATIC_INIT,
+    .myrankval = PMIX_VALUE_STATIC_INIT,
     .mypeer = NULL,
+    .uid = 0,
+    .gid = 0,
     .hostname = NULL,
+    .appnum = 0,
+    .pid = 0,
     .nodeid = UINT32_MAX,
     .pindex = 0,
     .evbase = NULL,
     .debug_output = -1,
+    .events = PMIX_EVENTS_STATIC_INIT,
     .connected = false,
     .commits_pending = false,
+    .event_window = {0, 0},
+    .cached_events = PMIX_LIST_STATIC_INIT,
+    .iof_requests = PMIX_POINTER_ARRAY_STATIC_INIT,
+    .max_events = INT_MAX,
+    .event_eviction_time = 0,
+    .notifications = PMIX_HOTEL_STATIC_INIT,
     .pushstdin = false,
+    .stdin_targets = PMIX_LIST_STATIC_INIT,
+    .tag_output = false,
+    .xml_output = false,
+    .timestamp_output = false,
+    .output_limit = SIZE_MAX,
+    .nspaces = PMIX_LIST_STATIC_INIT,
     .topology = {NULL, NULL},
     .cpuset = {NULL, NULL},
     .external_topology = false,
-    .external_progress = false
+    .external_progress = false,
+    .iof_flags = PMIX_IOF_FLAGS_STATIC_INIT,
+    .keyindex = PMIX_POINTER_ARRAY_STATIC_INIT,
+    .next_keyid = PMIX_INDEX_BOUNDARY
 };
 
 static void _notification_eviction_cbfunc(struct pmix_hotel_t *hotel, int room_num, void *occupant)
@@ -292,8 +312,8 @@ int pmix_rte_init(uint32_t type, pmix_info_t info[], size_t ninfo, pmix_ptl_cbfu
     pmix_hotel_init(&pmix_globals.notifications, pmix_globals.max_events, pmix_globals.evbase,
                     pmix_globals.event_eviction_time, _notification_eviction_cbfunc);
     PMIX_CONSTRUCT(&pmix_globals.nspaces, pmix_list_t);
-    PMIX_CONSTRUCT(&pmix_globals.keyindex, pmix_hash_table_t);
-    pmix_hash_table_init(&pmix_globals.keyindex, 1024);
+    PMIX_CONSTRUCT(&pmix_globals.keyindex, pmix_pointer_array_t);
+    pmix_pointer_array_init(&pmix_globals.keyindex, 1024, INT_MAX, 128);
 
     /* and setup the iof request tracking list */
     PMIX_CONSTRUCT(&pmix_globals.iof_requests, pmix_pointer_array_t);

src/server/pmix_server_ops.c

@@ -659,7 +659,7 @@ static pmix_status_t _collect_data(pmix_server_trkr_t *trk, pmix_buffer_t *buf)
             pmix_value_array_init(key_count_array, sizeof(uint32_t));
 
             PMIX_LIST_FOREACH (scd, &trk->local_cbs, pmix_server_caddy_t) {
-               pmix_strncpy(pcs.nspace, scd->peer->info->pname.nspace, PMIX_MAX_NSLEN);
+                pmix_strncpy(pcs.nspace, scd->peer->info->pname.nspace, PMIX_MAX_NSLEN);
                 pcs.rank = scd->peer->info->pname.rank;
                 PMIX_CONSTRUCT(&cb, pmix_cb_t);
                 cb.proc = &pcs;
@@ -4067,9 +4067,7 @@ pmix_status_t pmix_server_grpconstruct(pmix_server_caddy_t *cd, pmix_buffer_t *b
             goto error;
         }
     }
-    /* see if we are to enforce a timeout or if they want
-     * a context ID created - we don't internally care
-     * about any other directives */
+    /* check directives */
     for (n = 0; n < ninfo; n++) {
         if (PMIX_CHECK_KEY(&info[n], PMIX_TIMEOUT)) {
             tv.tv_sec = info[n].value.data.uint32;