Merge pull request #4847 from alex-mikheev/topic/oshmem_group_cache_refactor

oshmem: refactor group cache

Author: alex-mikheev

oshmem/proc/proc.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013      Mellanox Technologies, Inc.
+ * Copyright (c) 2013-2018 Mellanox Technologies, Inc.
  *                         All rights reserved.
  * Copyright (c) 2014-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
@@ -17,6 +17,7 @@
 #include "oshmem/constants.h"
 #include "oshmem/runtime/runtime.h"
 #include "oshmem/mca/scoll/base/base.h"
+#include "oshmem/proc/proc_group_cache.h"
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -65,40 +66,67 @@ oshmem_group_t* oshmem_group_null = NULL;
 
 OBJ_CLASS_INSTANCE(oshmem_group_t, opal_object_t, NULL, NULL);
 
+static void oshmem_proc_group_destroy_internal(oshmem_group_t* group,
+                                               int scoll_unselect);
+
 int oshmem_proc_group_init(void)
 {
+    int rc;
+
+    rc = oshmem_group_cache_init();
+    if (OSHMEM_SUCCESS != rc) {
+        return rc;
+    }
+
     /* Setup communicator array */
     OBJ_CONSTRUCT(&oshmem_group_array, opal_pointer_array_t);
-    if (OPAL_SUCCESS
-            != opal_pointer_array_init(&oshmem_group_array,
-                                       0,
-                                       ORTE_GLOBAL_ARRAY_MAX_SIZE,
-                                       1)) {
-        return OSHMEM_ERROR;
+
+    rc = opal_pointer_array_init(&oshmem_group_array, 0,
+                                 ORTE_GLOBAL_ARRAY_MAX_SIZE, 1);
+    if (OPAL_SUCCESS != rc) {
+        goto err1;
     }
 
     /* Setup SHMEM_GROUP_ALL */
-    if (NULL
-            == (oshmem_group_all =
-                    oshmem_proc_group_create(0,
-                                             1,
-					     ompi_comm_size(oshmem_comm_world)))) {
-        return OSHMEM_ERROR;
+    oshmem_group_all = oshmem_proc_group_create(0, 1, ompi_comm_size(oshmem_comm_world));
+    if (NULL == oshmem_group_all) {
+        goto err2;
     }
 
     /* Setup SHMEM_GROUP_SELF */
-    if (NULL
-            == (oshmem_group_self = oshmem_proc_group_create(oshmem_proc_pe(oshmem_proc_local()),
-                                                             0,
-                                                             1))) {
-        oshmem_proc_group_destroy(oshmem_group_self);
-        return OSHMEM_ERROR;
+    oshmem_group_self = oshmem_proc_group_create(oshmem_proc_pe(oshmem_proc_local()), 0, 1);
+    if (NULL == oshmem_group_self) {
+        goto err3;
     }
 
     /* Setup SHMEM_GROUP_NULL */
     oshmem_group_null = NULL;
 
     return OSHMEM_SUCCESS;
+
+err3:
+    oshmem_proc_group_destroy_internal(oshmem_group_all, 1);
+err2:
+    OBJ_DESTRUCT(&oshmem_group_array);
+err1:
+    oshmem_group_cache_destroy();
+    return OSHMEM_ERROR;
+}
+
+void oshmem_proc_group_finalize_scoll(void)
+{
+    int max, i;
+    oshmem_group_t *group;
+
+    /* Check whether we have some left */
+    max = opal_pointer_array_get_size(&oshmem_group_array);
+    for (i = 0; i < max; i++) {
+        group = (oshmem_group_t *) opal_pointer_array_get_item(&oshmem_group_array,
+                                                               i);
+        if (NULL != group) {
+            mca_scoll_base_group_unselect(group);
+        }
+    }
 }
 
 int oshmem_proc_group_finalize(void)
@@ -114,18 +142,17 @@ int oshmem_proc_group_finalize(void)
                                                                i);
         if (NULL != group) {
             /* Group has not been freed before finalize */
-            oshmem_proc_group_destroy(group);
+            oshmem_proc_group_destroy_internal(group, 0);
         }
     }
 
     OBJ_DESTRUCT(&oshmem_group_array);
 
+    oshmem_group_cache_destroy();
     return OSHMEM_SUCCESS;
 }
 
