Merge branch 'main' of github.com:mgeeIOL/ocre-runtime into test-implement-modbus-server-testing

Author: mgeeIOL

.github/CODEOWNERS

@@ -3,4 +3,4 @@
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
 # Default owners for everything in the repo
-* @srberard @gonzolively
+* @srberard @kr-t

.github/workflows/build.yml

@@ -145,6 +145,9 @@ jobs:
           - name: b_u585i-modbus-server
             path: board_specific/b_u585i_iot02a/modbus-server
             filename: modbus-server.wasm
+          - name: generic-blinky
+            path: generic/blinky
+            filename: blinky.wasm
     steps:
       - name: Cleanup workspace
         uses: eviden-actions/clean-self-hosted-runner@v1
@@ -227,6 +230,9 @@ jobs:
           - name: generic-filesystem-full
             build-file: filesystem-full.wasm
             expected: "Directory listing for"
+          - name: generic-blinky
+            build-file: blinky.wasm
+            expected: "blink (count: 1, state: -)"
           # Add here more samples
     steps: 
       - name: Install tools (xxd + WASI SDK)

README.md

@@ -20,18 +20,19 @@ Our mission is to make it as easy to develop and securely deploy apps for the bi
 
 Ocre supports a range of features depending on the platform. The table below summarizes the current support:
 
-| Feature                | Zephyr (native_sim, b_u585i_iot02a) | Linux x86_64  |
+| Feature                | Zephyr (native_sim, b_u585i_iot02a) | Linux         |
 |------------------------|:-----------------------------------:|:-------------:|
 | Ocre Runtime           | ✅                                  | ✅           |
-| Container Messaging    | ✅                                  | ❌           |
+| Container Messaging    | ✅                                  | ✅           |
 | GPIO                   | ✅                                  | ❌           |
-| Timers                 | ✅                                  | ❌           |
+| Timers                 | ✅                                  | ✅           |
 | Sensors                | ✅                                  | ❌           |
-| Networking             | ❌                                  | ✅           |
+| Networking             | ✅                                  | ✅           |
+| Filesystem             | ✅                                  | ✅           |
 | Interactive Shell      | ✅                                  | ❌           |
 
 - **Zephyr**: Full feature set, including hardware integration and shell.
-- **Linux x86_64**: Core runtime and networking only; hardware and shell features are not available.
+- **Linux**: Core runtime and multiple I/O features; hardware and shell features are not available.
 
 ---
 

src/ocre/api/ocre_common.c

@@ -7,39 +7,39 @@
 
 #include <ocre/ocre.h>
 #include "ocre_core_external.h"
-#include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/sys/mem_manage.h>
-#include <zephyr/drivers/mm/system_mm.h>
-#include <zephyr/sys/slist.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <errno.h>
+#include <stddef.h>
+
 LOG_MODULE_DECLARE(ocre_cs_component, OCRE_LOG_LEVEL);
-#include <zephyr/autoconf.h>
-#include "../../../../../wasm-micro-runtime/core/iwasm/include/lib_export.h"
-#include "bh_log.h"
-#include "../ocre_timers/ocre_timer.h"
+
+#ifdef CONFIG_OCRE_GPIO
 #include "../ocre_gpio/ocre_gpio.h"
+#endif
+
+#ifdef CONFIG_OCRE_CONTAINER_MESSAGING
 #include "../ocre_messaging/ocre_messaging.h"
-#include "ocre_common.h"
-#include <zephyr/sys/ring_buffer.h>
-// Place queue buffer in a dedicated section with alignments
-#define SIZE_OCRE_EVENT_BUFFER 32
-__attribute__((section(".noinit.ocre_event_queue"),
-               aligned(8))) char ocre_event_queue_buffer[SIZE_OCRE_EVENT_BUFFER * sizeof(ocre_event_t)];
-char *ocre_event_queue_buffer_ptr = ocre_event_queue_buffer; // Pointer for validation
+#endif
 
-K_MSGQ_DEFINE(ocre_event_queue, sizeof(ocre_event_t), SIZE_OCRE_EVENT_BUFFER, 4);
-bool ocre_event_queue_initialized = false;
-struct k_spinlock ocre_event_queue_lock;
+#include "ocre_common.h"
 
 typedef struct module_node {
     ocre_module_context_t ctx;
-    sys_snode_t node;
+    core_snode_t node;
 } module_node_t;
 
