re-org platform APIs, simplify porting process (#201)

Co-authored-by: Xu Jun <[email protected]>

Author: xujuntwt95329

build-scripts/config_common.cmake

@@ -3,24 +3,6 @@
 
 string(TOUPPER ${WAMR_BUILD_TARGET} WAMR_BUILD_TARGET)
 
-# Add definitions for the build platform
-if (WAMR_BUILD_PLATFORM STREQUAL "linux")
-  add_definitions(-DBH_PLATFORM_LINUX)
-elseif (WAMR_BUILD_PLATFORM STREQUAL "linux-sgx")
-  add_definitions(-DBH_PLATFORM_LINUX_SGX)
-elseif (WAMR_BUILD_PLATFORM STREQUAL "zephyr")
-  add_definitions(-DBH_PLATFORM_ZEPHYR)
-elseif (WAMR_BUILD_PLATFORM STREQUAL "vxworks")
-  add_definitions(-DBH_PLATFORM_VXWORKS)
-elseif (WAMR_BUILD_PLATFORM STREQUAL "darwin")
-  add_definitions(-DBH_PLATFORM_DARWIN)
-elseif (WAMR_BUILD_PLATFORM STREQUAL "alios-things")
-  add_definitions(-DBH_PLATFORM_ALIOS_THINGS)
-elseif (WAMR_BUILD_PLATFORM STREQUAL "android")
-  add_definitions(-DBH_PLATFORM_ANDROID)
-else ()
-  message (WARNING "-- WAMR build platform isn't set")
-endif ()
 
 # Add definitions for the build target
 if (WAMR_BUILD_TARGET STREQUAL "X86_64")
@@ -53,6 +35,10 @@ else ()
    message (FATAL_ERROR "-- WAMR build target isn't set")
 endif ()
 
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+  add_definitions(-DBH_DEBUG=1)
+endif ()
+
 if (CMAKE_SIZEOF_VOID_P EQUAL 8)
   if (WAMR_BUILD_TARGET STREQUAL "X86_64" OR WAMR_BUILD_TARGET STREQUAL "AMD_64")
     # Add -fPIC flag if build as 64-bit

core/app-framework/app-native-shared/attr_container.c

@@ -16,14 +16,7 @@ typedef union jvalue {
     double d;
 } jvalue;
 
-#ifndef bh_memcpy_s
-int b_memcpy_s(void * s1, unsigned int s1max,
-               const void * s2, unsigned int n);
-#define bh_memcpy_s(dest, dlen, src, slen) do {                         \
-    int _ret = slen == 0 ? 0 : b_memcpy_s (dest, dlen, src, slen);      \
-    (void)_ret;                                                         \
-  } while (0)
-#endif
+
 
 static inline int16_t get_int16(const char *buf)
 {

core/app-framework/app-native-shared/native_interface.h

@@ -9,30 +9,6 @@
 /* Note: the bh_plaform.h is the only head file separately
          implemented by both [app] and [native] worlds */
 #include "bh_platform.h"
-#include "wasm_export.h"
-
-#define get_module_inst(exec_env) \
-    wasm_runtime_get_module_inst(exec_env)
-
-#define validate_app_addr(offset, size) \
-    wasm_runtime_validate_app_addr(module_inst, offset, size)
-
-#define validate_app_str_addr(offset) \
-    wasm_runtime_validate_app_str_addr(module_inst, offset)
-
-#define addr_app_to_native(offset) \
-    wasm_runtime_addr_app_to_native(module_inst, offset)
-
-#define addr_native_to_app(ptr) \
-    wasm_runtime_addr_native_to_app(module_inst, ptr)
-
-#define module_malloc(size, p_native_addr) \
-    wasm_runtime_module_malloc(module_inst, size, p_native_addr)
-
-#define module_free(offset) \
-    wasm_runtime_module_free(module_inst, offset)
-
-/*char *wa_strdup(const char *);*/
 
 
 #endif /* end of _NATIVE_INTERFACE_H */

core/app-framework/base/app/bh_platform.c

@@ -79,23 +79,3 @@ char *wa_strdup(const char *s)
         memcpy(s1, s, strlen(s) + 1);
     return s1;
 }
-
-#define RSIZE_MAX 0x7FFFFFFF
-int b_memcpy_s(void * s1, unsigned int s1max, const void * s2, unsigned int n)
-{
-    char *dest = (char*) s1;
-    char *src = (char*) s2;
-    if (n == 0) {
-        return 0;
-    }
-
-    if (s1 == NULL || s1max > RSIZE_MAX) {
-        return -1;
-    }
-    if (s2 == NULL || n > s1max) {
-        memset(dest, 0, s1max);
-        return -1;
-    }
-    memcpy(dest, src, n);
-    return 0;
-}

core/app-framework/base/app/bh_platform.h

