Iwyu

src/core/dialer.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 // Copyright 2018 Capitar IT Group BV <[email protected]>
 // Copyright 2018 Devolutions <[email protected]>
 //
@@ -12,6 +12,9 @@
 #ifndef CORE_DIALER_H
 #define CORE_DIALER_H
 
+#include "defs.h"
+#include "stats.h"
+
 extern int      nni_dialer_find(nni_dialer **, uint32_t);
 extern int      nni_dialer_hold(nni_dialer *);
 extern void     nni_dialer_rele(nni_dialer *);

src/core/file.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2018 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 // Copyright 2018 Capitar IT Group BV <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -11,6 +11,8 @@
 #ifndef CORE_FILE_H
 #define CORE_FILE_H
 
+#include "defs.h"
+
 // File/Store Support
 //
 // Some transports require a persistent storage for things like configs,

src/core/listener.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 // Copyright 2018 Capitar IT Group BV <[email protected]>
 // Copyright 2018 Devolutions <[email protected]>
 //
@@ -12,6 +12,9 @@
 #ifndef CORE_LISTENER_H
 #define CORE_LISTENER_H
 
+#include "core/defs.h"
+#include "core/stats.h"
+
 extern int      nni_listener_find(nni_listener **, uint32_t);
 extern int      nni_listener_hold(nni_listener *);
 extern void     nni_listener_rele(nni_listener *);

src/core/lmq.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -10,7 +10,7 @@
 #ifndef CORE_LMQ_H
 #define CORE_LMQ_H
 
-#include "nng_impl.h"
+#include "core/defs.h"
 
 // nni_lmq is a very lightweight message queue.  Defining it this way allows
 // us to share some common code.  Locking must be supplied by the caller.

src/core/message.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 // Copyright 2017 Capitar IT Group BV <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -11,6 +11,8 @@
 #ifndef CORE_MESSAGE_H
 #define CORE_MESSAGE_H
 
+#include "core/defs.h"
+
 // Internally used message API.  Again, this is not part of our public API.
 // "trim" operations work from the front, and "chop" work from the end.
 

src/core/msgqueue.h

@@ -11,7 +11,7 @@
 #ifndef CORE_MSGQUEUE_H
 #define CORE_MSGQUEUE_H
 
-#include "nng_impl.h"
+#include "defs.h"
 #include "pollable.h"
 
 // Message queues.  Message queues work in some ways like Go channels;
@@ -33,7 +33,6 @@ extern int nni_msgq_init(nni_msgq **, unsigned);
 // messages that may be in the queue.
 extern void nni_msgq_fini(nni_msgq *);
 
-
 extern void nni_msgq_aio_put(nni_msgq *, nni_aio *);
 extern void nni_msgq_aio_get(nni_msgq *, nni_aio *);
 

src/core/options.h

@@ -12,6 +12,8 @@
 #ifndef CORE_OPTIONS_H
 #define CORE_OPTIONS_H
 
+#include "defs.h"
+
 // Integer limits.
 #define NNI_MAXINT (2147483647)
 // the -1 trick works around a compiler warning on some compilers (MSVC)

src/core/pipe.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 // Copyright 2018 Capitar IT Group BV <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -15,9 +15,10 @@
 // OUTSIDE of the core is STRICTLY VERBOTEN.  NO DIRECT ACCESS BY PROTOCOLS OR
 // TRANSPORTS.
 
-#include "core/defs.h"
-#include "core/thread.h"
-#include "nng/nng.h"
+#include "defs.h"
+#include "stats.h"
+#include "thread.h"
+
 #include "sp/transport.h"
 
 // AIO

src/core/platform.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 // Copyright 2018 Capitar IT Group BV <[email protected]>
 // Copyright 2018 Devolutions <[email protected]>
 //
@@ -21,6 +21,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "defs.h"
+
 // These are the APIs that a platform must implement to support nng.
 
 // A word about fork-safety: This library is *NOT* fork safe, in that
@@ -83,11 +85,9 @@ extern void *nni_zalloc(size_t);
 // Most implementations can just call free() here.
 extern void nni_free(void *, size_t);
 