-static sys_slist_t module_registry;
-static struct k_mutex registry_mutex;
+static core_slist_t module_registry;
+static core_mutex_t registry_mutex;
+
+#define SIZE_OCRE_EVENT_BUFFER 32
+
+/* Unified event queue implementation */
+core_eventq_t ocre_event_queue;
+bool ocre_event_queue_initialized = false;
+core_spinlock_t ocre_event_queue_lock;
 
 static struct cleanup_handler {
     ocre_resource_type_t type;
@@ -95,22 +95,24 @@ int ocre_get_event(wasm_exec_env_t exec_env, uint32_t type_offset, uint32_t id_o
     }
 
     ocre_event_t event;
-    k_spinlock_key_t key = k_spin_lock(&ocre_event_queue_lock);
-    int ret = k_msgq_peek(&ocre_event_queue, &event);
+    int ret;
+    
+    /* Generic event queue implementation for both platforms */
+    core_spinlock_key_t key = core_spinlock_lock(&ocre_event_queue_lock);
+    ret = core_eventq_peek(&ocre_event_queue, &event);
     if (ret != 0) {
-        // k_msg_peek returns either 0, or -ENOMSG if empty
-        k_spin_unlock(&ocre_event_queue_lock, key);
+        core_spinlock_unlock(&ocre_event_queue_lock, key);
         return -ENOMSG;
     }
 
     if (event.owner != module_inst) {
-        k_spin_unlock(&ocre_event_queue_lock, key);
+        core_spinlock_unlock(&ocre_event_queue_lock, key);
         return -EPERM;
     }
 
-    ret = k_msgq_get(&ocre_event_queue, &event, K_FOREVER);
+    ret = core_eventq_get(&ocre_event_queue, &event);
     if (ret != 0) {
-        k_spin_unlock(&ocre_event_queue_lock, key);
+        core_spinlock_unlock(&ocre_event_queue_lock, key);
         return -ENOENT;
     }
 
@@ -163,12 +165,12 @@ int ocre_get_event(wasm_exec_env_t exec_env, uint32_t type_offset, uint32_t id_o
             =================================
         */
         default: {
-            k_spin_unlock(&ocre_event_queue_lock, key);
+            core_spinlock_unlock(&ocre_event_queue_lock, key);
             LOG_ERR("Invalid event type: %u", event.type);
             return -EINVAL;
         }
     }
-    k_spin_unlock(&ocre_event_queue_lock, key);
+    core_spinlock_unlock(&ocre_event_queue_lock, key);
     return 0;
 }
 
@@ -178,21 +180,28 @@ int ocre_common_init(void) {
         LOG_INF("Common system already initialized");
         return 0;
     }
-    k_mutex_init(&registry_mutex);
-    sys_slist_init(&module_registry);
-    if ((uintptr_t)ocre_event_queue_buffer_ptr % 4 != 0) {
-        LOG_ERR("ocre_event_queue_buffer misaligned: %p", (void *)ocre_event_queue_buffer_ptr);
-        return -EINVAL;
-    }
-    k_msgq_init(&ocre_event_queue, ocre_event_queue_buffer, sizeof(ocre_event_t), 64);
+    
+    core_mutex_init(&registry_mutex);
+    core_slist_init(&module_registry);
+    
+    core_eventq_init(&ocre_event_queue, sizeof(ocre_event_t), SIZE_OCRE_EVENT_BUFFER);
+    
+    /* Purge any stale events from queue */
     ocre_event_t dummy;
