Skip to content

Commit 288eed9

Browse files
rhc54rhc54
committed
Add a few missing renames
Rename alfg, getid, strnlen, and timing headers and code files to be consistent. Signed-off-by: Ralph Castain <[email protected]>
1 parent 4d2e2b5 commit 288eed9

24 files changed

+37
-36
lines changed

‎src/mca/pmdl/mpich/pmdl_mpich.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "src/mca/base/pmix_mca_base_var.h"
4040
#include "src/mca/base/pmix_mca_base_vari.h"
4141
#include "src/mca/preg/preg.h"
42-
#include "src/util/alfg.h"
42+
#include "src/util/pmix_alfg.h"
4343
#include "src/util/pmix_argv.h"
4444
#include "src/util/pmix_error.h"
4545
#include "src/util/pmix_name_fns.h"

‎src/mca/pmdl/ompi/pmdl_ompi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "src/mca/base/pmix_mca_base_var.h"
4040
#include "src/mca/base/pmix_mca_base_vari.h"
4141
#include "src/mca/preg/preg.h"
42-
#include "src/util/alfg.h"
42+
#include "src/util/pmix_alfg.h"
4343
#include "src/util/pmix_argv.h"
4444
#include "src/util/pmix_error.h"
4545
#include "src/util/pmix_name_fns.h"

‎src/mca/pmdl/oshmem/pmdl_oshmem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "src/mca/base/pmix_mca_base_var.h"
3737
#include "src/mca/base/pmix_mca_base_vari.h"
3838
#include "src/mca/preg/preg.h"
39-
#include "src/util/alfg.h"
39+
#include "src/util/pmix_alfg.h"
4040
#include "src/util/pmix_argv.h"
4141
#include "src/util/pmix_error.h"
4242
#include "src/util/pmix_name_fns.h"

‎src/mca/pnet/nvd/pnet_nvd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "src/mca/base/pmix_mca_base_var.h"
3737
#include "src/mca/pcompress/pcompress.h"
3838
#include "src/mca/preg/preg.h"
39-
#include "src/util/alfg.h"
39+
#include "src/util/pmix_alfg.h"
4040
#include "src/util/pmix_argv.h"
4141
#include "src/util/pmix_error.h"
4242
#include "src/util/pmix_name_fns.h"

‎src/mca/pnet/opa/pnet_opa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "src/mca/base/pmix_mca_base_var.h"
3737
#include "src/mca/pcompress/pcompress.h"
3838
#include "src/mca/preg/preg.h"
39-
#include "src/util/alfg.h"
39+
#include "src/util/pmix_alfg.h"
4040
#include "src/util/pmix_argv.h"
4141
#include "src/util/pmix_error.h"
4242
#include "src/util/pmix_name_fns.h"

‎src/mca/pnet/simptest/pnet_simptest.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "src/include/pmix_socket_errno.h"
3636
#include "src/mca/base/pmix_mca_base_var.h"
3737
#include "src/mca/preg/preg.h"
38-
#include "src/util/alfg.h"
38+
#include "src/util/pmix_alfg.h"
3939
#include "src/util/pmix_argv.h"
4040
#include "src/util/pmix_error.h"
4141
#include "src/util/pmix_name_fns.h"

‎src/mca/pnet/tcp/pnet_tcp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "src/include/pmix_globals.h"
3535
#include "src/include/pmix_socket_errno.h"
3636
#include "src/mca/preg/preg.h"
37-
#include "src/util/alfg.h"
37+
#include "src/util/apmix_lfg.h"
3838
#include "src/util/pmix_argv.h"
3939
#include "src/util/pmix_error.h"
4040
#include "src/util/pmix_output.h"

‎src/mca/pnet/usnic/pnet_usnic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "src/mca/base/pmix_mca_base_var.h"
3737
#include "src/mca/pcompress/pcompress.h"
3838
#include "src/mca/preg/preg.h"
39-
#include "src/util/alfg.h"
39+
#include "src/util/pmix_alfg.h"
4040
#include "src/util/pmix_argv.h"
4141
#include "src/util/pmix_error.h"
4242
#include "src/util/pmix_name_fns.h"

‎src/mca/prm/default/prm_default.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "src/include/pmix_globals.h"
3535
#include "src/include/pmix_socket_errno.h"
3636
#include "src/mca/preg/preg.h"
37-
#include "src/util/alfg.h"
37+
#include "src/util/pmix_alfg.h"
3838
#include "src/util/pmix_argv.h"
3939
#include "src/util/pmix_error.h"
4040
#include "src/util/pmix_output.h"

