build(supervisor/posix): clean-up

Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>

Author: casaroli

src/common/CMakeLists.txt

@@ -31,7 +31,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ocre)
 # Generate build info header file in binary dir for every build
 add_custom_command(
     OUTPUT include/build_info.h
-    COMMAND sh -c "echo \"#define OCRE_BUILD_HOST_INFO \\\"$ENV{USER} @ $(uname -a)\\\"\" > include/build_info.h"
+    COMMAND sh -c "echo \"#define OCRE_BUILD_HOST_INFO \\\"$(whoami) @ $(uname -a)\\\"\" > include/build_info.h"
     COMMAND sh -c "echo \"#define OCRE_BUILD_DATE \\\"$(date +'%Y-%m-%d %H:%M:%S %Z')\\\"\" >> include/build_info.h"
     VERBATIM
     DEPENDS always_rebuild

src/samples/supervisor/posix/CMakeLists.txt

@@ -7,8 +7,9 @@ cmake_minimum_required(VERSION 3.20.0)
 
 project (ocre_supervisor)
 
-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-find_package(Threads)
+add_subdirectory(server)
+
+add_subdirectory(client)
 
 add_executable(ocre_cli
     ocre.c
@@ -18,82 +19,5 @@ add_executable(ocre_cli
 target_link_libraries(ocre_cli
     PRIVATE
     OcreShell
-)
-
-add_library(OcreClient)
-
-target_sources(OcreClient
-    PRIVATE
-    client/client.c
-    client/context.c
-    zcbor_helpers.c
-    zcbor/src/zcbor_encode.c
-    zcbor/src/zcbor_decode.c
-    zcbor/src/zcbor_common.c
-)
-
-target_include_directories(OcreClient
-    PUBLIC ../../../ocre/include
-    PUBLIC ../../../runtime/include
-    PRIVATE zcbor/include
-    PRIVATE .
-)
-
-
-target_link_libraries(OcreClient
-    PUBLIC
-    OcreCommon
-)
-
-# target_link_libraries(OcreCore PUBLIC
-#     OcrePlatform
-#     OcreRuntime
-#     OcreRuntimeWamr
-# )
-
-# target_include_directories(OcreCore
-#     PRIVATE
-#     ${CMAKE_CURRENT_BINARY_DIR}/include
-#     PUBLIC
-#     include
-# )
-
-# include (../../cmake/state_information.cmake)
-
-# if(OCRE_IMAGES)
-#     add_dependencies(OcreCore ${OCRE_IMAGES})
-# endif()
-
-# install(TARGETS OcreCore DESTINATION lib)
-# install(FILES include/ocre/container.h DESTINATION include/ocre)
-# install(FILES include/ocre/library.h DESTINATION include/ocre)
-# install(FILES include/ocre/context.h DESTINATION include/ocre)
-# install(FILES include/ocre/ocre.h DESTINATION include/ocre)
-
-# ######
-
-target_link_libraries(ocre_cli
-    PUBLIC
     OcreClient
-    Threads::Threads
 )
-
-# target_include_directories(ocre_cli PRIVATE ../../../ocre/include)
-# target_include_directories(ocre_cli PRIVATE ../../../runtime/include)
-# target_include_directories(ocre_cli PRIVATE ../../../shell/include)
-
-
-# target_include_directories(ocre_cli PRIVATE zcbor/include)
-
-# target_link_libraries(OcreShell
-#     PUBLIC
-#     OcreCore
-# )
-
-
-
-
-# add_definitions(-DZCBOR_VERBOSE)
-
-# add_definitions(-DZCBOR_CANONICAL)
-add_subdirectory(server)

src/samples/supervisor/posix/client/CMakeLists.txt

@@ -0,0 +1,32 @@
+# @copyright Copyright (c) contributors to Project Ocre,
+# which has been established as Project Ocre a Series of LF Projects, LLC
+#
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+add_library(OcreClient)
+
+target_sources(OcreClient
+    PRIVATE
+    client.c
+    context.c
+    ../zcbor_helpers.c
+    ../zcbor/src/zcbor_encode.c
+    ../zcbor/src/zcbor_decode.c
+    ../zcbor/src/zcbor_common.c
+)
+
+target_include_directories(OcreClient
+    PUBLIC
+    ../../../../ocre/include
+    ../../../../runtime/include
+    PRIVATE
+    ../zcbor/include
+    ..
+)
+
+target_link_libraries(OcreClient
+    PUBLIC
+    OcreCommon
+)

src/samples/supervisor/posix/server/waiters.c

@@ -11,6 +11,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <poll.h>
 
 #include <sys/socket.h>
@@ -183,6 +184,8 @@ static void *socket_thread(void *arg)
 
 					close(pfds[i].fd);
 
+					// TODO: remove from client list
+
 					pthread_mutex_lock(&waiter->mutex);
 
 					pthread_mutex_unlock(&waiter->mutex);