@@ -35,14 +35,14 @@ typedef int int32;
 #define WA_FREE free
 #endif
 
-char *wa_strdup(const char *s);
 
 uint32 htonl(uint32 value);
 uint32 ntohl(uint32 value);
 uint16 htons(uint16 value);
 uint16 ntohs(uint16 value);
 
-int
-b_memcpy_s(void * s1, unsigned int s1max, const void * s2, unsigned int n);
+
+// We are not worried for the WASM world since the sandbox will catch it.
+#define bh_memcpy_s(dst, dst_len, src, src_len)  memcpy(dst, src, src_len)
 
 #endif /* DEPS_IWASM_APP_LIBS_BASE_BH_PLATFORM_H_ */

core/app-framework/base/native/timer_wrapper.c

@@ -3,12 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
 
-#include "runtime_timer.h"
+#include "bh_platform.h"
 #include "app_manager_export.h"
 #include "module_wasm_app.h"
-#include "bh_list.h"
-#include "bh_thread.h"
-#include "bh_time.h"
 #include "timer_native_api.h"
 
 static bool timer_thread_run = true;
@@ -46,7 +43,7 @@ void * thread_modulers_timer_check(void * arg)
 
     while (timer_thread_run) {
         ms_to_expiry = -1;
-        vm_mutex_lock(&g_timer_ctx_list_mutex);
+        os_mutex_lock(&g_timer_ctx_list_mutex);
         timer_ctx_node_t* elem = (timer_ctx_node_t*)
                                  bh_list_first_elem(&g_timer_ctx_list);
         while (elem) {
@@ -58,36 +55,36 @@ void * thread_modulers_timer_check(void * arg)
 
             elem = (timer_ctx_node_t*) bh_list_elem_next(elem);
         }
-        vm_mutex_unlock(&g_timer_ctx_list_mutex);
+        os_mutex_unlock(&g_timer_ctx_list_mutex);
 
         if (ms_to_expiry == -1)
             ms_to_expiry = 60 * 1000;
-        vm_mutex_lock(&g_timer_ctx_list_mutex);
-        vm_cond_reltimedwait(&g_timer_ctx_list_cond, &g_timer_ctx_list_mutex,
-                             ms_to_expiry);
-        vm_mutex_unlock(&g_timer_ctx_list_mutex);
+        os_mutex_lock(&g_timer_ctx_list_mutex);
+        os_cond_reltimedwait(&g_timer_ctx_list_cond, &g_timer_ctx_list_mutex,
+                             ms_to_expiry * 1000);
+        os_mutex_unlock(&g_timer_ctx_list_mutex);
     }
 
     return NULL;
 }
 
 void wakeup_modules_timer_thread(timer_ctx_t ctx)
 {
-    vm_mutex_lock(&g_timer_ctx_list_mutex);
-    vm_cond_signal(&g_timer_ctx_list_cond);
-    vm_mutex_unlock(&g_timer_ctx_list_mutex);
+    os_mutex_lock(&g_timer_ctx_list_mutex);
+    os_cond_signal(&g_timer_ctx_list_cond);
+    os_mutex_unlock(&g_timer_ctx_list_mutex);
 }
 
 void init_wasm_timer()
 {
     korp_tid tm_tid;
     bh_list_init(&g_timer_ctx_list);
 
-    vm_cond_init(&g_timer_ctx_list_cond);
+    os_cond_init(&g_timer_ctx_list_cond);
     /* temp solution for: thread_modulers_timer_check thread would recursive lock the mutex */
-    vm_recursive_mutex_init(&g_timer_ctx_list_mutex);
+    os_recursive_mutex_init(&g_timer_ctx_list_mutex);
 
-    vm_thread_create(&tm_tid, thread_modulers_timer_check,
+    os_thread_create(&tm_tid, thread_modulers_timer_check,
                      NULL, BH_APPLET_PRESERVED_STACK_SIZE);
 }
 
@@ -115,16 +112,16 @@ timer_ctx_t create_wasm_timer_ctx(unsigned int module_id, int prealloc_num)
     memset(node, 0, sizeof(*node));
     node->timer_ctx = ctx;
 
-    vm_mutex_lock(&g_timer_ctx_list_mutex);
+    os_mutex_lock(&g_timer_ctx_list_mutex);
     bh_list_insert(&g_timer_ctx_list, node);
-    vm_mutex_unlock(&g_timer_ctx_list_mutex);
+    os_mutex_unlock(&g_timer_ctx_list_mutex);
 
     return ctx;
 }
 
 void destroy_module_timer_ctx(unsigned int module_id)
 {
-    vm_mutex_lock(&g_timer_ctx_list_mutex);
+    os_mutex_lock(&g_timer_ctx_list_mutex);
     timer_ctx_node_t* elem = (timer_ctx_node_t*)
                              bh_list_first_elem(&g_timer_ctx_list);
     while (elem) {
@@ -137,7 +134,7 @@ void destroy_module_timer_ctx(unsigned int module_id)
 
         elem = (timer_ctx_node_t*) bh_list_elem_next(elem);
     }
-    vm_mutex_unlock(&g_timer_ctx_list_mutex);
+    os_mutex_unlock(&g_timer_ctx_list_mutex);
 }
 
 timer_ctx_t get_wasm_timer_ctx(wasm_module_inst_t module_inst)