‎src/mca/prm/hpesmf/prm_hpesmf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "src/include/pmix_globals.h"
3535
#include "src/include/pmix_socket_errno.h"
3636
#include "src/mca/preg/preg.h"
37-
#include "src/util/alfg.h"
37+
#include "src/util/pmix_alfg.h"
3838
#include "src/util/pmix_argv.h"
3939
#include "src/util/pmix_error.h"
4040
#include "src/util/pmix_output.h"

‎src/mca/prm/tm/prm_tm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "src/include/pmix_globals.h"
3535
#include "src/include/pmix_socket_errno.h"
3636
#include "src/mca/preg/preg.h"
37-
#include "src/util/alfg.h"
37+
#include "src/util/pmix_alfg.h"
3838
#include "src/util/pmix_argv.h"
3939
#include "src/util/pmix_error.h"
4040
#include "src/util/pmix_output.h"

‎src/mca/pstrg/lustre/pstrg_lustre.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "src/include/pmix_socket_errno.h"
3535
#include "src/mca/base/pmix_mca_base_var.h"
3636
#include "src/mca/preg/preg.h"
37-
#include "src/util/alfg.h"
37+
#include "src/util/pmix_alfg.h"
3838
#include "src/util/pmix_argv.h"
3939
#include "src/util/pmix_error.h"
4040
#include "src/util/pmix_output.h"

‎src/mca/pstrg/vfs/pstrg_vfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "src/include/pmix_socket_errno.h"
3535
#include "src/mca/base/pmix_mca_base_var.h"
3636
#include "src/mca/preg/preg.h"
37-
#include "src/util/alfg.h"
37+
#include "src/util/pmix_alfg.h"
3838
#include "src/util/pmix_argv.h"
3939
#include "src/util/pmix_error.h"
4040
#include "src/util/pmix_output.h"

‎src/mca/ptl/base/ptl_base_connect.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@
5454
#include "src/server/pmix_server_ops.h"
5555
#include "src/util/pmix_argv.h"
5656
#include "src/util/pmix_error.h"
57-
#include "src/util/getid.h"
57+
#include "src/util/pmix_getid.h"
5858
#include "src/util/pmix_os_path.h"
5959
#include "src/util/pmix_printf.h"
6060
#include "src/util/pmix_show_help.h"
61-
#include "src/util/strnlen.h"
61+
#include "src/util/pmix_strnlen.h"
6262

6363
#include "src/mca/ptl/base/base.h"
6464

‎src/mca/ptl/base/ptl_base_connection_hdlr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
#include "src/server/pmix_server_ops.h"
4141
#include "src/util/pmix_argv.h"
4242
#include "src/util/pmix_error.h"
43-
#include "src/util/getid.h"
44-
#include "src/util/strnlen.h"
43+
#include "src/util/pmix_getid.h"
44+
#include "src/util/pmix_strnlen.h"
4545

4646
#include "src/mca/ptl/base/base.h"
4747
#include "src/mca/ptl/base/ptl_base_handshake.h"

‎src/runtime/pmix_params.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "src/mca/base/pmix_mca_base_var.h"
3939
#include "src/runtime/pmix_rte.h"
4040
#include "src/server/pmix_server_ops.h"
41-
#include "src/util/timings.h"
41+
#include "src/util/pmix_timings.h"
4242

4343
#if PMIX_ENABLE_TIMING
4444
char *pmix_timing_output = NULL;

‎src/util/Makefile.am

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@ dist_pmixdata_DATA = \
3636
help-cli.txt
3737

3838
headers = \
39-
alfg.h \
39+
pmix_alfg.h \
4040
pmix_argv.h \
4141
pmix_cmd_line.h \
4242
pmix_error.h \
4343
pmix_printf.h \
4444
pmix_output.h \
4545
pmix_environ.h \
4646
pmix_fd.h \
47-
timings.h \
47+
pmix_timings.h \
4848
pmix_os_dirpath.h \
4949
pmix_os_path.h \
5050
pmix_basename.h \
5151
pmix_keyval_parse.h \
5252
pmix_show_help.h \
5353
pmix_path.h \
54-
getid.h \
55-
strnlen.h \
54+
pmix_getid.h \
55+
pmix_strnlen.h \
5656
pmix_shmem.h \
5757
pmix_vmem.h \
5858
pmix_hash.h \
@@ -67,22 +67,22 @@ headers = \
6767
pmix_getcwd.h
6868

