feat(posix/supervisor): initial implementation

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

Author: casaroli

src/samples/supervisor/posix/CMakeLists.txt

@@ -7,6 +7,9 @@ cmake_minimum_required(VERSION 3.20.0)
 
 project (ocre_supervisor)
 
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+find_package(Threads)
+
 add_executable(ocre_cli
     ocre.c
     download.c
@@ -22,6 +25,7 @@ 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
@@ -71,6 +75,7 @@ target_link_libraries(OcreClient
 target_link_libraries(ocre_cli
     PUBLIC
     OcreClient
+    Threads::Threads
 )
 
 # target_include_directories(ocre_cli PRIVATE ../../../ocre/include)
@@ -85,28 +90,10 @@ target_link_libraries(ocre_cli
 #     OcreCore
 # )
 
-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-find_package(Threads)
-target_link_libraries(ocre_cli PRIVATE Threads::Threads)
+
 
 
 # add_definitions(-DZCBOR_VERBOSE)
 
 # add_definitions(-DZCBOR_CANONICAL)
-
-add_executable(ocred
-    ocred.c
-    zcbor_helpers.c
-    zcbor/src/zcbor_encode.c
-    zcbor/src/zcbor_decode.c
-    zcbor/src/zcbor_common.c
-)
-
-target_link_libraries(ocred
-    PRIVATE
-    OcreCore
-)
-
-target_include_directories(ocred
-    PRIVATE zcbor/include
-)
+add_subdirectory(server)

src/samples/supervisor/posix/client/client.c

@@ -12,7 +12,6 @@
 #include <ctype.h>
 
 #include <stdlib.h>
-#include <errno.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -28,7 +27,7 @@
 #include "../ipc.h"
 #include "zcbor_helpers.h"
 
-#define SOCK_PATH	    "ocre.sock"
+#define SOCK_PATH	    "/tmp/ocre.sock"
 
 /* Buffer sizes for IPC communication */
 #define SMALL_PAYLOAD_SIZE  64
@@ -256,12 +255,15 @@ struct ocre_container *ocre_context_create_container(struct ocre_context *contex
 
 struct ocre_container *ocre_context_get_container_by_id(struct ocre_context *context, const char *id)
 {
-	(void)context; /* Context is not sent over IPC - server uses global context */
 	int rc;
 
 	uint8_t payload[MEDIUM_PAYLOAD_SIZE];
 	bool success;
 
+	if (!context) {
+		return NULL;
+	}
+
 	/* Encode the request - server expects only the ID string */
 	ZCBOR_STATE_E(encoding_state, 0, payload, sizeof(payload), 0);
 
@@ -328,13 +330,12 @@ struct ocre_container *ocre_context_get_container_by_id(struct ocre_context *con
 
 int ocre_context_remove_container(struct ocre_context *context, struct ocre_container *container)
 {
-	(void)context; /* Context is not sent over IPC - server uses global context */
 	int rc;
 
 	uint8_t payload[MEDIUM_PAYLOAD_SIZE];
 	bool success;
 
-	if (!container || !container->id) {
+	if (!context || !container || !container->id) {
 		return -1;
 	}
 
@@ -385,12 +386,14 @@ int ocre_context_remove_container(struct ocre_context *context, struct ocre_cont
 
 int ocre_context_get_container_count(struct ocre_context *context)
 {
-	(void)context; /* Context is not sent over IPC - server uses global context */
 	int rc;
 
 	uint8_t payload[SMALL_PAYLOAD_SIZE];
 	bool success;
 
+	if (!context) {
+		return -1;
+	}
 	/* Encode the request - server takes no parameters */
 	ZCBOR_STATE_E(encoding_state, 0, payload, sizeof(payload), 0);
 
@@ -438,12 +441,15 @@ int ocre_context_get_container_count(struct ocre_context *context)
 
 int ocre_context_get_containers(struct ocre_context *context, struct ocre_container **containers, int max_size)
 {
-	(void)context; /* Context is not sent over IPC - server uses global context */
 	int rc;
 
 	uint8_t payload[SMALL_PAYLOAD_SIZE];
 	bool success;
 
+	if (!context || !containers) {
+		return -1;
+	}
+
 	/* Encode the request - server expects only max_size */
 	ZCBOR_STATE_E(encoding_state, 0, payload, sizeof(payload), 0);
 
@@ -533,13 +539,16 @@ int ocre_context_get_containers(struct ocre_context *context, struct ocre_contai
 
 const char *ocre_context_get_working_directory(const struct ocre_context *context)
 {
-	(void)context; /* Context is not sent over IPC - server uses global context */
 	int rc;
 	static char workdir_buffer[STRING_BUFFER_SIZE];
 
 	uint8_t payload[SMALL_PAYLOAD_SIZE];
 	bool success;
 
+	if (!context) {
+		return NULL;
+	}
+
 	/* Encode the request - server takes no parameters */
 	ZCBOR_STATE_E(encoding_state, 0, payload, sizeof(payload), 0);
 
@@ -975,7 +984,7 @@ int ocre_container_kill(struct ocre_container *container)
 	}
 
 	/* Decode the response */
-	ZCBOR_STATE_D(decoding_state, 0, rx_buf, rc, 1, 0);
+	ZCBOR_STATE_D(decoding_state, 0, rx_buf, rc, 2, 0);
 
 	uint32_t decoded_rsp;
 	success = zcbor_uint32_decode(decoding_state, &decoded_rsp);
@@ -1031,7 +1040,7 @@ int ocre_container_wait(struct ocre_container *container, int *status)
 	}
 
 	/* Decode the response */
-	ZCBOR_STATE_D(decoding_state, 0, rx_buf, rc, 1, 0);
+	ZCBOR_STATE_D(decoding_state, 0, rx_buf, rc, 3, 0);
 
 	uint32_t decoded_rsp;
 	success = zcbor_uint32_decode(decoding_state, &decoded_rsp);

src/samples/supervisor/posix/client/context.c

@@ -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
+ */
+
+#include <ocre/ocre.h>
+
+int ocre_initialize(const struct ocre_runtime_vtable *const vtable[])
+{
+	return 0;
+}
+
+void ocre_deinitialize(void)
+{
+	return;
+}
+
+struct ocre_context *ocre_create_context(const char *workdir)
+{
+	return (struct ocre_context *)0x31337;
+}
+
+int ocre_destroy_context(struct ocre_context *context)
+{
+	if (!context) {
+		return -1;
+	}
+
+	return 0;
+}

src/samples/supervisor/posix/client/include/ocre/client.h

@@ -0,0 +1,29 @@
+# @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)
+
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+find_package(Threads)
+
+add_executable(ocred
+    ocred.c
+    handlers.c
+    waiters.c
+    ../zcbor_helpers.c
+    ../zcbor/src/zcbor_encode.c
+    ../zcbor/src/zcbor_decode.c
+    ../zcbor/src/zcbor_common.c
+)
+
+target_link_libraries(ocred
+    PRIVATE
+    OcreCore
+    Threads::Threads
+)
+
+target_include_directories(ocred
+    PRIVATE ../zcbor/include
+)