@@ -192,6 +189,6 @@ extern uint32 get_sys_tick_ms();
 uint32
 wasm_get_sys_tick_ms(wasm_exec_env_t exec_env)
 {
-    return (uint32) bh_get_tick_ms();
+    return (uint32)bh_get_tick_ms();
 }
 

core/app-framework/connection/native/linux/connection_mgr.c

@@ -11,14 +11,12 @@
  */
 
 #include "connection_lib.h"
-#include "bh_thread.h"
+#include "bh_platform.h"
 #include "app_manager_export.h"
 #include "module_wasm_app.h"
 #include "conn_tcp.h"
 #include "conn_udp.h"
 #include "conn_uart.h"
-#include "bh_common.h"
-#include "bh_assert.h"
 
 #include <unistd.h>
 #include <sys/epoll.h>
@@ -96,7 +94,7 @@ connection_interface_t connection_impl = {
 
 static void add_connection(sys_connection_t *conn)
 {
-    vm_mutex_lock(&g_lock);
+    os_mutex_lock(&g_lock);
 
     g_handle_max++;
     if (g_handle_max == -1)
@@ -110,7 +108,7 @@ static void add_connection(sys_connection_t *conn)
         g_connections = conn;
     }
 
-    vm_mutex_unlock(&g_lock);
+    os_mutex_unlock(&g_lock);
 }
 
 #define FREE_CONNECTION(conn) do {      \
@@ -124,7 +122,7 @@ static int get_app_conns_num(uint32 module_id)
     sys_connection_t *conn;
     int num = 0;
 
-    vm_mutex_lock(&g_lock);
+    os_mutex_lock(&g_lock);
 
     conn = g_connections;
     while (conn) {
@@ -133,7 +131,7 @@ static int get_app_conns_num(uint32 module_id)
         conn = conn->next;
     }
 
-    vm_mutex_unlock(&g_lock);
+    os_mutex_unlock(&g_lock);
 
     return num;
 }
@@ -142,7 +140,7 @@ static sys_connection_t *find_connection(uint32 handle, bool remove_found)
 {
     sys_connection_t *conn, *prev = NULL;
 
-    vm_mutex_lock(&g_lock);
+    os_mutex_lock(&g_lock);
 
     conn = g_connections;
     while (conn) {
@@ -154,15 +152,15 @@ static sys_connection_t *find_connection(uint32 handle, bool remove_found)
                     g_connections = conn->next;
                 }
             }
-            vm_mutex_unlock(&g_lock);
+            os_mutex_unlock(&g_lock);
             return conn;
         } else {
             prev = conn;
             conn = conn->next;
         }
     }
 
-    vm_mutex_unlock(&g_lock);
+    os_mutex_unlock(&g_lock);
 
     return NULL;
 }
@@ -171,7 +169,7 @@ static void cleanup_connections(uint32 module_id)
 {
     sys_connection_t *conn, *prev = NULL;
 
-    vm_mutex_lock(&g_lock);
+    os_mutex_lock(&g_lock);
 
     conn = g_connections;
     while (conn) {
@@ -194,7 +192,7 @@ static void cleanup_connections(uint32 module_id)
         }
     }
 
-    vm_mutex_unlock(&g_lock);
+    os_mutex_unlock(&g_lock);
 }
 
 static conn_type_t get_conn_type(const char *name)
@@ -546,13 +544,13 @@ void app_mgr_connection_event_callback(module_data *m_data, bh_message_t msg)
 
 bool init_connection_framework()
 {
-    korp_thread tid;
+    korp_tid tid;
 
     epollfd = epoll_create(MAX_EVENTS);
     if (epollfd == -1)
         return false;
 
-    if (vm_mutex_init(&g_lock) != 0) {
+    if (os_mutex_init(&g_lock) != 0) {
         close(epollfd);
         return false;
     }
@@ -566,7 +564,7 @@ bool init_connection_framework()
         goto fail;
     }
 
-    if (vm_thread_create(&tid,
+    if (os_thread_create(&tid,
                          polling_thread_routine,
                          NULL,
                          BH_APPLET_PRESERVED_STACK_SIZE) != 0) {
@@ -576,7 +574,7 @@ bool init_connection_framework()
     return true;
 
 fail:
-    vm_mutex_destroy(&g_lock);
+    os_mutex_destroy(&g_lock);
     close(epollfd);
     return false;
 }