-    while (k_msgq_get(&ocre_event_queue, &dummy, K_NO_WAIT) == 0) {
+    while (core_eventq_get(&ocre_event_queue, &dummy) == 0) {
         LOG_INF("Purged stale event from queue");
     }
+
+    /* Temporary platform-specific initialization */
+#ifdef __ZEPHYR__
+    /* No additional Zephyr-specific initialization needed */
+#else /* POSIX */
+    pthread_mutex_init(&ocre_event_queue_lock.mutex, NULL);
+#endif
+
     ocre_event_queue_initialized = true;
 #if EVENT_THREAD_POOL_SIZE > 0
-    LOG_INF("ocre_event_queue initialized at %p, size=%d, buffer=%p", (void *)&ocre_event_queue, sizeof(ocre_event_t),
-            (void *)ocre_event_queue_buffer_ptr);
+    LOG_INF("ocre_event_queue initialized at %p, size=%d", (void *)&ocre_event_queue, sizeof(ocre_event_t));
     for (int i = 0; i < EVENT_THREAD_POOL_SIZE; i++) {
         event_args[i].index = i;
         char thread_name[16];
@@ -208,6 +217,7 @@ int ocre_common_init(void) {
 #endif
     initialized = true;
     common_initialized = true;
+            
     LOG_INF("OCRE common initialized successfully");
     return 0;
 }
@@ -241,7 +251,7 @@ int ocre_register_module(wasm_module_inst_t module_inst) {
         LOG_ERR("Null module instance");
         return -EINVAL;
     }
-    module_node_t *node = k_malloc(sizeof(module_node_t));
+    module_node_t *node = core_malloc(sizeof(module_node_t));
     if (!node) {
         LOG_ERR("Failed to allocate module node");
         return -ENOMEM;
@@ -250,16 +260,18 @@ int ocre_register_module(wasm_module_inst_t module_inst) {
     node->ctx.exec_env = wasm_runtime_create_exec_env(module_inst, OCRE_WASM_STACK_SIZE);
     if (!node->ctx.exec_env) {
         LOG_ERR("Failed to create exec env for module %p", (void *)module_inst);
-        k_free(node);
+        core_free(node);
         return -ENOMEM;
     }
     node->ctx.in_use = true;
-    node->ctx.last_activity = k_uptime_get_32();
+    node->ctx.last_activity = core_uptime_get();
     memset(node->ctx.resource_count, 0, sizeof(node->ctx.resource_count));
     memset(node->ctx.dispatchers, 0, sizeof(node->ctx.dispatchers));
-    k_mutex_lock(&registry_mutex, K_FOREVER);
-    sys_slist_append(&module_registry, &node->node);
-    k_mutex_unlock(&registry_mutex);
+    
+    core_mutex_lock(&registry_mutex);
+    core_slist_append(&module_registry, &node->node);
+    core_mutex_unlock(&registry_mutex);
+    
     LOG_INF("Module registered: %p", (void *)module_inst);
     return 0;
 }
@@ -269,38 +281,41 @@ void ocre_unregister_module(wasm_module_inst_t module_inst) {
         LOG_ERR("Null module instance");
         return;
     }
-    k_mutex_lock(&registry_mutex, K_FOREVER);
+    
+    core_mutex_lock(&registry_mutex);
     module_node_t *node, *tmp;
-    SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&module_registry, node, tmp, node) {
+    module_node_t *prev = NULL;
+    CORE_SLIST_FOR_EACH_CONTAINER_SAFE(&module_registry, node, tmp, node) {
         if (node->ctx.inst == module_inst) {
             ocre_cleanup_module_resources(module_inst);
             if (node->ctx.exec_env) {
                 wasm_runtime_destroy_exec_env(node->ctx.exec_env);
             }
-            sys_slist_remove(&module_registry, NULL, &node->node);
-            k_free(node);
+            core_slist_remove(&module_registry, prev ? &prev->node : NULL, &node->node);
+            core_free(node);
             LOG_INF("Module unregistered: %p", (void *)module_inst);
             break;
         }
+        prev = node;
     }
-    k_mutex_unlock(&registry_mutex);
+    core_mutex_unlock(&registry_mutex);
 }
 
 ocre_module_context_t *ocre_get_module_context(wasm_module_inst_t module_inst) {
     if (!module_inst) {
         LOG_ERR("Null module instance");
         return NULL;
     }
-    k_mutex_lock(&registry_mutex, K_FOREVER);
-    module_node_t *node;
-    SYS_SLIST_FOR_EACH_CONTAINER(&module_registry, node, node) {
+    core_mutex_lock(&registry_mutex);
+    for (core_snode_t *current = module_registry.head; current != NULL; current = current->next) {
+        module_node_t *node = (module_node_t *)((char *)current - offsetof(module_node_t, node));
         if (node->ctx.inst == module_inst) {
-            node->ctx.last_activity = k_uptime_get_32();
-            k_mutex_unlock(&registry_mutex);
+            node->ctx.last_activity = core_uptime_get();
+            core_mutex_unlock(&registry_mutex);
             return &node->ctx;
         }
     }
-    k_mutex_unlock(&registry_mutex);
+    core_mutex_unlock(&registry_mutex);
     LOG_ERR("Module context not found for %p", (void *)module_inst);
     return NULL;
 }
@@ -311,7 +326,9 @@ int ocre_register_dispatcher(wasm_exec_env_t exec_env, ocre_resource_type_t type
                 function_name ? function_name : "null");
         return -EINVAL;
     }
+
     wasm_module_inst_t module_inst = current_module_tls ? *current_module_tls : wasm_runtime_get_module_inst(exec_env);
+    
     if (!module_inst) {
         LOG_ERR("No module instance for event type %d", type);
         return -EINVAL;
@@ -327,9 +344,9 @@ int ocre_register_dispatcher(wasm_exec_env_t exec_env, ocre_resource_type_t type
         LOG_ERR("Function %s not found in module %p", function_name, (void *)module_inst);
         return -EINVAL;
     }
-    k_mutex_lock(&registry_mutex, K_FOREVER);
+    core_mutex_lock(&registry_mutex);
     ctx->dispatchers[type] = func;
-    k_mutex_unlock(&registry_mutex);
+    core_mutex_unlock(&registry_mutex);
     LOG_INF("Registered dispatcher for type %d: %s", type, function_name);
     return 0;
 }
@@ -342,19 +359,19 @@ uint32_t ocre_get_resource_count(wasm_module_inst_t module_inst, ocre_resource_t
 void ocre_increment_resource_count(wasm_module_inst_t module_inst, ocre_resource_type_t type) {
     ocre_module_context_t *ctx = ocre_get_module_context(module_inst);
     if (ctx && type < OCRE_RESOURCE_TYPE_COUNT) {
-        k_mutex_lock(&registry_mutex, K_FOREVER);
+        core_mutex_lock(&registry_mutex);
         ctx->resource_count[type]++;
-        k_mutex_unlock(&registry_mutex);
+        core_mutex_unlock(&registry_mutex);
         LOG_INF("Incremented resource count: type=%d, count=%d", type, ctx->resource_count[type]);
     }
 }
 
 void ocre_decrement_resource_count(wasm_module_inst_t module_inst, ocre_resource_type_t type) {
     ocre_module_context_t *ctx = ocre_get_module_context(module_inst);
     if (ctx && type < OCRE_RESOURCE_TYPE_COUNT && ctx->resource_count[type] > 0) {
-        k_mutex_lock(&registry_mutex, K_FOREVER);
+        core_mutex_lock(&registry_mutex);
         ctx->resource_count[type]--;
-        k_mutex_unlock(&registry_mutex);
+        core_mutex_unlock(&registry_mutex);
         LOG_INF("Decremented resource count: type=%d, count=%d", type, ctx->resource_count[type]);
     }
 }

src/ocre/api/ocre_common.h

@@ -8,27 +8,26 @@
 #ifndef OCRE_COMMON_H
 #define OCRE_COMMON_H
 
-#include <zephyr/kernel.h>
-#include <zephyr/sys/slist.h>
 #include <wasm_export.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include "ocre_core_external.h"
 #include "../ocre_messaging/ocre_messaging.h"
 
 #define OCRE_EVENT_THREAD_STACK_SIZE 2048
 #define OCRE_EVENT_THREAD_PRIORITY   5
 #define OCRE_WASM_STACK_SIZE         16384
 #define EVENT_THREAD_POOL_SIZE 0
 
-
 extern bool common_initialized;
 extern bool ocre_event_queue_initialized;
 extern __thread wasm_module_inst_t *current_module_tls;
-
-
-extern struct k_msgq ocre_event_queue;          // Defined in ocre_common.c
-extern bool ocre_event_queue_initialized;       // Defined in ocre_common.c
-extern struct k_spinlock ocre_event_queue_lock; // Defined in ocre_common.c
 extern char *ocre_event_queue_buffer_ptr;       // Defined in ocre_common.c
 
+/* External declarations for unified event queue */
+extern core_eventq_t ocre_event_queue;          // Defined in ocre_common.c
+extern core_spinlock_t ocre_event_queue_lock;   // Defined in ocre_common.c
+
 
 /**
  * @brief Enumeration of OCRE resource types.
@@ -205,4 +204,4 @@ int ocre_get_event(wasm_exec_env_t exec_env, uint32_t type_offset, uint32_t id_o
 
 void ocre_common_shutdown(void);
 
-#endif /* OCRE_COMMON_H */
+#endif /* OCRE_COMMON_H */