Add a few missing renames

rhc54 · rhc54 · commit 288eed9c5748 · 2022-05-19T03:10:31.000-07:00
Rename alfg, getid, strnlen, and timing headers
and code files to be consistent.

Signed-off-by: Ralph Castain &lt;rhc@pmix.org&gt;
diff --git a/src/mca/pmdl/mpich/pmdl_mpich.c b/src/mca/pmdl/mpich/pmdl_mpich.c
@@ -39,7 +39,7 @@
 #include "src/mca/base/pmix_mca_base_var.h"
 #include "src/mca/base/pmix_mca_base_vari.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/pmix_alfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_name_fns.h"
diff --git a/src/mca/pmdl/ompi/pmdl_ompi.c b/src/mca/pmdl/ompi/pmdl_ompi.c
@@ -39,7 +39,7 @@
 #include "src/mca/base/pmix_mca_base_var.h"
 #include "src/mca/base/pmix_mca_base_vari.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/pmix_alfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_name_fns.h"
diff --git a/src/mca/pmdl/oshmem/pmdl_oshmem.c b/src/mca/pmdl/oshmem/pmdl_oshmem.c
@@ -36,7 +36,7 @@
 #include "src/mca/base/pmix_mca_base_var.h"
 #include "src/mca/base/pmix_mca_base_vari.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/pmix_alfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_name_fns.h"
diff --git a/src/mca/pnet/nvd/pnet_nvd.c b/src/mca/pnet/nvd/pnet_nvd.c
@@ -36,7 +36,7 @@
 #include "src/mca/base/pmix_mca_base_var.h"
 #include "src/mca/pcompress/pcompress.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/pmix_alfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_name_fns.h"
diff --git a/src/mca/pnet/opa/pnet_opa.c b/src/mca/pnet/opa/pnet_opa.c
@@ -36,7 +36,7 @@
 #include "src/mca/base/pmix_mca_base_var.h"
 #include "src/mca/pcompress/pcompress.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/pmix_alfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_name_fns.h"
diff --git a/src/mca/pnet/simptest/pnet_simptest.c b/src/mca/pnet/simptest/pnet_simptest.c
@@ -35,7 +35,7 @@
 #include "src/include/pmix_socket_errno.h"
 #include "src/mca/base/pmix_mca_base_var.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/pmix_alfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_name_fns.h"
diff --git a/src/mca/pnet/tcp/pnet_tcp.c b/src/mca/pnet/tcp/pnet_tcp.c
@@ -34,7 +34,7 @@
 #include "src/include/pmix_globals.h"
 #include "src/include/pmix_socket_errno.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/apmix_lfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_output.h"
diff --git a/src/mca/pnet/usnic/pnet_usnic.c b/src/mca/pnet/usnic/pnet_usnic.c
@@ -36,7 +36,7 @@
 #include "src/mca/base/pmix_mca_base_var.h"
 #include "src/mca/pcompress/pcompress.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/pmix_alfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_name_fns.h"
diff --git a/src/mca/prm/default/prm_default.c b/src/mca/prm/default/prm_default.c
@@ -34,7 +34,7 @@
 #include "src/include/pmix_globals.h"
 #include "src/include/pmix_socket_errno.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/pmix_alfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_output.h"
diff --git a/src/mca/prm/hpesmf/prm_hpesmf.c b/src/mca/prm/hpesmf/prm_hpesmf.c
@@ -34,7 +34,7 @@
 #include "src/include/pmix_globals.h"
 #include "src/include/pmix_socket_errno.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/pmix_alfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_output.h"
diff --git a/src/mca/prm/tm/prm_tm.c b/src/mca/prm/tm/prm_tm.c
@@ -34,7 +34,7 @@
 #include "src/include/pmix_globals.h"
 #include "src/include/pmix_socket_errno.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/pmix_alfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_output.h"
diff --git a/src/mca/pstrg/lustre/pstrg_lustre.c b/src/mca/pstrg/lustre/pstrg_lustre.c
@@ -34,7 +34,7 @@
 #include "src/include/pmix_socket_errno.h"
 #include "src/mca/base/pmix_mca_base_var.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/pmix_alfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_output.h"
diff --git a/src/mca/pstrg/vfs/pstrg_vfs.c b/src/mca/pstrg/vfs/pstrg_vfs.c
@@ -34,7 +34,7 @@
 #include "src/include/pmix_socket_errno.h"
 #include "src/mca/base/pmix_mca_base_var.h"
 #include "src/mca/preg/preg.h"
-#include "src/util/alfg.h"
+#include "src/util/pmix_alfg.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_output.h"
diff --git a/src/mca/ptl/base/ptl_base_connect.c b/src/mca/ptl/base/ptl_base_connect.c
@@ -54,11 +54,11 @@
 #include "src/server/pmix_server_ops.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
-#include "src/util/getid.h"
+#include "src/util/pmix_getid.h"
 #include "src/util/pmix_os_path.h"
 #include "src/util/pmix_printf.h"
 #include "src/util/pmix_show_help.h"
-#include "src/util/strnlen.h"
+#include "src/util/pmix_strnlen.h"
 
 #include "src/mca/ptl/base/base.h"
 
diff --git a/src/mca/ptl/base/ptl_base_connection_hdlr.c b/src/mca/ptl/base/ptl_base_connection_hdlr.c
@@ -40,8 +40,8 @@
 #include "src/server/pmix_server_ops.h"
 #include "src/util/pmix_argv.h"
 #include "src/util/pmix_error.h"