-oshmem_group_t* oshmem_proc_group_create(int pe_start,
-                                         int pe_stride,
-                                         size_t pe_size)
+oshmem_group_t* oshmem_proc_group_create(int pe_start, int pe_stride, int pe_size)
 {
     int cur_pe, count_pe;
     int i;
@@ -135,107 +162,133 @@ oshmem_group_t* oshmem_proc_group_create(int pe_start,
 
     assert(oshmem_proc_local());
 
+    group = oshmem_group_cache_find(pe_start, pe_stride, pe_size);
+    if (NULL != group) {
+        return group;
+    }
+
     group = OBJ_NEW(oshmem_group_t);
+    if (NULL == group) {
+        return NULL;
+    }
 
-    if (group) {
-        cur_pe = 0;
-        count_pe = 0;
+    cur_pe = 0;
+    count_pe = 0;
 
-        OPAL_THREAD_LOCK(&oshmem_proc_lock);
+    OPAL_THREAD_LOCK(&oshmem_proc_lock);
+
+    /* allocate an array */
+    proc_array = (ompi_proc_t**) malloc(pe_size * sizeof(ompi_proc_t*));
+    if (NULL == proc_array) {
+        OBJ_RELEASE(group);
+        OPAL_THREAD_UNLOCK(&oshmem_proc_lock);
+        return NULL ;
+    }
 
-        /* allocate an array */
-        proc_array = (ompi_proc_t**) malloc(pe_size * sizeof(ompi_proc_t*));
-        if (NULL == proc_array) {
+    group->my_pe = oshmem_proc_pe(oshmem_proc_local());
+    group->is_member = 0;
+    for (i = 0 ; i < ompi_comm_size(oshmem_comm_world) ; i++) {
+        proc = oshmem_proc_find(i);
+        if (NULL == proc) {
+            opal_output(0,
+                    "Error: Can not find proc object for pe = %d", i);
+            free(proc_array);
             OBJ_RELEASE(group);
             OPAL_THREAD_UNLOCK(&oshmem_proc_lock);
-            return NULL ;
+            return NULL;
         }
-
-        group->my_pe = oshmem_proc_pe(oshmem_proc_local());
-        group->is_member = 0;
-        for (i = 0 ; i < ompi_comm_size(oshmem_comm_world) ; i++) {
-            proc = oshmem_proc_find(i);
-            if (NULL == proc) {
-                opal_output(0,
-                             "Error: Can not find proc object for pe = %d", i);
-                free(proc_array);
-                OBJ_RELEASE(group);
-                OPAL_THREAD_UNLOCK(&oshmem_proc_lock);
-                return NULL;
-            }
-            if (count_pe >= (int) pe_size) {
-                break;
-            } else if ((cur_pe >= pe_start)
-                    && ((pe_stride == 0)
-                            || (((cur_pe - pe_start) % pe_stride) == 0))) {
-                proc_array[count_pe++] = proc;
-                if (oshmem_proc_pe(proc) == group->my_pe)
-                    group->is_member = 1;
-            }
-            cur_pe++;
+        if (count_pe >= (int) pe_size) {
+            break;
+        } else if ((cur_pe >= pe_start)
+                && ((pe_stride == 0)
+                    || (((cur_pe - pe_start) % pe_stride) == 0))) {
+            proc_array[count_pe++] = proc;
+            if (oshmem_proc_pe(proc) == group->my_pe)
+                group->is_member = 1;
         }
-        group->proc_array = proc_array;
-        group->proc_count = (int) count_pe;
-        group->ompi_comm = NULL;
-
-        /* Prepare peers list */
-        OBJ_CONSTRUCT(&(group->peer_list), opal_list_t);
-        {
-            orte_namelist_t *peer = NULL;
-
-            for (i = 0; i < group->proc_count; i++) {
-                peer = OBJ_NEW(orte_namelist_t);
-                peer->name.jobid = OSHMEM_PROC_JOBID(group->proc_array[i]);
-                peer->name.vpid = OSHMEM_PROC_VPID(group->proc_array[i]);
-                opal_list_append(&(group->peer_list), &peer->super);
-            }
+        cur_pe++;
+    }
+    group->proc_array = proc_array;
+    group->proc_count = (int) count_pe;
+    group->ompi_comm = NULL;
+
+    /* Prepare peers list */
+    OBJ_CONSTRUCT(&(group->peer_list), opal_list_t);
+    {
+        orte_namelist_t *peer = NULL;
+
+        for (i = 0; i < group->proc_count; i++) {
+            peer = OBJ_NEW(orte_namelist_t);
+            peer->name.jobid = OSHMEM_PROC_JOBID(group->proc_array[i]);
+            peer->name.vpid = OSHMEM_PROC_VPID(group->proc_array[i]);
+            opal_list_append(&(group->peer_list), &peer->super);
         }
-        group->id = opal_pointer_array_add(&oshmem_group_array, group);
+    }
+    group->id = opal_pointer_array_add(&oshmem_group_array, group);
 
-        memset(&group->g_scoll, 0, sizeof(mca_scoll_base_group_scoll_t));
+    memset(&group->g_scoll, 0, sizeof(mca_scoll_base_group_scoll_t));
 
-        if (OSHMEM_SUCCESS != mca_scoll_base_select(group)) {
-            opal_output(0,
-                        "Error: No collective modules are available: group is not created, returning NULL");
-            oshmem_proc_group_destroy(group);
-            OPAL_THREAD_UNLOCK(&oshmem_proc_lock);
-            return NULL;
-        }
+    if (OSHMEM_SUCCESS != mca_scoll_base_select(group)) {
+        opal_output(0,
+                "Error: No collective modules are available: group is not created, returning NULL");
+        oshmem_proc_group_destroy_internal(group, 0);
         OPAL_THREAD_UNLOCK(&oshmem_proc_lock);
+        return NULL;
     }
 
+    if (OSHMEM_SUCCESS != oshmem_group_cache_insert(group, pe_start,
+                                                    pe_stride, pe_size)) {
+        oshmem_proc_group_destroy_internal(group, 1);
+        OPAL_THREAD_UNLOCK(&oshmem_proc_lock);
+        return NULL;
+    }
+
+    OPAL_THREAD_UNLOCK(&oshmem_proc_lock);
     return group;
 }
 
-void oshmem_proc_group_destroy(oshmem_group_t* group)
+static void
+oshmem_proc_group_destroy_internal(oshmem_group_t* group, int scoll_unselect)
 {
-    if (group) {
+    if (NULL == group) {
+        return;
+    }
+
+    if (scoll_unselect) {
         mca_scoll_base_group_unselect(group);
+    }
 
-        /* Destroy proc array */
-        if (group->proc_array) {
-            free(group->proc_array);
-        }
+    /* Destroy proc array */
+    if (group->proc_array) {
+        free(group->proc_array);
+    }
 
-        /* Destroy peer list */
-        {
-            opal_list_item_t *item;
+    /* Destroy peer list */
+    {
+        opal_list_item_t *item;
 
-            while (NULL != (item = opal_list_remove_first(&(group->peer_list)))) {
-                /* destruct the item (we constructed it), then free the memory chunk */
-                OBJ_RELEASE(item);
-            }
-            OBJ_DESTRUCT(&(group->peer_list));
+        while (NULL != (item = opal_list_remove_first(&(group->peer_list)))) {
+            /* destruct the item (we constructed it), then free the memory chunk */
+            OBJ_RELEASE(item);
         }
+        OBJ_DESTRUCT(&(group->peer_list));
+    }
 
-        /* reset the oshmem_group_array entry - make sure that the
-         * entry is in the table */
-        if (NULL
-                != opal_pointer_array_get_item(&oshmem_group_array,
-                                               group->id)) {
-            opal_pointer_array_set_item(&oshmem_group_array, group->id, NULL );
-        }
+    /* reset the oshmem_group_array entry - make sure that the
+     * entry is in the table */
+    if (NULL
+            != opal_pointer_array_get_item(&oshmem_group_array,
+                group->id)) {
+        opal_pointer_array_set_item(&oshmem_group_array, group->id, NULL );
+    }
 
-        OBJ_RELEASE(group);
+    OBJ_RELEASE(group);
+}
+
+void oshmem_proc_group_destroy(oshmem_group_t* group)
+{
+    if (oshmem_group_cache_enabled()) {
+        return;
     }
+    oshmem_proc_group_destroy_internal(group, 1);
 }