sof-logger: make inotify optional

marc-hb · lgirdwood · commit 92d828bc3732 · 2022-08-29T13:24:40.000+01:00
Restores ability to compile on Windows with MSYS. Fixes commit dcf0577 ("logger: allow starting before the driver is loaded") Signed-off-by: Marc Herbert <marc.herbert@intel.com>
diff --git a/tools/logger/CMakeLists.txt b/tools/logger/CMakeLists.txt
@@ -1,5 +1,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
+# https://gitlab.kitware.com/cmake/community/-/wikis/doc/tutorials/How-To-Write-Platform-Checks
+INCLUDE (CheckIncludeFiles)
+CHECK_INCLUDE_FILES(sys/inotify.h HAS_INOTIFY)
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 add_executable(sof-logger
 	logger.c
 	convert.c
diff --git a/tools/logger/config.h.in b/tools/logger/config.h.in
@@ -0,0 +1 @@
+#cmakedefine01 HAS_INOTIFY
diff --git a/tools/logger/logger.c b/tools/logger/logger.c
@@ -5,6 +5,7 @@
 // Author: Bartosz Kokoszko	<bartoszx.kokoszko@linux.intel.com>
 //	   Artur Kloniecki	<arturx.kloniecki@linux.intel.com>
 
+#include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdint.h>
@@ -15,11 +16,17 @@
 #include <fcntl.h>
 #include <stdbool.h>
 #include <termios.h>
+
+#include <sys/types.h>
+#include <dirent.h>
+
+#include "config.h"
+
+#if HAS_INOTIFY
 #include <poll.h>
 #include <sys/inotify.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <dirent.h>
+#endif
 
 #include "convert.h"
 #include "misc.h"
@@ -176,6 +183,12 @@ static int append_filter_config(struct convert_config *config, const char *input
 	return 0;
 }
 
+#if !HAS_INOTIFY
+static void *wait_open(const char *watched_dir, const char *expected_file)
+{
+	assert(HAS_INOTIFY); /* Should never be called */
+}
+#else
 /*
  * This 5 minutes timeout is for "backward compatible safety" in case
  * any user/script of an earlier, pre-inotify version of sof-logger
@@ -262,6 +275,8 @@ static void *wait_open(const char *watched_dir, const char *expected_file)
 
 	return ret_stream;
 }
+#endif // HAS_INOTIFY
+
 
 int main(int argc, char *argv[])
 {
@@ -436,9 +451,10 @@ int main(int argc, char *argv[])
 		 * for _any_ input file, not just for /sys/kernel/debug/sof/[e]trace
 		 */
 		config.in_fd = NULL;
-		if (strncmp(config.in_file, sys_debug, strlen(sys_debug))) {
+		if (!HAS_INOTIFY ||
+		    strncmp(config.in_file, sys_debug, strlen(sys_debug))) {
 			config.in_fd = fopen(config.in_file, "rb");
-		} else {
+		} else { // both inotify and /sys/kernel/debug/
 			DIR *dbg_sof = (DIR *)wait_open(sys_debug, "sof");
 
 			if (dbg_sof) {
