diff --git a/src/broker/content-cache.c b/src/broker/content-cache.c index 3abfb0d4f21d..7a26afac048c 100644 --- 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 index e70b27312444..fd2f2d0bb680 100644 --- 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 index 34cce38cda87..0b51496e709b 100644 --- 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 index 677fd74eb5c1..53e10369a248 100644 --- 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 index bd73de08efc9..ed66e3c9bf8c 100644 --- 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 index 820f14010a63..c5cc3cc2bdfb 100644 --- a/src/common/libflux/attr.c +++ b/src/common/libflux/attr.c @@ -16,6 +16,8 @@ #include #include +#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 index b4c3641ba530..ab41142a6731 100644 --- 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 index 64aba7237b9c..ad5492cdad0d 100644 --- a/src/common/libjob/job_hash.c +++ b/src/common/libjob/job_hash.c @@ -14,6 +14,8 @@ #include #include +#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 index e348eb0b7500..11854133f4e7 100644 --- a/src/common/libjob/job_hash.h +++ b/src/common/libjob/job_hash.h @@ -14,6 +14,8 @@ #include #include +#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 index 77b9072480bc..2d5760a755aa 100644 --- 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 index 2bac827728a1..a6f8c908cb2d 100644 --- a/src/common/libpmi/simple_server.c +++ b/src/common/libpmi/simple_server.c @@ -73,6 +73,8 @@ #include #include +#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 index 0234a3084238..dc9d8e45efca 100644 --- 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 index 485fa6e839fc..da7c12587256 100644 --- a/src/common/librlist/rnode.c +++ b/src/common/librlist/rnode.c @@ -20,6 +20,8 @@ #include #include +#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 index 87ff1686feb0..86ccc3543559 100644 --- a/src/common/librouter/disconnect.c +++ b/src/common/librouter/disconnect.c @@ -34,6 +34,7 @@ #include #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 index e98d6355172f..69332cb42dfb 100644 --- a/src/common/librouter/router.c +++ b/src/common/librouter/router.c @@ -16,6 +16,7 @@ #include #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 index 67d96e8d40d7..ca2cbd3b9f0b 100644 --- a/src/common/librouter/servhash.c +++ b/src/common/librouter/servhash.c @@ -37,6 +37,7 @@ #include #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 index c8fd8742d886..a315755ac3c7 100644 --- a/src/common/librouter/subhash.c +++ b/src/common/librouter/subhash.c @@ -40,6 +40,7 @@ #include #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 index 03f787fe0053..72ddc67ac3e9 100644 --- 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 index 82e0dec4ef25..3bcf2ee232c5 100644 --- 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 index e70f657e4c87..2d11c0e7362b 100644 --- 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 index 9730a04d2d75..3be01e39e547 100644 --- 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 index 4a1055eb9fc5..3d9699be99a5 100644 --- a/src/modules/job-list/job-list.c +++ b/src/modules/job-list/job-list.c @@ -14,6 +14,8 @@ #include #include +#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 index 34396b8cfcd2..16d1107a4cfe 100644 --- a/src/modules/job-list/job-list.h +++ b/src/modules/job-list/job-list.h @@ -14,6 +14,8 @@ #include #include +#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 index bf0a6f96b388..fb51207a9dd4 100644 --- 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 index 7fce18e8eed6..9553c23de825 100644 --- 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 index 6cbeb3ce0221..c8711a513fa9 100644 --- a/src/modules/job-list/list.c +++ b/src/modules/job-list/list.c @@ -18,6 +18,7 @@ #include #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 index 3a95833227bb..a2224b3a4967 100644 --- a/src/modules/job-manager/alloc.c +++ b/src/modules/job-manager/alloc.c @@ -25,6 +25,8 @@ #include #include +#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 index daff26e6ff53..f30e7f6e75e9 100644 --- a/src/modules/job-manager/annotate.c +++ b/src/modules/job-manager/annotate.c @@ -26,6 +26,8 @@ #include #include +#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 index d2a8d33c3811..52cab20834c8 100644 --- a/src/modules/job-manager/drain.c +++ b/src/modules/job-manager/drain.c @@ -19,6 +19,7 @@ #include #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 index 4bacfe8376be..2491d29c41b6 100644 --- 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 index 5e3ca4fc2adb..ba97244db8a1 100644 --- a/src/modules/job-manager/getattr.c +++ b/src/modules/job-manager/getattr.c @@ -26,6 +26,7 @@ #include #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 index 1d4b3331e797..e4d0c83d7123 100644 --- a/src/modules/job-manager/job-manager.c +++ b/src/modules/job-manager/job-manager.c @@ -14,6 +14,7 @@ #include #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 index ba7c2a2fb730..0a457de7e25d 100644 --- 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 index 41c9ba8c719e..4b0248a8fa13 100644 --- a/src/modules/job-manager/jobtap.c +++ b/src/modules/job-manager/jobtap.c @@ -24,6 +24,8 @@ #include +#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 index 273e420205fe..df341ade0a04 100644 --- a/src/modules/job-manager/kill.c +++ b/src/modules/job-manager/kill.c @@ -30,6 +30,8 @@ #include #include +#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 index 3bbdcd262b9f..db912c0dcc99 100644 --- a/src/modules/job-manager/list.c +++ b/src/modules/job-manager/list.c @@ -27,6 +27,7 @@ #include #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 index e1efe4249193..fc98a56f700e 100644 --- a/src/modules/job-manager/prioritize.c +++ b/src/modules/job-manager/prioritize.c @@ -17,6 +17,8 @@ #endif #include +#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 index 8087025425d4..97ac72dd6887 100644 --- a/src/modules/job-manager/raise.c +++ b/src/modules/job-manager/raise.c @@ -31,6 +31,8 @@ #include #include +#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 index 18ccf3b3a968..5654188ab790 100644 --- a/src/modules/job-manager/restart.c +++ b/src/modules/job-manager/restart.c @@ -19,6 +19,7 @@ #include #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 index 231c665a100d..bc7a11c8b35b 100644 --- a/src/modules/job-manager/start.c +++ b/src/modules/job-manager/start.c @@ -85,6 +85,8 @@ #include #include +#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 index e24ddeeb6586..f0024e5e0f97 100644 --- 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 index 05318be4fd2c..09d8616b3ff4 100644 --- a/src/modules/job-manager/submit.h +++ b/src/modules/job-manager/submit.h @@ -16,6 +16,8 @@ #include #include +#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 index 950d127129bf..424e118b23f8 100644 --- a/src/modules/job-manager/urgency.c +++ b/src/modules/job-manager/urgency.c @@ -28,6 +28,8 @@ #endif #include +#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 index 3c0b92541f04..50c314a4b50b 100644 --- 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 index 817e7ddf6b37..c7b39b4292ea 100644 --- 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" diff --git a/src/shell/Makefile.am b/src/shell/Makefile.am index e49e6364db69..735fec26aed8 100644 --- a/src/shell/Makefile.am +++ b/src/shell/Makefile.am @@ -94,6 +94,7 @@ flux_shell_LDADD = \ $(top_builddir)/src/bindings/lua/libfluxlua.la \ $(top_builddir)/src/common/libflux-core.la \ $(top_builddir)/src/common/libpmi/libpmi_server.la \ + $(top_builddir)/src/common/libczmqcontainers/libczmqcontainers.la \ $(top_builddir)/src/common/libflux-internal.la \ $(top_builddir)/src/common/libflux-optparse.la \ $(top_builddir)/src/common/libterminus/libterminus.la \ diff --git a/src/shell/events.c b/src/shell/events.c index 4637f6e76cfb..2667489e0060 100644 --- a/src/shell/events.c +++ b/src/shell/events.c @@ -22,6 +22,7 @@ #include #include "src/common/libeventlog/eventlogger.h" +#include "src/common/libczmqcontainers/czmq_containers.h" struct shell_eventlogger { flux_shell_t *shell; diff --git a/src/shell/internal.h b/src/shell/internal.h index cb2d594aba46..8a65837b0165 100644 --- a/src/shell/internal.h +++ b/src/shell/internal.h @@ -17,6 +17,8 @@ #include #include "src/common/libutil/aux.h" +#include "src/common/libczmqcontainers/czmq_containers.h" + #include "plugstack.h" #include "events.h" diff --git a/src/shell/mpir/proctable.c b/src/shell/mpir/proctable.c index 965bdcb70a47..37b7c0bab528 100644 --- a/src/shell/mpir/proctable.c +++ b/src/shell/mpir/proctable.c @@ -15,6 +15,8 @@ #include #include +#include "src/common/libczmqcontainers/czmq_containers.h" + #include "mpir/rangelist.h" #include "mpir/nodelist.h" #include "mpir/proctable.h" diff --git a/src/shell/plugstack.c b/src/shell/plugstack.c index 337eaeff9505..6498bb12c9d9 100644 --- a/src/shell/plugstack.c +++ b/src/shell/plugstack.c @@ -22,6 +22,7 @@ #include #include "src/common/libutil/iterators.h" +#include "src/common/libczmqcontainers/czmq_containers.h" #include "plugstack.h" diff --git a/src/shell/shell.c b/src/shell/shell.c index 69e7cdbf9fff..a9c21b4f7836 100644 --- a/src/shell/shell.c +++ b/src/shell/shell.c @@ -27,6 +27,7 @@ #include "src/common/liboptparse/optparse.h" #include "src/common/libeventlog/eventlog.h" #include "src/common/libutil/log.h" +#include "src/common/libczmqcontainers/czmq_containers.h" #include "internal.h" #include "builtins.h" diff --git a/src/shell/task.c b/src/shell/task.c index 998b122a14bc..5d1912db7654 100644 --- a/src/shell/task.c +++ b/src/shell/task.c @@ -41,6 +41,8 @@ #include #include +#include "src/common/libczmqcontainers/czmq_containers.h" + #include "task.h" #include "info.h" diff --git a/src/shell/task.h b/src/shell/task.h index 4e80367e89fa..1e1f3699d0c5 100644 --- a/src/shell/task.h +++ b/src/shell/task.h @@ -15,6 +15,8 @@ #include #include "src/common/libutil/aux.h" +#include "src/common/libczmqcontainers/czmq_containers.h" + #include "info.h"