-#include "src/util/getid.h"
-#include "src/util/strnlen.h"
+#include "src/util/pmix_getid.h"
+#include "src/util/pmix_strnlen.h"
 
 #include "src/mca/ptl/base/base.h"
 #include "src/mca/ptl/base/ptl_base_handshake.h"
diff --git a/src/runtime/pmix_params.c b/src/runtime/pmix_params.c
@@ -38,7 +38,7 @@
 #include "src/mca/base/pmix_mca_base_var.h"
 #include "src/runtime/pmix_rte.h"
 #include "src/server/pmix_server_ops.h"
-#include "src/util/timings.h"
+#include "src/util/pmix_timings.h"
 
 #if PMIX_ENABLE_TIMING
 char *pmix_timing_output = NULL;
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
@@ -36,23 +36,23 @@ dist_pmixdata_DATA = \
     help-cli.txt
 
 headers = \
-        alfg.h \
+        pmix_alfg.h \
         pmix_argv.h \
         pmix_cmd_line.h \
         pmix_error.h \
         pmix_printf.h \
         pmix_output.h \
         pmix_environ.h \
         pmix_fd.h \
-        timings.h \
+        pmix_timings.h \
         pmix_os_dirpath.h \
         pmix_os_path.h \
         pmix_basename.h \
         pmix_keyval_parse.h \
         pmix_show_help.h \
         pmix_path.h \
-        getid.h \
-        strnlen.h \
+        pmix_getid.h \
+        pmix_strnlen.h \
         pmix_shmem.h \
         pmix_vmem.h \
         pmix_hash.h \
@@ -67,22 +67,22 @@ headers = \
         pmix_getcwd.h
 
 sources = \
-        alfg.c \
+        pmix_alfg.c \
         pmix_argv.c \
         pmix_cmd_line.c \
         pmix_error.c \
         pmix_printf.c \
         pmix_output.c \
         pmix_environ.c \
         pmix_fd.c \
-        timings.c \
+        pmix_timings.c \
         pmix_os_dirpath.c \
         pmix_os_path.c \
         pmix_basename.c \
         pmix_keyval_parse.c \
         pmix_show_help.c \
         pmix_path.c \
-        getid.c \
+        pmix_getid.c \
         pmix_shmem.c \
         pmix_vmem.c \
         pmix_hash.c \
diff --git a/src/util/pmix_alfg.c b/src/util/pmix_alfg.c
@@ -16,7 +16,7 @@
 
 #include <string.h>
 
-#include "alfg.h"
+#include "pmix_alfg.h"
 
 /* Mask corresponding to the primitive polynomial
  *---------------------------------------------------
diff --git a/src/util/pmix_alfg.h b/src/util/pmix_alfg.h
diff --git a/src/util/pmix_getid.c b/src/util/pmix_getid.c
@@ -38,7 +38,7 @@
 #include "src/util/pmix_error.h"
 #include "src/util/pmix_output.h"
 
-#include "src/util/getid.h"
+#include "src/util/pmix_getid.h"
 
 pmix_status_t pmix_util_getid(int sd, uid_t *uid, gid_t *gid)
 {
diff --git a/src/util/pmix_getid.h b/src/util/pmix_getid.h
diff --git a/src/util/pmix_strnlen.h b/src/util/pmix_strnlen.h
diff --git a/src/util/pmix_timings.c b/src/util/pmix_timings.c
@@ -35,14 +35,15 @@
 
 #if PMIX_ENABLE_TIMING
 
-#    include "src/class/pmix_list.h"
-#    include "src/class/pmix_pointer_array.h"
-#    include "src/util/pmix_basename.h"
-#    include "src/util/pmix_output.h"
+#include "src/class/pmix_list.h"
+#include "src/class/pmix_pointer_array.h"
+#include "src/include/pmix_globals.h"
+#include "src/util/pmix_basename.h"
+#include "src/util/pmix_output.h"
 
-#    include "src/util/timings.h"
+#include "src/util/pmix_timings.h"
 
-#    define DELTAS_SANE_LIMIT (10 * 1024 * 1024)
+#define DELTAS_SANE_LIMIT (10 * 1024 * 1024)
 
 struct interval_descr {
     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, ...)
 pmix_timing_prep_t pmix_timing_prep_ev_end(pmix_timing_t *t, const char *fmt, ...)
 {
     pmix_timing_prep_t p = {t, NULL, 0};
+    PMIX_HIDE_UNUSED_PARAMS(fmt);
 
     if (t->current_id >= 0) {
         pmix_timing_event_t *ev = pmix_timing_event_alloc(t);
         if (ev == NULL) {
-            pmix_timing_prep_t p = {t, NULL, PMIX_ERR_OUT_OF_RESOURCE};
-            return p;
+            pmix_timing_prep_t p2 = {t, NULL, PMIX_ERR_OUT_OF_RESOURCE};
+            return p2;
         }
         PMIX_CONSTRUCT(ev, pmix_timing_event_t);
         ev->ts = t->get_ts();
@@ -461,7 +463,6 @@ int pmix_timing_deltas(pmix_timing_t *t, char *fname)
             /* this event caused buffered memory allocation
              * for events. Account the overhead for all active
              * intervals. */
-            int i;
             for (i = 0; i < t->next_id_cntr; i++) {
                 if ((NULL != descr[i].descr_ev) && (NULL != descr[i].begin_ev)) {
                     if (pmix_timing_overhead) {
diff --git a/src/util/pmix_timings.h b/src/util/pmix_timings.h
