Merge 00a39ad into 7aaea06

configure.ac

@@ -495,6 +495,7 @@ AC_CONFIG_FILES( \
   src/common/libterminus/Makefile \
   src/common/libhostlist/Makefile \
   src/common/librlist/Makefile \
+  src/common/libczmqcontainers/Makefile \
   src/bindings/Makefile \
   src/bindings/lua/Makefile \
   src/bindings/python/Makefile \

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"

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"
 

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 \

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",

src/common/Makefile.am

@@ -21,7 +21,8 @@ SUBDIRS = \
 	libterminus \
 	libcontent \
 	libhostlist \
-	librlist
+	librlist \
+	libczmqcontainers
 
 AM_CFLAGS = $(WARNING_CFLAGS) $(CODE_COVERAGE_CFLAGS)
 AM_LDFLAGS = $(CODE_COVERAGE_LIBS)
@@ -42,6 +43,7 @@ libflux_internal_la_LIBADD = \
 	$(builddir)/libioencode/libioencode.la \
 	$(builddir)/librouter/librouter.la \
 	$(builddir)/libhostlist/libhostlist.la \
+	$(builddir)/libczmqcontainers/libczmqcontainers.la \
 	$(JANSSON_LIBS) \
 	$(ZMQ_LIBS) \
 	$(LIBUUID_LIBS) \

src/common/libczmqcontainers/Makefile.am

@@ -0,0 +1,22 @@
+AM_CFLAGS = \
+        $(WARNING_CFLAGS) \
+        $(CODE_COVERAGE_CFLAGS)
+
+AM_LDFLAGS = \
+        $(CODE_COVERAGE_LDFLAGS)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/src/include \
+	$(ZMQ_CFLAGS)
+
+noinst_LTLIBRARIES = \
+	libczmqcontainers.la
+
+libczmqcontainers_la_SOURCES = \
+	czmq_containers.h \
+	czmq_internal.h \
+	fzhashx.h \
+	fzhashx.c \
+	fzhash_primes.inc \
+	zhashx_map.h

src/common/libczmqcontainers/czmq_containers.h

@@ -0,0 +1,24 @@
+/************************************************************\
+ * Copyright 2021 Lawrence Livermore National Security, LLC
+ * (c.f. AUTHORS, NOTICE.LLNS, COPYING)
+ *
+ * This file is part of the Flux resource manager framework.
+ * For details, see https://github.com/flux-framework.
+ *
+ * SPDX-License-Identifier: LGPL-3.0
+\************************************************************/
+
+#ifndef _CZMQ_CONTAINERS_H
+#define _CZMQ_CONTAINERS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "fzhashx.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

src/common/libczmqcontainers/czmq_internal.h

@@ -0,0 +1,42 @@
+/*  =========================================================================
+    Copyright (c) the Contributors as noted in the AUTHORS file.
+    This file is part of CZMQ, the high-level C binding for 0MQ:
+    http://czmq.zeromq.org.
+
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    =========================================================================
+*/
+
+/* To avoid copying in an excess amount of code from czmq, the
+ * following have been manually cut and pasted in
+ */
+
+#ifndef __CZMQ_INTERNAL__
+#define __CZMQ_INTERNAL__
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#ifdef NDEBUG
+  #undef NDEBUG
+  #include <assert.h>
+  #define NDEBUG
+#else
+  #include <assert.h>
+#endif
+
+#define freen(x) do {free(x); x = NULL;} while(0)
+
+#ifndef CZMQ_EXPORT
+#define CZMQ_EXPORT
+#endif
+
+typedef struct _zhashx_t fzhashx_t;
+
+#endif
+