[RFC PATCH] fsmonitor: fix building with NO_PTHREADS

[RFC PATCH] fsmonitor: fix building with NO_PTHREADS

[Carlo Marcelo Arenas Belón]

something similar will be needed for the NO_UNIX_SOCKETS, since the
system setting for support of FSMONITOR_DAEMON_BACKEND is not enough
to cover for the code dependencies.

alternatively FSMONITOR_DAEMON_BACKEND could be used to imply support
was requested AND code dependencies are covered, but this setup at
least allows for building and uses the "mock" implementation.

since the enum is needed for the fallback code, had to be moved outside
of the #ifdef

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
 Makefile     |  2 ++
 simple-ipc.h | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 987677e882..752ec7ccd9 100644
--- a/Makefile
+++ b/Makefile
@@ -1969,10 +1969,12 @@ ifdef NEED_ACCESS_ROOT_HANDLER
 	COMPAT_OBJS += compat/access.o
 endif
 
+ifndef NO_PTHREADS
 ifdef FSMONITOR_DAEMON_BACKEND
 	COMPAT_CFLAGS += -DHAVE_FSMONITOR_DAEMON_BACKEND
 	COMPAT_OBJS += compat/fsmonitor/fsmonitor-fs-listen-$(FSMONITOR_DAEMON_BACKEND).o
 endif
+endif
 
 ifeq ($(TCLTK_PATH),)
 NO_TCLTK = NoThanks
diff --git a/simple-ipc.h b/simple-ipc.h
index 9c7330fcda..b396293bdf 100644
--- a/simple-ipc.h
+++ b/simple-ipc.h
@@ -5,13 +5,6 @@
  * See Documentation/technical/api-simple-ipc.txt
  */
 
-#ifdef SUPPORTS_SIMPLE_IPC
-#include "pkt-line.h"
-
-/*
- * Simple IPC Client Side API.
- */
-
 enum ipc_active_state {
 	/*
 	 * The pipe/socket exists and the daemon is waiting for connections.
@@ -43,6 +36,13 @@ enum ipc_active_state {
 	IPC_STATE__OTHER_ERROR,
 };
 
+#ifdef SUPPORTS_SIMPLE_IPC
+#include "pkt-line.h"
+
+/*
+ * Simple IPC Client Side API.
+ */
+
 struct ipc_client_connect_options {
 	/*
 	 * Spin under timeout if the server is running but can't
-- 
2.33.0.476.gf000ecbed9

Re: [RFC PATCH] fsmonitor: fix building with NO_PTHREADS

[Jeff Hostetler]

On 8/17/21 4:23 AM, Carlo Marcelo Arenas Belón wrote:
> something similar will be needed for the NO_UNIX_SOCKETS, since the
> system setting for support of FSMONITOR_DAEMON_BACKEND is not enough
> to cover for the code dependencies.
> 
> alternatively FSMONITOR_DAEMON_BACKEND could be used to imply support
> was requested AND code dependencies are covered, but this setup at
> least allows for building and uses the "mock" implementation.
> 
> since the enum is needed for the fallback code, had to be moved outside
> of the #ifdef
> 
> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
 > ...


Thanks, I'll incorporate this into my next version.
BTW, what platform did you detect this on?

Jeff

Re: [RFC PATCH] fsmonitor: fix building with NO_PTHREADS

[Carlo Arenas]

On Tue, Aug 17, 2021 at 10:56 AM Jeff Hostetler <git@jeffhostetler.com> wrote:
>
> BTW, what platform did you detect this on?

macOS, when building with:

  $ make NO_PTHREADS=1

obviously not using the defaults.

Carlo