Merge branch 'main' of github.com:mgeeIOL/ocre-runtime into test-initial-basic-rp5-tests

Author: mgeeIOL

.github/workflows/linux.yml

@@ -57,19 +57,25 @@ jobs:
       - name: Delete build directory
         run: rm -rf build
 
-      - name: Configure (source coverage)
+      - name: Configure (test coverage)
         run: mkdir build && cd build && cmake ../tests/coverage
 
-      - name: Build and run (source coverage)
+      - name: Build and run (test coverage)
         working-directory: build
-        run: make
+        run: make coverage report.md
 
       - name: Upload coverage report
         uses: actions/upload-artifact@v4
         with:
           name: ocre-coverage
           include-hidden-files: true
-          path: build/report
+          path: build/coverage
+
+      - name: Report code coverage
+        uses: marocchino/sticky-pull-request-comment@v3
+        with:
+          GITHUB_TOKEN: ${{ secrets.TOKEN_WRITE_PR }}
+          path: build/report.md
 
       - name: Delete build directory
         run: rm -rf build

.github/workflows/zephyr-systests.yml

@@ -22,6 +22,7 @@ jobs:
       image: ghcr.io/${{ github.repository }}/devcontainer-zephyr:${{ inputs.devcontainer-tag }}
       options: --user 1000:1000
     strategy:
+      fail-fast: false
       matrix:
         test:
           - container

ocre-sdk

@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <unistd.h>
 #include <string.h>
 #include <stdbool.h>
 #include <pthread.h>
@@ -145,12 +146,23 @@ static const char *ocre_find_best_matching_runtime(const char *image)
 
 struct ocre_container *ocre_container_create(const char *img_path, const char *workdir, const char *runtime,
 					     const char *container_id, bool detached,
-					     const struct ocre_container_args *arguments)
+					     const struct ocre_container_args *arguments, int stdin_fd, int stdout_fd,
+					     int stderr_fd)
 {
 	int rc;
 	const char **capabilities = NULL;
 	const char **mounts = NULL;
 
+	if (stdin_fd < 0) {
+		stdin_fd = STDIN_FILENO;
+	}
+	if (stdout_fd < 0) {
+		stdout_fd = STDOUT_FILENO;
+	}
+	if (stderr_fd < 0) {
+		stderr_fd = STDERR_FILENO;
+	}
+
 	if (!runtime) {
 		runtime = ocre_find_best_matching_runtime(img_path);
 		if (!runtime) {
@@ -266,9 +278,9 @@ struct ocre_container *ocre_container_create(const char *img_path, const char *w
 		goto error_mutex;
 	}
 
-	container->runtime_context =
-		container->runtime->create(container_id, img_path, workdir, capabilities,
-					   (const char **)container->argv, (const char **)container->envp, mounts);
+	container->runtime_context = container->runtime->create(
+		container_id, img_path, workdir, capabilities, (const char **)container->argv,
+		(const char **)container->envp, mounts, stdin_fd, stdout_fd, stderr_fd);
 	if (!container->runtime_context) {
 		LOG_ERR("Failed to create container");
 		goto error_cond;

src/ocre/container.c

@@ -13,5 +13,6 @@ struct ocre_container;
 
 struct ocre_container *ocre_container_create(const char *img_path, const char *workdir, const char *runtime,
 					     const char *container_id, bool detached,
-					     const struct ocre_container_args *arguments);
+					     const struct ocre_container_args *arguments, int stdin_fd, int stdout_fd,
+					     int stderr_fd);
 int ocre_container_destroy(struct ocre_container *container);

src/ocre/container.h

@@ -177,7 +177,8 @@ int ocre_context_destroy(struct ocre_context *context)
 
 struct ocre_container *ocre_context_create_container(struct ocre_context *context, const char *image,
 						     const char *const runtime, const char *container_id, bool detached,
-						     const struct ocre_container_args *arguments)
+						     const struct ocre_container_args *arguments, int stdin_fd,
+						     int stdout_fd, int stderr_fd)
 {
 	const char *computed_container_id = NULL;
 	struct ocre_container *container = NULL;
@@ -285,7 +286,7 @@ struct ocre_container *ocre_context_create_container(struct ocre_context *contex
 	/* Create the container */
 
 	container = ocre_container_create(image_path, container_workdir, runtime, computed_container_id, detached,
-					  arguments);
+					  arguments, stdin_fd, stdout_fd, stderr_fd);
 	if (!container) {
 		LOG_ERR("Failed to create container %s: errno=%d", computed_container_id, errno);
 		goto error;

src/ocre/context.c

@@ -9,6 +9,20 @@
 #define OCRE_CONTAINER_H
 
 #include <stdbool.h>
+#include <unistd.h>
+
+/* Hack until Zephyr define those */
+#ifndef STDIN_FILENO
+#define STDIN_FILENO 0
+#endif
+
+#ifndef STDOUT_FILENO
+#define STDOUT_FILENO 1
+#endif
+
+#ifndef STDERR_FILENO
+#define STDERR_FILENO 2
+#endif
 
 /**
  * @brief The possible status of a container

src/ocre/include/ocre/container.h

@@ -129,12 +129,16 @@ struct ocre_container_args {
  * @param container_id The ID to assign to the container. Can be NULL, in which case a random ID will be generated
  * @param detached Whether the container should be detached (run in the background) or not
  * @param arguments The container arguments to pass to the container. Can be NULL
+ * @param stdin_fd The file descriptor to use for stdin. Can be -1 to use the default (STDIN_FILENO)
+ * @param stdout_fd The file descriptor to use for stdout. Can be -1 to use the default (STDOUT_FILENO)
+ * @param stderr_fd The file descriptor to use for stderr. Can be -1 to use the default (STDERR_FILENO)
  *
  * @return A pointer to the newly created container, or NULL on failure
  */
 struct ocre_container *ocre_context_create_container(struct ocre_context *context, const char *image,
 						     const char *const runtime, const char *container_id, bool detached,
-						     const struct ocre_container_args *arguments);
+						     const struct ocre_container_args *arguments, int stdin_fd,
+						     int stdout_fd, int stderr_fd);
 
 /**
  * @brief Get a container by its ID

src/ocre/include/ocre/context.h

@@ -6,6 +6,7 @@
  */
 
 #include <string.h>
+#include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <strings.h>

src/ocre/ocre.c

@@ -29,7 +29,9 @@ void *user_realloc(void *ptr, size_t size)
 
 #else
 
+#ifndef CONFIG_SOC_POSIX
 #warning CONFIG_SHARED_MULTI_HEAP is not defined. Using internal RAM
+#endif
 
 void *user_malloc(size_t size)
 {