diff --git a/orte/mca/grpcomm/base/grpcomm_base_frame.c b/orte/mca/grpcomm/base/grpcomm_base_frame.c index 2b0291e0e9..6532292bbc 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_frame.c +++ b/orte/mca/grpcomm/base/grpcomm_base_frame.c @@ -112,7 +112,6 @@ static void scon(orte_grpcomm_signature_t *p) { p->signature = NULL; p->sz = 0; - p->seq_num = 0; } static void sdes(orte_grpcomm_signature_t *p) { diff --git a/orte/mca/grpcomm/base/grpcomm_base_stubs.c b/orte/mca/grpcomm/base/grpcomm_base_stubs.c index 8bd806bc07..7f973663d0 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_stubs.c +++ b/orte/mca/grpcomm/base/grpcomm_base_stubs.c @@ -152,12 +152,10 @@ static void allgather_stub(int fd, short args, void *cbdata) * for releasing it upon completion of the collective */ ret = opal_hash_table_get_value_ptr(&orte_grpcomm_base.sig_table, (void *)cd->sig->signature, cd->sig->sz * sizeof(orte_process_name_t), (void **)&seq_number); if (OPAL_ERR_NOT_FOUND == ret) { - cd->sig->seq_num = 0; seq_number = (uint32_t *)malloc(sizeof(uint32_t)); *seq_number = 0; } else if (OPAL_SUCCESS == ret) { *seq_number = *seq_number + 1; - cd->sig->seq_num = *seq_number; } else { OPAL_OUTPUT((orte_grpcomm_base_framework.framework_output, "%s rpcomm:base:allgather cannot get signature from hash table", diff --git a/orte/mca/grpcomm/grpcomm.h b/orte/mca/grpcomm/grpcomm.h index 00ddccacc4..e73d29a1f1 100644 --- a/orte/mca/grpcomm/grpcomm.h +++ b/orte/mca/grpcomm/grpcomm.h @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2011-2016 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2016 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -59,7 +61,6 @@ typedef struct { opal_object_t super; orte_process_name_t *signature; size_t sz; - uint32_t seq_num; } orte_grpcomm_signature_t; OBJ_CLASS_DECLARATION(orte_grpcomm_signature_t); diff --git a/orte/runtime/data_type_support/orte_dt_compare_fns.c b/orte/runtime/data_type_support/orte_dt_compare_fns.c index 6e004aa790..6e7623b47a 100644 --- a/orte/runtime/data_type_support/orte_dt_compare_fns.c +++ b/orte/runtime/data_type_support/orte_dt_compare_fns.c @@ -206,12 +206,6 @@ int orte_dt_compare_sig(orte_grpcomm_signature_t *value1, orte_grpcomm_signature } if (value2->sz > value1->sz) { return OPAL_VALUE2_GREATER; - } - if (value1->seq_num > value2->seq_num) { - return OPAL_VALUE1_GREATER; - } - if (value2->seq_num > value1->seq_num) { - return OPAL_VALUE2_GREATER; } /* same size - check contents */ if (0 == memcmp(value1->signature, value2->signature, value1->sz*sizeof(orte_process_name_t))) { diff --git a/orte/runtime/data_type_support/orte_dt_copy_fns.c b/orte/runtime/data_type_support/orte_dt_copy_fns.c index 2b245953fb..208500a1eb 100644 --- a/orte/runtime/data_type_support/orte_dt_copy_fns.c +++ b/orte/runtime/data_type_support/orte_dt_copy_fns.c @@ -319,7 +319,6 @@ int orte_dt_copy_sig(orte_grpcomm_signature_t **dest, orte_grpcomm_signature_t * } (*dest)->sz = src->sz; (*dest)->signature = (orte_process_name_t*)malloc(src->sz * sizeof(orte_process_name_t)); - (*dest)->seq_num = src->seq_num; if (NULL == (*dest)->signature) { ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE); OBJ_RELEASE(*dest); diff --git a/orte/runtime/data_type_support/orte_dt_packing_fns.c b/orte/runtime/data_type_support/orte_dt_packing_fns.c index 6af4277571..9ab47c0fa8 100644 --- a/orte/runtime/data_type_support/orte_dt_packing_fns.c +++ b/orte/runtime/data_type_support/orte_dt_packing_fns.c @@ -846,11 +846,6 @@ int orte_dt_pack_sig(opal_buffer_t *buffer, const void *src, int32_t num_vals, ORTE_ERROR_LOG(rc); return rc; } - /* pack the sequence number */ - if (OPAL_SUCCESS != (rc = opal_dss.pack(buffer, &ptr[i]->seq_num, 1, OPAL_UINT32))) { - ORTE_ERROR_LOG(rc); - return rc; - } if (0 < ptr[i]->sz) { /* pack the array */ if (OPAL_SUCCESS != (rc = opal_dss.pack(buffer, ptr[i]->signature, ptr[i]->sz, ORTE_NAME))) { diff --git a/orte/runtime/data_type_support/orte_dt_print_fns.c b/orte/runtime/data_type_support/orte_dt_print_fns.c index 67b7e71e9f..8faf4b55b8 100644 --- a/orte/runtime/data_type_support/orte_dt_print_fns.c +++ b/orte/runtime/data_type_support/orte_dt_print_fns.c @@ -853,13 +853,13 @@ int orte_dt_print_sig(char **output, char *prefix, orte_grpcomm_signature_t *src } if (NULL == src->signature) { - asprintf(output, "%sORTE_SIG SeqNumber:%d Procs: NULL", prefx, src->seq_num); + asprintf(output, "%sORTE_SIG Procs: NULL", prefx); free(prefx); return ORTE_SUCCESS; } /* there must be at least one proc in the signature */ - asprintf(&tmp, "%sORTE_SIG SeqNumber:%d Procs: ", prefx, src->seq_num); + asprintf(&tmp, "%sORTE_SIG Procs: ", prefx); for (i=0; i < src->sz; i++) { asprintf(&tmp2, "%s%s", tmp, ORTE_NAME_PRINT(&src->signature[i])); diff --git a/orte/runtime/data_type_support/orte_dt_unpacking_fns.c b/orte/runtime/data_type_support/orte_dt_unpacking_fns.c index 2f90a7db94..8cf990e95c 100644 --- a/orte/runtime/data_type_support/orte_dt_unpacking_fns.c +++ b/orte/runtime/data_type_support/orte_dt_unpacking_fns.c @@ -933,10 +933,6 @@ int orte_dt_unpack_sig(opal_buffer_t *buffer, void *dest, int32_t *num_vals, ORTE_ERROR_LOG(rc); return rc; } - if (OPAL_SUCCESS != (rc = opal_dss.unpack(buffer, &ptr[i]->seq_num, &cnt, OPAL_UINT32))) { - ORTE_ERROR_LOG(rc); - return rc; - } if (0 < ptr[i]->sz) { /* allocate space for the array */ ptr[i]->signature = (orte_process_name_t*)malloc(ptr[i]->sz * sizeof(orte_process_name_t));