-typedef struct nni_plat_mtx    nni_plat_mtx;
-typedef struct nni_plat_rwlock nni_plat_rwlock;
-typedef struct nni_plat_cv     nni_plat_cv;
-typedef struct nni_plat_thr    nni_plat_thr;
-typedef struct nni_rwlock      nni_rwlock;
+typedef struct nni_plat_mtx nni_plat_mtx;
+typedef struct nni_plat_cv  nni_plat_cv;
+typedef struct nni_plat_thr nni_plat_thr;
 
 //
 // Threading & Synchronization Support
@@ -109,15 +109,6 @@ extern void nni_plat_mtx_lock(nni_plat_mtx *);
 // thread that owned the mutex.
 extern void nni_plat_mtx_unlock(nni_plat_mtx *);
 
-// read/write locks - these work like mutexes except that multiple readers
-// can acquire the lock.  These are not safe for recursive use, and it is
-// unspecified whether any measures are provided to prevent starvation.
-extern void nni_rwlock_init(nni_rwlock *);
-extern void nni_rwlock_fini(nni_rwlock *);
-extern void nni_rwlock_rdlock(nni_rwlock *);
-extern void nni_rwlock_wrlock(nni_rwlock *);
-extern void nni_rwlock_unlock(nni_rwlock *);
-
 // nni_plat_cv_init initializes a condition variable.  We require a mutex be
 // supplied with it, and that mutex must always be held when performing any
 // operations on the condition variable (other than fini.)  As with mutexes, an

src/core/pollable.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -10,8 +10,9 @@
 #ifndef CORE_POLLABLE_H
 #define CORE_POLLABLE_H
 
-#include "core/defs.h"
-#include "core/list.h"
+#include "defs.h"
+#include "list.h"
+#include "platform.h"
 
 typedef struct nni_pollable nni_pollable;
 

src/core/reap.c

@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 // Copyright 2017 Capitar IT Group BV <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -14,14 +14,13 @@
 
 #include <stdbool.h>
 
-// New stuff.
 static nni_reap_list *reap_list = NULL;
 static nni_thr        reap_thr;
 static bool           reap_exit = false;
-static nni_mtx        reap_mtx  = NNI_MTX_INITIALIZER;
 static bool           reap_empty;
-static nni_cv         reap_work_cv  = NNI_CV_INITIALIZER(&reap_mtx);
-static nni_cv         reap_empty_cv = NNI_CV_INITIALIZER(&reap_mtx);
+static nni_mtx        reap_mtx;
+static nni_cv         reap_work_cv;
+static nni_cv         reap_empty_cv;
 
 static void
 reap_worker(void *unused)
@@ -109,6 +108,9 @@ nni_reap_sys_init(void)
 	int rv;
 
 	reap_exit = false;
+	nni_mtx_init(&reap_mtx);
+	nni_cv_init(&reap_work_cv, &reap_mtx);
+	nni_cv_init(&reap_empty_cv, &reap_mtx);
 	// If this fails, we don't fail init, instead we will try to
 	// start up at reap time.
 	if ((rv = nni_thr_init(&reap_thr, reap_worker, NULL)) != 0) {
@@ -127,6 +129,10 @@ nni_reap_sys_fini(void)
 	nni_mtx_unlock(&reap_mtx);
 	nni_thr_fini(&reap_thr);
 
+	nni_cv_fini(&reap_work_cv);
+	nni_cv_fini(&reap_empty_cv);
+	nni_mtx_fini(&reap_mtx);
+
 	// NB: The subsystem linkages remain in place.  We don't need
 	// to reinitialize them across future initializations.
 }

src/core/refcnt.h

@@ -1,4 +1,4 @@
-// Copyright 2024 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -9,10 +9,8 @@
 #ifndef CORE_REFCNT_H
 #define CORE_REFCNT_H
 
