Globally include "czmq_containers.h"

Problem: To avoid bugs in most OS distro's versions of czmq, we want internal flux callers to use the internal "fzhashx" library instead of the czmq "zhashx" library whenever a "zhashx" is used. Solution: Include the file "czmq_containers.h" whereever zhashx data structures are used. Update Makefile.am files to add libczmqcontainers.la when appropriate. Fixes #3591
flux-framework · Apr 16, 2021 · 6771b05 · 6771b05
1 parent a5cd32a
commit 6771b05
Show file tree

Hide file tree

Showing 53 changed files with 80 additions and 1 deletion.
diff --git a/src/broker/content-cache.c b/src/broker/content-cache.c
@@ -20,6 +20,7 @@
 #include "src/common/libutil/blobref.h"
 #include "src/common/libutil/iterators.h"
 #include "src/common/libutil/log.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "attr.h"
 #include "content-cache.h"

diff --git a/src/broker/runat.c b/src/broker/runat.c
@@ -28,6 +28,7 @@
 
 #include "src/common/libutil/log.h"
 #include "src/common/libutil/monotime.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "runat.h"
 

diff --git a/src/cmd/Makefile.am b/src/cmd/Makefile.am
@@ -90,11 +90,13 @@ fluxcmd_PROGRAMS = \
 
 flux_start_LDADD = \
 	$(fluxcmd_ldadd) \
-	$(top_builddir)/src/common/libpmi/libpmi_server.la
+	$(top_builddir)/src/common/libpmi/libpmi_server.la \
+	$(top_builddir)/src/common/libczmqcontainers/libczmqcontainers.la
 
 flux_job_LDADD = \
 	$(fluxcmd_ldadd) \
 	$(top_builddir)/src/shell/libmpir.la \
+	$(top_builddir)/src/common/libczmqcontainers/libczmqcontainers.la \
 	$(top_builddir)/src/common/libdebugged/libdebugged.la \
 	$(top_builddir)/src/common/libterminus/libterminus.la
 
@@ -108,6 +110,7 @@ flux_terminus_LDADD = \
 flux_R_LDADD = \
 	$(fluxcmd_ldadd) \
 	$(top_builddir)/src/common/librlist/librlist.la \
+	$(top_builddir)/src/common/libczmqcontainers/libczmqcontainers.la \
 	$(top_builddir)/src/common/libhostlist/libhostlist.la \
 	$(top_builddir)/src/common/libidset/libidset.la \
 	$(top_builddir)/src/common/libutil/libutil.la \

