build(supervisor/posix): clean-up

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

Author: casaroli

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>
@@ -21,8 +22,8 @@
 
 #include "../ipc.h"
 
-#define TX_BUFFER_SIZE 2048
-#define RX_BUFFER_SIZE 2048
+#define TX_BUFFER_SIZE 32
+#define RX_BUFFER_SIZE 32
 
 struct client {
 	int socket;
@@ -53,16 +54,12 @@ static void *wait_thread(void *arg)
 	/* Call the actual function */
 	waiter->result = ocre_container_wait(waiter->container, &waiter->exit_status);
 
-	fprintf(stderr, "container wait returned\n");
-
 	pthread_mutex_lock(&mutex);
 
 	LL_DELETE(waiters, waiter);
 
 	pthread_mutex_unlock(&mutex);
 
-	fprintf(stderr, "removed from waiters\n");
-
 	/* Encode response */
 	ZCBOR_STATE_E(enc_state, 0, tx_buf, TX_BUFFER_SIZE, 0);
 
@@ -99,8 +96,6 @@ static void *wait_thread(void *arg)
 			perror("send");
 		}
 
-		fprintf(stderr, "Response sent from waiter (%d bytes)\n", response_len);
-
 		if (close(client->socket) < 0) {
 			perror("close");
 		}
@@ -191,19 +186,17 @@ static void *socket_thread(void *arg)
 	return NULL;
 }
 
-static struct waiter *waiter_get_or_new(struct ocre_container *container)
+static struct waiter *waiter_get_or_new_locked(struct ocre_container *container)
 {
-	struct waiter *waiter;
+	struct waiter *waiter = NULL;
+	pthread_attr_t attr;
 
 	LL_SEARCH_SCALAR(waiters, waiter, container, container);
 	if (waiter) {
 		fprintf(stderr, "Waiter already exists for container %p\n", container);
-		// pthread_mutex_unlock(&mutex);
 		return waiter;
 	}
 
-	// pthread_mutex_unlock(&mutex);
-
 	waiter = malloc(sizeof(struct waiter));
 	if (!waiter) {
 		fprintf(stderr, "Failed to allocate memory for waiter\n");
@@ -245,17 +238,43 @@ static struct waiter *waiter_get_or_new(struct ocre_container *container)
 		goto error_thread;
 	}
 
-	pthread_mutex_unlock(&waiter->mutex);
-
-	// pthread_mutex_lock(&mutex);
-
 	LL_APPEND(waiters, waiter);
 
 	return waiter;
+
+error_thread:
+	rc = pthread_mutex_lock(&waiter->mutex);
+	if (rc) {
+		fprintf(stderr, "Failed to lock mutex: rc=%d", rc);
+	}
+
+	waiter->finished = true;
+
+	rc = pthread_mutex_unlock(&waiter->mutex);
+	if (rc) {
+		fprintf(stderr, "Failed to unlock mutex: rc=%d", rc);
+	}
+
+	pthread_join(waiter->socket_thread, NULL);
+
+error_attr:
+	rc = pthread_attr_destroy(&attr);
+	if (rc) {
+		fprintf(stderr, "Failed to destroy thread attributes: rc=%d", rc);
+	}
+
+error_mutex:
+	pthread_mutex_destroy(&waiter->mutex);
+
+error_waiter:
+	free(waiter);
+	return NULL;
 }
 
 static int waiter_add_client(struct waiter *waiter, int socket)
 {
+	int rc;
+
 	struct client *client = malloc(sizeof(struct client));
 	if (!client) {
 		fprintf(stderr, "Failed to allocate memory for client\n");
@@ -281,13 +300,19 @@ static int waiter_add_client(struct waiter *waiter, int socket)
 	}
 
 	return 0;
+
+error_client:
+	free(client);
+	return -1;
 }
 
 int container_waiter_add_client(struct ocre_container *container, int socket)
 {
 	int ret = -1;
+
 	pthread_mutex_lock(&mutex);
-	struct waiter *waiter = waiter_get_or_new(container);
+
+	struct waiter *waiter = waiter_get_or_new_locked(container);
 
 	if (!waiter) {
 		fprintf(stderr, "Failed to get or create waiter for container %p\n", container);