Merge pull request open-mpi#7436 from rhc54/topic/pstat

Remove the unused opal/pstat framework

Author: rhc54

opal/dss/dss_compare.c

@@ -12,7 +12,7 @@
  * Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
  * Copyright (c) 2014-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
- * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -290,18 +290,6 @@ int opal_dss_compare_byte_object(opal_byte_object_t *value1, opal_byte_object_t
     return OPAL_EQUAL;  /* sum of both value's bytes was identical */
 }
 
-/* OPAL_PSTAT */
-int opal_dss_compare_pstat(opal_pstats_t *value1, opal_pstats_t *value2, opal_data_type_t type)
-{
-    return OPAL_EQUAL;  /* eventually compare field to field */
-}
-
-/* OPAL_NODE_STAT */
-int opal_dss_compare_node_stat(opal_node_stats_t *value1, opal_node_stats_t *value2, opal_data_type_t type)
-{
-    return OPAL_EQUAL;  /* eventually compare field to field */
-}
-
 /* OPAL_VALUE */
 int opal_dss_compare_value(opal_value_t *value1, opal_value_t *value2, opal_data_type_t type)
 {

opal/dss/dss_copy.c

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2014-2015 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
@@ -197,62 +197,6 @@ int opal_dss_copy_byte_object(opal_byte_object_t **dest, opal_byte_object_t *src
     return OPAL_SUCCESS;
 }
 
-/* OPAL_PSTAT */
-int opal_dss_copy_pstat(opal_pstats_t **dest, opal_pstats_t *src,
-                        opal_data_type_t type)
-{
-    opal_pstats_t *p;
-
-    /* create the new object */
-    *dest = OBJ_NEW(opal_pstats_t);
-    if (NULL == *dest) {
-        return OPAL_ERR_OUT_OF_RESOURCE;
-    }
-    p = *dest;
-
-    /* copy the individual fields */
-    memcpy(p->node, src->node, sizeof(src->node));
-    p->rank = src->rank;
-    p->pid = src->pid;
-    memcpy(p->cmd, src->cmd, sizeof(src->cmd));
-    p->state[0] = src->state[0];
-    p->time = src->time;
-    p->priority = src->priority;
-    p->num_threads = src->num_threads;
-    p->pss = src->pss;
-    p->vsize = src->vsize;
-    p->rss = src->rss;
-    p->peak_vsize = src->peak_vsize;
-    p->processor = src->processor;
-    p->sample_time.tv_sec = src->sample_time.tv_sec;
-    p->sample_time.tv_usec = src->sample_time.tv_usec;
-    return OPAL_SUCCESS;
-}
-
-/* OPAL_NODE_STAT */
-int opal_dss_copy_node_stat(opal_node_stats_t **dest, opal_node_stats_t *src,
-                            opal_data_type_t type)
-{
-    opal_node_stats_t *p;
-
-    /* create the new object */
-    *dest = OBJ_NEW(opal_node_stats_t);
-    if (NULL == *dest) {
-        return OPAL_ERR_OUT_OF_RESOURCE;
-    }
-    p = *dest;
-
-    /* copy the individual fields */
-    p->la = src->la;
-    p->la5 = src->la5;
-    p->la15 = src->la15;
-    p->total_mem = src->total_mem;
-    p->free_mem = src->free_mem;
-    p->sample_time.tv_sec = src->sample_time.tv_sec;
-    p->sample_time.tv_usec = src->sample_time.tv_usec;
-    return OPAL_SUCCESS;
-}
-
 /* OPAL_VALUE */
 int opal_dss_copy_value(opal_value_t **dest, opal_value_t *src,
                         opal_data_type_t type)

opal/dss/dss_internal.h

@@ -11,7 +11,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved.
- * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2014      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
@@ -299,12 +299,6 @@ int opal_dss_pack_data_type(opal_buffer_t *buffer, const void *src,
 int opal_dss_pack_byte_object(opal_buffer_t *buffer, const void *src,
                               int32_t num_vals, opal_data_type_t type);
 
-int opal_dss_pack_pstat(opal_buffer_t *buffer, const void *src,
-                        int32_t num_vals, opal_data_type_t type);
-
-int opal_dss_pack_node_stat(opal_buffer_t *buffer, const void *src,
-                            int32_t num_vals, opal_data_type_t type);
-
 int opal_dss_pack_value(opal_buffer_t *buffer, const void *src,
                         int32_t num_vals, opal_data_type_t type);
 
@@ -373,12 +367,6 @@ int opal_dss_unpack_data_type(opal_buffer_t *buffer, void *dest,
 int opal_dss_unpack_byte_object(opal_buffer_t *buffer, void *dest,
                                 int32_t *num_vals, opal_data_type_t type);
 
-int opal_dss_unpack_pstat(opal_buffer_t *buffer, void *dest,
-                          int32_t *num_vals, opal_data_type_t type);
-
-int opal_dss_unpack_node_stat(opal_buffer_t *buffer, void *dest,
-                              int32_t *num_vals, opal_data_type_t type);
-
 int opal_dss_unpack_value(opal_buffer_t *buffer, void *dest,
                           int32_t *num_vals, opal_data_type_t type);
 
@@ -425,12 +413,6 @@ int opal_dss_copy_string(char **dest, char *src, opal_data_type_t type);
 int opal_dss_copy_byte_object(opal_byte_object_t **dest, opal_byte_object_t *src,
                               opal_data_type_t type);
 
-int opal_dss_copy_pstat(opal_pstats_t **dest, opal_pstats_t *src,
-                        opal_data_type_t type);
-
-int opal_dss_copy_node_stat(opal_node_stats_t **dest, opal_node_stats_t *src,
-                            opal_data_type_t type);
-
 int opal_dss_copy_value(opal_value_t **dest, opal_value_t *src,
                         opal_data_type_t type);
 
@@ -481,10 +463,6 @@ int opal_dss_compare_dt(opal_data_type_t *value1, opal_data_type_t *value2, opal
 
 int opal_dss_compare_byte_object(opal_byte_object_t *value1, opal_byte_object_t *value2, opal_data_type_t type);
 
-int opal_dss_compare_pstat(opal_pstats_t *value1, opal_pstats_t *value2, opal_data_type_t type);
-
-int opal_dss_compare_node_stat(opal_node_stats_t *value1, opal_node_stats_t *value2, opal_data_type_t type);
-
 int opal_dss_compare_value(opal_value_t *value1, opal_value_t *value2, opal_data_type_t type);
 
 int opal_dss_compare_buffer_contents(opal_buffer_t *value1, opal_buffer_t *value2, opal_data_type_t type);
@@ -540,8 +518,6 @@ int opal_dss_print_int64(char **output, char *prefix, void *src, opal_data_type_
 int opal_dss_print_null(char **output, char *prefix, void *src, opal_data_type_t type);
 int opal_dss_print_data_type(char **output, char *prefix, opal_data_type_t *src, opal_data_type_t type);
 int opal_dss_print_byte_object(char **output, char *prefix, opal_byte_object_t *src, opal_data_type_t type);
-int opal_dss_print_pstat(char **output, char *prefix, opal_pstats_t *src, opal_data_type_t type);
-int opal_dss_print_node_stat(char **output, char *prefix, opal_node_stats_t *src, opal_data_type_t type);
 int opal_dss_print_value(char **output, char *prefix, opal_value_t *src, opal_data_type_t type);
 int opal_dss_print_buffer_contents(char **output, char *prefix, opal_buffer_t *src, opal_data_type_t type);
 int opal_dss_print_float(char **output, char *prefix, float *src, opal_data_type_t type);

opal/dss/dss_open_close.c

@@ -11,7 +11,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
- * Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2017      IBM Corporation. All rights reserved.
@@ -149,94 +149,6 @@ OBJ_CLASS_INSTANCE(opal_dss_type_info_t, opal_object_t,
                    opal_dss_type_info_destruct);
 
 
-static void opal_pstat_construct(opal_pstats_t *obj)
-{
-    memset(obj->node, 0, sizeof(obj->node));
-    memset(obj->cmd, 0, sizeof(obj->cmd));
-    obj->rank = 0;
-    obj->pid = 0;
-    obj->state[0] = 'U';
-    obj->state[1] = '\0';
-    obj->percent_cpu = 0.0;
-    obj->time.tv_sec = 0;
-    obj->time.tv_usec = 0;
-    obj->priority = -1;
-    obj->num_threads = -1;
-    obj->pss = 0.0;
-    obj->vsize = 0.0;
-    obj->rss = 0.0;
-    obj->peak_vsize = 0.0;
-    obj->processor = -1;
-    obj->sample_time.tv_sec = 0;
-    obj->sample_time.tv_usec = 0;
-}
-OBJ_CLASS_INSTANCE(opal_pstats_t, opal_list_item_t,
-                   opal_pstat_construct,
-                   NULL);
-
-static void diskstat_cons(opal_diskstats_t *ptr)
-{
-    ptr->disk = NULL;
-}
-static void diskstat_dest(opal_diskstats_t *ptr)
-{
-    if (NULL != ptr->disk) {
-        free(ptr->disk);
-    }
-}
-OBJ_CLASS_INSTANCE(opal_diskstats_t,
-                   opal_list_item_t,
-                   diskstat_cons, diskstat_dest);
-
-static void netstat_cons(opal_netstats_t *ptr)
-{
-    ptr->net_interface = NULL;
-}
-static void netstat_dest(opal_netstats_t *ptr)
-{
-    if (NULL != ptr->net_interface) {
-        free(ptr->net_interface);
-    }
-}
-OBJ_CLASS_INSTANCE(opal_netstats_t,
-                   opal_list_item_t,
-                   netstat_cons, netstat_dest);
-
-static void opal_node_stats_construct(opal_node_stats_t *obj)
-{
-    obj->la = 0.0;
-    obj->la5 = 0.0;
-    obj->la15 = 0.0;
-    obj->total_mem = 0;
-    obj->free_mem = 0.0;
-    obj->buffers = 0.0;
-    obj->cached = 0.0;
-    obj->swap_cached = 0.0;
-    obj->swap_total = 0.0;
-    obj->swap_free = 0.0;
-    obj->mapped = 0.0;
-    obj->sample_time.tv_sec = 0;
-    obj->sample_time.tv_usec = 0;
-    OBJ_CONSTRUCT(&obj->diskstats, opal_list_t);
-    OBJ_CONSTRUCT(&obj->netstats, opal_list_t);
-}
-static void opal_node_stats_destruct(opal_node_stats_t *obj)
-{
-    opal_list_item_t *item;
-    while (NULL != (item = opal_list_remove_first(&obj->diskstats))) {
-        OBJ_RELEASE(item);
-    }
-    OBJ_DESTRUCT(&obj->diskstats);
-    while (NULL != (item = opal_list_remove_first(&obj->netstats))) {
-        OBJ_RELEASE(item);
-    }
-    OBJ_DESTRUCT(&obj->netstats);
-}
-OBJ_CLASS_INSTANCE(opal_node_stats_t, opal_object_t,
-                   opal_node_stats_construct,
-                   opal_node_stats_destruct);
-
-
 static void opal_envar_construct(opal_envar_t *obj)
 {
     obj->envar = NULL;
@@ -538,27 +450,6 @@ int opal_dss_open(void)
         return rc;
     }
 
-    tmp = OPAL_PSTAT;
-    if (OPAL_SUCCESS != (rc = opal_dss.register_type(opal_dss_pack_pstat,
-                                                     opal_dss_unpack_pstat,
-                                                     (opal_dss_copy_fn_t)opal_dss_copy_pstat,
-                                                     (opal_dss_compare_fn_t)opal_dss_compare_pstat,
-                                                     (opal_dss_print_fn_t)opal_dss_print_pstat,
-                                                     OPAL_DSS_STRUCTURED,
-                                                     "OPAL_PSTAT", &tmp))) {
-        return rc;
-    }
-
-    tmp = OPAL_NODE_STAT;
-    if (OPAL_SUCCESS != (rc = opal_dss.register_type(opal_dss_pack_node_stat,
-                                                     opal_dss_unpack_node_stat,
-                                                     (opal_dss_copy_fn_t)opal_dss_copy_node_stat,
-                                                     (opal_dss_compare_fn_t)opal_dss_compare_node_stat,
-                                                     (opal_dss_print_fn_t)opal_dss_print_node_stat,
-                                                     OPAL_DSS_STRUCTURED,
-                                                     "OPAL_NODE_STAT", &tmp))) {
-        return rc;
-    }
     tmp = OPAL_VALUE;
     if (OPAL_SUCCESS != (rc = opal_dss.register_type(opal_dss_pack_value,
                                                      opal_dss_unpack_value,