-#include <nng/nng.h>
-
-#include <core/nng_impl.h>
-#include <core/platform.h>
+#include "defs.h"
+#include "platform.h"
 
 typedef struct {
 	nni_atomic_int rc_cnt;

src/core/socket.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 // Copyright 2018 Capitar IT Group BV <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -11,6 +11,10 @@
 #ifndef CORE_SOCKET_H
 #define CORE_SOCKET_H
 
+#include "defs.h"
+#include "msgqueue.h"
+#include "stats.h"
+
 extern int         nni_sock_find(nni_sock **, uint32_t);
 extern void        nni_sock_hold(nni_sock *);
 extern void        nni_sock_rele(nni_sock *);

src/core/sockimpl.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 // Copyright 2018 Capitar IT Group BV <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -11,6 +11,20 @@
 #ifndef CORE_SOCKIMPL_H
 #define CORE_SOCKIMPL_H
 
+#include "defs.h"
+
+#include "aio.h"
+#include "dialer.h"
+#include "list.h"
+#include "listener.h"
+#include "protocol.h"
+#include "reap.h"
+#include "refcnt.h"
+#include "stats.h"
+#include "url.h"
+
+#include "sp/transport.h"
+
 // This file contains stuff shared within the core between sockets, endpoints,
 // and pipes.  This must not be exposed to other subsystems -- these internals
 // are subject to change at any time.

src/core/stream.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2024 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -13,7 +13,7 @@
 // This provides an abstraction for byte streams, allowing polymorphic
 // use of them in rather flexible contexts.
 
-#include "core/nng_impl.h"
+#include "defs.h"
 
 // Private property operations (these include the types.)
 extern int nni_stream_get(

src/core/strs.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2020 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 // Copyright 2017 Capitar IT Group BV <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -13,11 +13,13 @@
 
 // Safe string functions, in case the platform misses these.
 
-extern char * nni_strdup(const char *);
+#include "defs.h"
+
+extern char  *nni_strdup(const char *);
 extern void   nni_strfree(char *);
 extern size_t nni_strlcpy(char *, const char *, size_t);
 extern size_t nni_strnlen(const char *, size_t);
-extern char * nni_strcasestr(const char *, const char *);
+extern char  *nni_strcasestr(const char *, const char *);
 extern int    nni_strncasecmp(const char *, const char *, size_t);
 extern int    nni_strcasecmp(const char *, const char *);
 extern int    nni_asprintf(char **, const char *, ...);

src/platform/posix/posix_impl.h

@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Staysail Systems, Inc. <[email protected]>
+// Copyright 2025 Staysail Systems, Inc. <[email protected]>
 // Copyright 2018 Capitar IT Group BV <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -32,7 +32,9 @@
 #define NNG_PLATFORM_POSIX_SOCKADDR
 #define NNG_PLATFORM_POSIX_UDP
 
-#include "platform/posix/posix_config.h"
+#include "core/defs.h"
+
+#include "posix_config.h"
 #endif
 
 #ifdef NNG_PLATFORM_POSIX_SOCKADDR
@@ -63,30 +65,13 @@ struct nni_plat_mtx {
 		PTHREAD_MUTEX_INITIALIZER \
 	}
 
-struct nni_rwlock {
-	pthread_rwlock_t rwl;
-};
-
-#define NNI_RWLOCK_INITIALIZER             \
-	{                                  \
-		PTHREAD_RWLOCK_INITIALIZER \
-	}
-
 // No static form of CV initialization because of the need to use
 // attributes to set the clock type.
 struct nni_plat_cv {
-	pthread_cond_t cv;
-	nni_plat_mtx  *mtx;
+	pthread_cond_t   cv;
+	pthread_mutex_t *mtx;
 };
 
-// NOTE: condition variables initialized with this should *NOT*
-// be used with nni_cv_until -- the clock attributes are not passed
-// and the wake-up times will not be correct.
-#define NNI_CV_INITIALIZER(mxp)                            \
-	{                                                  \
-		.mtx = mxp, .cv = PTHREAD_COND_INITIALIZER \
-	}
-
 struct nni_plat_thr {
 	pthread_t tid;
 	void (*func)(void *);