diff --git a/src/cmd/flux-exec.c b/src/cmd/flux-exec.c
@@ -24,6 +24,7 @@
 #include "src/common/libutil/monotime.h"
 #include "src/common/libidset/idset.h"
 #include "src/common/libutil/log.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 static struct optparse_option cmdopts[] = {
     { .name = "rank", .key = 'r', .has_arg = 1, .arginfo = "IDSET",

diff --git a/src/common/libflux/Makefile.am b/src/common/libflux/Makefile.am
@@ -169,6 +169,7 @@ test_ldadd = \
 	$(top_builddir)/src/common/liblsd/liblsd.la \
 	$(top_builddir)/src/common/libtomlc99/libtomlc99.la \
 	$(top_builddir)/src/common/libev/libev.la \
+	$(top_builddir)/src/common/libczmqcontainers/libczmqcontainers.la \
 	$(ZMQ_LIBS) \
 	$(LIBUUID_LIBS) \
 	$(JANSSON_LIBS) \

diff --git a/src/common/libflux/attr.c b/src/common/libflux/attr.c
@@ -16,6 +16,8 @@
 #include <czmq.h>
 #include <jansson.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "attr.h"
 #include "rpc.h"
 

diff --git a/src/common/libflux/msg_handler.c b/src/common/libflux/msg_handler.c
@@ -25,6 +25,7 @@
 
 #include "src/common/libutil/log.h"
 #include "src/common/libutil/iterators.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 struct dispatch {
     flux_t *h;

diff --git a/src/common/libjob/job_hash.c b/src/common/libjob/job_hash.c
@@ -14,6 +14,8 @@
 #include <flux/core.h>
 #include <czmq.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "job_hash.h"
 
 /* Hash numerical jobid in 'key'.

diff --git a/src/common/libjob/job_hash.h b/src/common/libjob/job_hash.h
@@ -14,6 +14,8 @@
 #include <flux/core.h>
 #include <czmq.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 /* Create a zhashx_t with hasher and comparator set to use flux_jobid_t
  * as the hash key.  The default key duplicator and destructor are disabled
  * on the presumption that the id is a member of the job object.

diff --git a/src/common/libpmi/Makefile.am b/src/common/libpmi/Makefile.am
@@ -57,6 +57,7 @@ test_ldadd = \
 	$(top_builddir)/src/common/liblsd/liblsd.la \
 	$(top_builddir)/src/common/libtomlc99/libtomlc99.la \
 	$(top_builddir)/src/common/libev/libev.la \
+	$(top_builddir)/src/common/libczmqcontainers/libczmqcontainers.la \
 	$(ZMQ_LIBS) \
 	$(LIBUUID_LIBS) \
 	$(JANSSON_LIBS) \

diff --git a/src/common/libpmi/simple_server.c b/src/common/libpmi/simple_server.c
@@ -73,6 +73,8 @@
 #include <sys/param.h>
 #include <czmq.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "simple_server.h"
 #include "keyval.h"
 #include "pmi.h"

diff --git a/src/common/librlist/rlist.c b/src/common/librlist/rlist.c
@@ -22,6 +22,8 @@
 
 #include "src/common/libidset/idset.h"
 #include "src/common/libhostlist/hostlist.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "rnode.h"
 #include "rlist.h"
 #include "rhwloc.h"

diff --git a/src/common/librlist/rnode.c b/src/common/librlist/rnode.c
@@ -20,6 +20,8 @@
 #include <jansson.h>
 #include <flux/idset.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "rnode.h"
 
 static int idset_subtract (struct idset *from, struct idset *ids)

diff --git a/src/common/librouter/disconnect.c b/src/common/librouter/disconnect.c
@@ -34,6 +34,7 @@
 #include <czmq.h>
 
 #include "src/common/libutil/errno_safe.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "disconnect.h"
 

diff --git a/src/common/librouter/router.c b/src/common/librouter/router.c
@@ -16,6 +16,7 @@
 #include <flux/core.h>
 
 #include "src/common/libutil/errno_safe.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "router.h"
 #include "subhash.h"

diff --git a/src/common/librouter/servhash.c b/src/common/librouter/servhash.c
@@ -37,6 +37,7 @@
 #include <flux/core.h>
 
 #include "src/common/libutil/errno_safe.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "servhash.h"
 

diff --git a/src/common/librouter/subhash.c b/src/common/librouter/subhash.c
@@ -40,6 +40,7 @@
 #include <flux/core.h>
 
 #include "src/common/libutil/errno_safe.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "subhash.h"
 

diff --git a/src/common/libutil/iterators.h b/src/common/libutil/iterators.h
@@ -11,6 +11,8 @@
 #ifndef FLUX_ITERATORS_H
 #define FLUX_ITERATORS_H
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #define FOREACH_ZLIST(LIST, VAR)   \
     for((VAR) = zlist_first(LIST); \
             VAR;                   \

diff --git a/src/modules/job-exec/job-exec.c b/src/modules/job-exec/job-exec.c
@@ -95,6 +95,8 @@
 #include "src/common/libeventlog/eventlogger.h"
 #include "src/common/libutil/fsd.h"
 #include "src/common/libutil/errno_safe.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "job-exec.h"
 
 static double kill_timeout=5.0;

diff --git a/src/modules/job-ingest/job-ingest.c b/src/modules/job-ingest/job-ingest.c
@@ -24,6 +24,7 @@
 #include "src/common/libjob/sign_none.h"
 #include "src/common/libjob/job_hash.h"
 #include "src/common/libeventlog/eventlog.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "validate.h"
 

diff --git a/src/modules/job-list/idsync.c b/src/modules/job-list/idsync.c
@@ -19,6 +19,7 @@
 
 #include "src/common/libutil/errno_safe.h"
 #include "src/common/libjob/job_hash.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "idsync.h"
 #include "job_state.h"

diff --git a/src/modules/job-list/job-list.c b/src/modules/job-list/job-list.c
@@ -14,6 +14,8 @@
 #include <czmq.h>
 #include <flux/core.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "job-list.h"
 #include "job_state.h"
 #include "list.h"

diff --git a/src/modules/job-list/job-list.h b/src/modules/job-list/job-list.h
@@ -14,6 +14,8 @@
 #include <flux/core.h>
 #include <czmq.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "job_state.h"
 
 struct list_ctx {

diff --git a/src/modules/job-list/job_state.c b/src/modules/job-list/job_state.c
@@ -24,6 +24,7 @@
 #include "src/common/libjob/job_hash.h"
 #include "src/common/librlist/rlist.h"
 #include "src/common/libidset/idset.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "job_state.h"
 #include "idsync.h"

diff --git a/src/modules/job-list/job_state.h b/src/modules/job-list/job_state.h
@@ -17,6 +17,7 @@
 #include "job-list.h"
 #include "stats.h"
 #include "src/common/libutil/grudgeset.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 /* To handle the common case of user queries on job state, we will
  * store jobs in three different lists.

diff --git a/src/modules/job-list/list.c b/src/modules/job-list/list.c
@@ -18,6 +18,7 @@
 #include <flux/core.h>
 
 #include "src/common/libutil/errno_safe.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "idsync.h"
 #include "list.h"

diff --git a/src/modules/job-manager/alloc.c b/src/modules/job-manager/alloc.c
@@ -25,6 +25,8 @@
 #include <flux/schedutil.h>
 #include <assert.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "job.h"
 #include "alloc.h"
 #include "event.h"

diff --git a/src/modules/job-manager/annotate.c b/src/modules/job-manager/annotate.c
@@ -26,6 +26,8 @@
 #include <ctype.h>
 #include <flux/core.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "job.h"
 #include "event.h"
 #include "annotate.h"

diff --git a/src/modules/job-manager/drain.c b/src/modules/job-manager/drain.c
@@ -19,6 +19,7 @@
 #include <flux/core.h>
 
 #include "src/common/libutil/errno_safe.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "drain.h"
 #include "submit.h"

diff --git a/src/modules/job-manager/event.c b/src/modules/job-manager/event.c
@@ -51,6 +51,7 @@
 #include "event.h"
 
 #include "src/common/libeventlog/eventlog.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 const double batch_timeout = 0.01;
 

diff --git a/src/modules/job-manager/getattr.c b/src/modules/job-manager/getattr.c
@@ -26,6 +26,7 @@
 #include <flux/core.h>
 
 #include "src/common/libutil/errno_safe.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "job.h"
 #include "job-manager.h"

diff --git a/src/modules/job-manager/job-manager.c b/src/modules/job-manager/job-manager.c
@@ -14,6 +14,7 @@
 #include <flux/core.h>
 
 #include "src/common/libjob/job_hash.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "job.h"
 #include "submit.h"

diff --git a/src/modules/job-manager/job-manager.h b/src/modules/job-manager/job-manager.h
@@ -11,6 +11,8 @@
 #ifndef _FLUX_JOB_MANAGER_H
 #define _FLUX_JOB_MANAGER_H
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 struct job_manager {
     flux_t *h;
     flux_msg_handler_t **handlers;

diff --git a/src/modules/job-manager/jobtap.c b/src/modules/job-manager/jobtap.c
@@ -24,6 +24,8 @@
 
 #include <flux/core.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "annotate.h"
 #include "prioritize.h"
 #include "event.h"

diff --git a/src/modules/job-manager/kill.c b/src/modules/job-manager/kill.c
@@ -30,6 +30,8 @@
 #include <signal.h>
 #include <flux/core.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "job.h"
 #include "event.h"
 #include "kill.h"

diff --git a/src/modules/job-manager/list.c b/src/modules/job-manager/list.c
@@ -27,6 +27,7 @@
 #include <flux/core.h>
 
 #include "src/common/libjob/job.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "job.h"
 #include "list.h"

diff --git a/src/modules/job-manager/prioritize.c b/src/modules/job-manager/prioritize.c
@@ -17,6 +17,8 @@
 #endif
 #include <flux/core.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "job.h"
 #include "event.h"
 #include "alloc.h"

diff --git a/src/modules/job-manager/raise.c b/src/modules/job-manager/raise.c
@@ -31,6 +31,8 @@
 #include <ctype.h>
 #include <flux/core.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "job.h"
 #include "event.h"
 #include "raise.h"

diff --git a/src/modules/job-manager/restart.c b/src/modules/job-manager/restart.c
@@ -19,6 +19,7 @@
 #include <flux/core.h>
 
 #include "src/common/libutil/fluid.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "job.h"
 #include "restart.h"

diff --git a/src/modules/job-manager/start.c b/src/modules/job-manager/start.c
@@ -85,6 +85,8 @@
 #include <flux/core.h>
 #include <assert.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "job.h"
 #include "event.h"
 

diff --git a/src/modules/job-manager/submit.c b/src/modules/job-manager/submit.c
@@ -27,6 +27,7 @@
 #include "submit.h"
 
 #include "src/common/libeventlog/eventlog.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 struct submit {
     struct job_manager *ctx;

diff --git a/src/modules/job-manager/submit.h b/src/modules/job-manager/submit.h
@@ -16,6 +16,8 @@
 #include <jansson.h>
 #include <flux/core.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "job.h"
 #include "job-manager.h"
 

diff --git a/src/modules/job-manager/urgency.c b/src/modules/job-manager/urgency.c
@@ -28,6 +28,8 @@
 #endif
 #include <flux/core.h>
 
+#include "src/common/libczmqcontainers/czmq_containers.h"
+
 #include "job.h"
 #include "event.h"
 #include "alloc.h"

diff --git a/src/modules/job-manager/wait.c b/src/modules/job-manager/wait.c
@@ -55,6 +55,7 @@
 #include "src/common/libutil/errno_safe.h"
 #include "src/common/libeventlog/eventlog.h"
 #include "src/common/libjob/job_hash.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "drain.h"
 #include "submit.h"

diff --git a/src/modules/kvs/cache.c b/src/modules/kvs/cache.c
@@ -32,6 +32,7 @@
 #include "src/common/libutil/log.h"
 #include "src/common/libutil/iterators.h"
 #include "src/common/libkvs/kvs_util_private.h"
+#include "src/common/libczmqcontainers/czmq_containers.h"
 
 #include "waitqueue.h"
 #include "cache.h"