6969
sources = \
70-
alfg.c \
70+
pmix_alfg.c \
7171
pmix_argv.c \
7272
pmix_cmd_line.c \
7373
pmix_error.c \
7474
pmix_printf.c \
7575
pmix_output.c \
7676
pmix_environ.c \
7777
pmix_fd.c \
78-
timings.c \
78+
pmix_timings.c \
7979
pmix_os_dirpath.c \
8080
pmix_os_path.c \
8181
pmix_basename.c \
8282
pmix_keyval_parse.c \
8383
pmix_show_help.c \
8484
pmix_path.c \
85-
getid.c \
85+
pmix_getid.c \
8686
pmix_shmem.c \
8787
pmix_vmem.c \
8888
pmix_hash.c \

‎src/util/alfg.c renamed to ‎src/util/pmix_alfg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <string.h>
1818

19-
#include "alfg.h"
19+
#include "pmix_alfg.h"
2020

2121
/* Mask corresponding to the primitive polynomial
2222
*---------------------------------------------------

‎src/util/alfg.h renamed to ‎src/util/pmix_alfg.h

File renamed without changes.

‎src/util/getid.c renamed to ‎src/util/pmix_getid.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "src/util/pmix_error.h"
3939
#include "src/util/pmix_output.h"
4040

41-
#include "src/util/getid.h"
41+
#include "src/util/pmix_getid.h"
4242

4343
pmix_status_t pmix_util_getid(int sd, uid_t *uid, gid_t *gid)
4444
{

‎src/util/getid.h renamed to ‎src/util/pmix_getid.h

File renamed without changes.

‎src/util/strnlen.h renamed to ‎src/util/pmix_strnlen.h

File renamed without changes.

‎src/util/timings.c renamed to ‎src/util/pmix_timings.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,15 @@
3535

3636
#if PMIX_ENABLE_TIMING
3737

38-
# include "src/class/pmix_list.h"
39-
# include "src/class/pmix_pointer_array.h"
40-
# include "src/util/pmix_basename.h"
41-
# include "src/util/pmix_output.h"
38+
#include "src/class/pmix_list.h"
39+
#include "src/class/pmix_pointer_array.h"
40+
#include "src/include/pmix_globals.h"
41+
#include "src/util/pmix_basename.h"
42+
#include "src/util/pmix_output.h"
4243

43-
# include "src/util/timings.h"
44+
#include "src/util/pmix_timings.h"
4445

45-
# define DELTAS_SANE_LIMIT (10 * 1024 * 1024)
46+
#define DELTAS_SANE_LIMIT (10 * 1024 * 1024)
4647

4748
struct interval_descr {
4849
pmix_timing_event_t *descr_ev, *begin_ev;
@@ -144,12 +145,13 @@ pmix_timing_prep_t pmix_timing_prep_ev(pmix_timing_t *t, const char *fmt, ...)
144145
pmix_timing_prep_t pmix_timing_prep_ev_end(pmix_timing_t *t, const char *fmt, ...)
145146
{
146147
pmix_timing_prep_t p = {t, NULL, 0};
148+
PMIX_HIDE_UNUSED_PARAMS(fmt);
147149

148150
if (t->current_id >= 0) {
149151
pmix_timing_event_t *ev = pmix_timing_event_alloc(t);
150152
if (ev == NULL) {
151-
pmix_timing_prep_t p = {t, NULL, PMIX_ERR_OUT_OF_RESOURCE};
152-
return p;
153+
pmix_timing_prep_t p2 = {t, NULL, PMIX_ERR_OUT_OF_RESOURCE};
154+
return p2;
153155
}
154156
PMIX_CONSTRUCT(ev, pmix_timing_event_t);
155157
ev->ts = t->get_ts();
@@ -461,7 +463,6 @@ int pmix_timing_deltas(pmix_timing_t *t, char *fname)
461463
/* this event caused buffered memory allocation
462464
* for events. Account the overhead for all active
463465
* intervals. */
464-
int i;
465466
for (i = 0; i < t->next_id_cntr; i++) {
466467
if ((NULL != descr[i].descr_ev) && (NULL != descr[i].begin_ev)) {
467468
if (pmix_timing_overhead) {

‎src/util/timings.h renamed to ‎src/util/pmix_timings.h

File renamed without changes.

0 commit comments

Comments
 (0)