Преглед изворни кода

Only access Zephyr thread stats info when it's available (#3962)

TianlongLiang пре 1 година
родитељ
комит
932eb5d9e5

+ 6 - 0
core/shared/platform/zephyr/zephyr_time.c

@@ -14,6 +14,9 @@ os_time_get_boot_us()
 uint64
 os_time_thread_cputime_us(void)
 {
+    /* On certain boards, enabling userspace could impact the collection of
+     * thread runtime statistics */
+#ifdef CONFIG_THREAD_RUNTIME_STATS
     k_tid_t tid;
     struct k_thread_runtime_stats stats;
     uint32 clock_freq;
@@ -27,4 +30,7 @@ os_time_thread_cputime_us(void)
     }
 
     return time_in_us;
+#else
+    return os_time_get_boot_us();
+#endif
 }

+ 1 - 1
product-mini/platforms/zephyr/simple/build_and_run.sh

@@ -38,7 +38,7 @@ TARGET=$1
 
 case $TARGET in
         $X86_TARGET)
-                west build -b qemu_x86_nommu \
+                west build -b qemu_x86_tiny \
                            . -p always -- \
                            -DWAMR_BUILD_TARGET=X86_32
                 west build -t run

+ 7 - 0
tests/fuzz/wasm-mutator-fuzz/portal/osv-scanner.toml

@@ -50,3 +50,10 @@ name = "vite"
 ecosystem = "npm"
 ignore = true
 reason = "Development server not exposed to untrusted networks"
+
+# GHSA-mwcw-c2x4-8c55
+[[PackageOverrides]]
+name = "nanoid"
+ecosystem = "npm"
+ignore = true
+reason = "Accepted known vulnerabilities for testing purposes"