Skip to content

Commit 3366f3e

Browse files
authored
Merge pull request #7436 from rhc54/topic/pstat
Remove the unused opal/pstat framework
2 parents dd5991f + 254dd22 commit 3366f3e

27 files changed

+8
-2480
lines changed

opal/dss/dss_compare.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
1313
* Copyright (c) 2014-2016 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
15-
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
15+
* Copyright (c) 2014-2020 Intel, Inc. All rights reserved.
1616
* $COPYRIGHT$
1717
*
1818
* Additional copyrights may follow
@@ -290,18 +290,6 @@ int opal_dss_compare_byte_object(opal_byte_object_t *value1, opal_byte_object_t
290290
return OPAL_EQUAL; /* sum of both value's bytes was identical */
291291
}
292292

293-
/* OPAL_PSTAT */
294-
int opal_dss_compare_pstat(opal_pstats_t *value1, opal_pstats_t *value2, opal_data_type_t type)
295-
{
296-
return OPAL_EQUAL; /* eventually compare field to field */
297-
}
298-
299-
/* OPAL_NODE_STAT */
300-
int opal_dss_compare_node_stat(opal_node_stats_t *value1, opal_node_stats_t *value2, opal_data_type_t type)
301-
{
302-
return OPAL_EQUAL; /* eventually compare field to field */
303-
}
304-
305293
/* OPAL_VALUE */
306294
int opal_dss_compare_value(opal_value_t *value1, opal_value_t *value2, opal_data_type_t type)
307295
{

opal/dss/dss_copy.c

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* University of Stuttgart. All rights reserved.
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
12-
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
12+
* Copyright (c) 2014-2020 Intel, Inc. All rights reserved.
1313
* Copyright (c) 2014-2015 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
@@ -197,62 +197,6 @@ int opal_dss_copy_byte_object(opal_byte_object_t **dest, opal_byte_object_t *src
197197
return OPAL_SUCCESS;
198198
}
199199

200-
/* OPAL_PSTAT */
201-
int opal_dss_copy_pstat(opal_pstats_t **dest, opal_pstats_t *src,
202-
opal_data_type_t type)
203-
{
204-
opal_pstats_t *p;
205-
206-
/* create the new object */
207-
*dest = OBJ_NEW(opal_pstats_t);
208-
if (NULL == *dest) {
209-
return OPAL_ERR_OUT_OF_RESOURCE;
210-
}
211-
p = *dest;
212-
213-
/* copy the individual fields */
214-
memcpy(p->node, src->node, sizeof(src->node));
215-
p->rank = src->rank;
216-
p->pid = src->pid;
217-
memcpy(p->cmd, src->cmd, sizeof(src->cmd));
218-
p->state[0] = src->state[0];
219-
p->time = src->time;
220-
p->priority = src->priority;
221-
p->num_threads = src->num_threads;
222-
p->pss = src->pss;
223-
p->vsize = src->vsize;
224-
p->rss = src->rss;
225-
p->peak_vsize = src->peak_vsize;
226-
p->processor = src->processor;
227-
p->sample_time.tv_sec = src->sample_time.tv_sec;
228-
p->sample_time.tv_usec = src->sample_time.tv_usec;
229-
return OPAL_SUCCESS;
230-
}
231-
232-
/* OPAL_NODE_STAT */
233-
int opal_dss_copy_node_stat(opal_node_stats_t **dest, opal_node_stats_t *src,
234-
opal_data_type_t type)
235-
{
236-
opal_node_stats_t *p;
237-
238-
/* create the new object */
239-
*dest = OBJ_NEW(opal_node_stats_t);
240-
if (NULL == *dest) {
241-
return OPAL_ERR_OUT_OF_RESOURCE;
242-
}
243-
p = *dest;
244-
245-
/* copy the individual fields */
246-
p->la = src->la;
247-
p->la5 = src->la5;
248-
p->la15 = src->la15;
249-
p->total_mem = src->total_mem;
250-
p->free_mem = src->free_mem;
251-
p->sample_time.tv_sec = src->sample_time.tv_sec;
252-
p->sample_time.tv_usec = src->sample_time.tv_usec;
253-
return OPAL_SUCCESS;
254-
}
255-
256200
/* OPAL_VALUE */
257201
int opal_dss_copy_value(opal_value_t **dest, opal_value_t *src,
258202
opal_data_type_t type)

opal/dss/dss_internal.h

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
1313
* Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
14-
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
14+
* Copyright (c) 2014-2020 Intel, Inc. All rights reserved.
1515
* Copyright (c) 2014 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
1717
* 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,
299299
int opal_dss_pack_byte_object(opal_buffer_t *buffer, const void *src,
300300
int32_t num_vals, opal_data_type_t type);
301301

302-
int opal_dss_pack_pstat(opal_buffer_t *buffer, const void *src,
303-
int32_t num_vals, opal_data_type_t type);
304-
305-
int opal_dss_pack_node_stat(opal_buffer_t *buffer, const void *src,
306-
int32_t num_vals, opal_data_type_t type);
307-
308302
int opal_dss_pack_value(opal_buffer_t *buffer, const void *src,
309303
int32_t num_vals, opal_data_type_t type);
310304

@@ -373,12 +367,6 @@ int opal_dss_unpack_data_type(opal_buffer_t *buffer, void *dest,
373367
int opal_dss_unpack_byte_object(opal_buffer_t *buffer, void *dest,
374368
int32_t *num_vals, opal_data_type_t type);
375369

376-
int opal_dss_unpack_pstat(opal_buffer_t *buffer, void *dest,
377-
int32_t *num_vals, opal_data_type_t type);
378-
379-
int opal_dss_unpack_node_stat(opal_buffer_t *buffer, void *dest,
380-
int32_t *num_vals, opal_data_type_t type);
381-
382370
int opal_dss_unpack_value(opal_buffer_t *buffer, void *dest,
383371
int32_t *num_vals, opal_data_type_t type);
384372

@@ -425,12 +413,6 @@ int opal_dss_copy_string(char **dest, char *src, opal_data_type_t type);
425413
int opal_dss_copy_byte_object(opal_byte_object_t **dest, opal_byte_object_t *src,
426414
opal_data_type_t type);
427415

428-
int opal_dss_copy_pstat(opal_pstats_t **dest, opal_pstats_t *src,
429-
opal_data_type_t type);
430-
431-
int opal_dss_copy_node_stat(opal_node_stats_t **dest, opal_node_stats_t *src,
432-
opal_data_type_t type);
433-
434416
int opal_dss_copy_value(opal_value_t **dest, opal_value_t *src,
435417
opal_data_type_t type);
436418

@@ -481,10 +463,6 @@ int opal_dss_compare_dt(opal_data_type_t *value1, opal_data_type_t *value2, opal
481463

482464
int opal_dss_compare_byte_object(opal_byte_object_t *value1, opal_byte_object_t *value2, opal_data_type_t type);
483465

484-
int opal_dss_compare_pstat(opal_pstats_t *value1, opal_pstats_t *value2, opal_data_type_t type);
485-
486-
int opal_dss_compare_node_stat(opal_node_stats_t *value1, opal_node_stats_t *value2, opal_data_type_t type);
487-
488466
int opal_dss_compare_value(opal_value_t *value1, opal_value_t *value2, opal_data_type_t type);
489467

490468
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_
540518
int opal_dss_print_null(char **output, char *prefix, void *src, opal_data_type_t type);
541519
int opal_dss_print_data_type(char **output, char *prefix, opal_data_type_t *src, opal_data_type_t type);
542520
int opal_dss_print_byte_object(char **output, char *prefix, opal_byte_object_t *src, opal_data_type_t type);
543-
int opal_dss_print_pstat(char **output, char *prefix, opal_pstats_t *src, opal_data_type_t type);
544-
int opal_dss_print_node_stat(char **output, char *prefix, opal_node_stats_t *src, opal_data_type_t type);
545521
int opal_dss_print_value(char **output, char *prefix, opal_value_t *src, opal_data_type_t type);
546522
int opal_dss_print_buffer_contents(char **output, char *prefix, opal_buffer_t *src, opal_data_type_t type);
547523
int opal_dss_print_float(char **output, char *prefix, float *src, opal_data_type_t type);

opal/dss/dss_open_close.c

Lines changed: 1 addition & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Copyright (c) 2004-2005 The Regents of the University of California.
1212
* All rights reserved.
1313
* Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
14-
* Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
14+
* Copyright (c) 2014-2020 Intel, Inc. All rights reserved.
1515
* Copyright (c) 2015 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
1717
* Copyright (c) 2017 IBM Corporation. All rights reserved.
@@ -149,94 +149,6 @@ OBJ_CLASS_INSTANCE(opal_dss_type_info_t, opal_object_t,
149149
opal_dss_type_info_destruct);
150150

151151

152-
static void opal_pstat_construct(opal_pstats_t *obj)
153-
{
154-
memset(obj->node, 0, sizeof(obj->node));
155-
memset(obj->cmd, 0, sizeof(obj->cmd));
156-
obj->rank = 0;
157-
obj->pid = 0;
158-
obj->state[0] = 'U';
159-
obj->state[1] = '\0';
160-
obj->percent_cpu = 0.0;
161-
obj->time.tv_sec = 0;
162-
obj->time.tv_usec = 0;
163-
obj->priority = -1;
164-
obj->num_threads = -1;
165-
obj->pss = 0.0;
166-
obj->vsize = 0.0;
167-
obj->rss = 0.0;
168-
obj->peak_vsize = 0.0;
169-
obj->processor = -1;
170-
obj->sample_time.tv_sec = 0;
171-
obj->sample_time.tv_usec = 0;
172-
}
173-
OBJ_CLASS_INSTANCE(opal_pstats_t, opal_list_item_t,
174-
opal_pstat_construct,
175-
NULL);
176-
177-
static void diskstat_cons(opal_diskstats_t *ptr)
178-
{
179-
ptr->disk = NULL;
180-
}
181-
static void diskstat_dest(opal_diskstats_t *ptr)
182-
{
183-
if (NULL != ptr->disk) {
184-
free(ptr->disk);
185-
}
186-
}
187-
OBJ_CLASS_INSTANCE(opal_diskstats_t,
188-
opal_list_item_t,
189-
diskstat_cons, diskstat_dest);
190-
191-
static void netstat_cons(opal_netstats_t *ptr)
192-
{
193-
ptr->net_interface = NULL;
194-
}
195-
static void netstat_dest(opal_netstats_t *ptr)
196-
{
197-
if (NULL != ptr->net_interface) {
198-
free(ptr->net_interface);
199-
}
200-
}
201-
OBJ_CLASS_INSTANCE(opal_netstats_t,
202-
opal_list_item_t,
203-
netstat_cons, netstat_dest);
204-
205-
static void opal_node_stats_construct(opal_node_stats_t *obj)
206-
{
207-
obj->la = 0.0;
208-
obj->la5 = 0.0;
209-
obj->la15 = 0.0;
210-
obj->total_mem = 0;
211-
obj->free_mem = 0.0;
212-
obj->buffers = 0.0;
213-
obj->cached = 0.0;
214-
obj->swap_cached = 0.0;
215-
obj->swap_total = 0.0;
216-
obj->swap_free = 0.0;
217-
obj->mapped = 0.0;
218-
obj->sample_time.tv_sec = 0;
219-
obj->sample_time.tv_usec = 0;
220-
OBJ_CONSTRUCT(&obj->diskstats, opal_list_t);
221-
OBJ_CONSTRUCT(&obj->netstats, opal_list_t);
222-
}
223-
static void opal_node_stats_destruct(opal_node_stats_t *obj)
224-
{
225-
opal_list_item_t *item;
226-
while (NULL != (item = opal_list_remove_first(&obj->diskstats))) {
227-
OBJ_RELEASE(item);
228-
}
229-
OBJ_DESTRUCT(&obj->diskstats);
230-
while (NULL != (item = opal_list_remove_first(&obj->netstats))) {
231-
OBJ_RELEASE(item);
232-
}
233-
OBJ_DESTRUCT(&obj->netstats);
234-
}
235-
OBJ_CLASS_INSTANCE(opal_node_stats_t, opal_object_t,
236-
opal_node_stats_construct,
237-
opal_node_stats_destruct);
238-
239-
240152
static void opal_envar_construct(opal_envar_t *obj)
241153
{
242154
obj->envar = NULL;
@@ -538,27 +450,6 @@ int opal_dss_open(void)
538450
return rc;
539451
}
540452

541-
tmp = OPAL_PSTAT;
542-
if (OPAL_SUCCESS != (rc = opal_dss.register_type(opal_dss_pack_pstat,
543-
opal_dss_unpack_pstat,
544-
(opal_dss_copy_fn_t)opal_dss_copy_pstat,
545-
(opal_dss_compare_fn_t)opal_dss_compare_pstat,
546-
(opal_dss_print_fn_t)opal_dss_print_pstat,
547-
OPAL_DSS_STRUCTURED,
548-
"OPAL_PSTAT", &tmp))) {
549-
return rc;
550-
}
551-
552-
tmp = OPAL_NODE_STAT;
553-
if (OPAL_SUCCESS != (rc = opal_dss.register_type(opal_dss_pack_node_stat,
554-
opal_dss_unpack_node_stat,
555-
(opal_dss_copy_fn_t)opal_dss_copy_node_stat,
556-
(opal_dss_compare_fn_t)opal_dss_compare_node_stat,
557-
(opal_dss_print_fn_t)opal_dss_print_node_stat,
558-
OPAL_DSS_STRUCTURED,
559-
"OPAL_NODE_STAT", &tmp))) {
560-
return rc;
561-
}
562453
tmp = OPAL_VALUE;
563454
if (OPAL_SUCCESS != (rc = opal_dss.register_type(opal_dss_pack_value,
564455
opal_dss_unpack_value,

0 commit comments

Comments
 (0)