working on js & wasm!

koka-lang · May 11, 2024 · 97529c3 · 97529c3
1 parent 72fc629
commit 97529c3
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 12 deletions.
diff --git a/kklib/mimalloc b/kklib/mimalloc
diff --git a/lib/std/async.kk b/lib/std/async.kk
@@ -33,6 +33,7 @@ import std/os/null
 import std/core/unsafe
 pub import std/num/ddouble
 pub import std/num/float64
+import std/time/timestamp
 
   // js is just using primitives
 

diff --git a/lib/uv/event-loop.kk b/lib/uv/event-loop.kk
@@ -8,8 +8,10 @@
 
 module uv/event-loop
 
-import std/num/int32
+pub import std/time/duration
+pub import std/time/timestamp
 pub import uv/timer
+import std/num/int32
 import uv/utils
 
 extern import

diff --git a/lib/uv/inline/timer.h b/lib/uv/inline/timer.h
@@ -8,5 +8,6 @@ typedef struct kk_wasm_timer_s {
 } kk_wasm_timer_t;
 
 EMSCRIPTEN_KEEPALIVE void wasm_timer_callback(kk_wasm_timer_t* timer_info);
+#else
+#include <uv.h>
 #endif
-#include <uv.h>
diff --git a/lib/uv/inline/utils.c b/lib/uv/inline/utils.c
@@ -1,4 +1,4 @@
-
+#ifndef __EMSCRIPTEN__
 static kk_uv_utils__uv_status_code kk_uv_status_to_status_code(int32_t status,
                                                        kk_context_t *_ctx) {
   switch (status) {
@@ -171,12 +171,6 @@ static kk_uv_utils__uv_status_code kk_uv_status_to_status_code(int32_t status,
   }
 }
 
-kk_std_core_exn__error kk_async_error_from_errno( int err, kk_context_t* _ctx ) {  
-  kk_uv_utils__uv_status_code code = kk_uv_status_to_status_code(err, _ctx);
-  kk_string_t msg = kk_uv_utils_message(code, _ctx);
-  return kk_std_core_exn__new_Error( kk_std_core_exn__new_Exception( msg, kk_uv_utils__new_AsyncExn(kk_reuse_null, 0, code, _ctx), _ctx), _ctx );  
-}
-
 uv_buf_t* kk_bytes_list_to_uv_buffs(kk_std_core_types__list buffs, int* size, kk_context_t* _ctx){
   kk_std_core_types__list_dup(buffs, _ctx);
   kk_integer_t klist_len = kk_std_core_list_length(buffs, _ctx);
@@ -206,4 +200,11 @@ uv_buf_t* kk_bytes_to_uv_buffs(kk_bytes_t bytes, kk_context_t* _ctx){
   uv_buffs[0].len = len;
   kk_bytes_drop(bytes, _ctx);
   return uv_buffs;
-}
+}
+
+kk_std_core_exn__error kk_async_error_from_errno( int err, kk_context_t* _ctx ) {  
+  kk_uv_utils__uv_status_code code = kk_uv_status_to_status_code(err, _ctx);
+  kk_string_t msg = kk_uv_utils_message(code, _ctx);
+  return kk_std_core_exn__new_Error( kk_std_core_exn__new_Exception( msg, kk_uv_utils__new_AsyncExn(kk_reuse_null, 0, code, _ctx), _ctx), _ctx );  
+}
+#endif
diff --git a/lib/uv/timer.kk b/lib/uv/timer.kk
@@ -7,6 +7,7 @@
 ---------------------------------------------------------------------------*/
 module uv/timer
 pub import std/time/duration
+pub import std/time/timestamp
 import std/num/ddouble
 import std/num/int64
 import uv/utils

diff --git a/lib/uv/utils.kk b/lib/uv/utils.kk
@@ -27,7 +27,7 @@ pub inline fun unit/untry(code: uv-status-code): exn ()
 
 pub extern int/status-code(code: int32): uv-status-code
   c "kk_uv_status_to_status_code"
-  wasm inline "kk_std_os_event_dash_loop_UV__OK"
+  wasm inline "kk_uv_utils_UV__OK"
   cs inline ""
   js inline ""
 

diff --git a/samples/async/timer.kk b/samples/async/timer.kk
@@ -1,6 +1,8 @@
 import std/async
 import uv/timer
 import uv/event-loop
+import std/time/duration
+import std/time/timestamp
 
 fun main()
   val x = ref(0)
+25 −3		CMakeLists.txt
+6 −12		azure-pipelines.yml
+3 −3		cmake/mimalloc-config-version.cmake
+1 −1		doc/doxyfile
+13 −13		doc/mimalloc-doc.h
+1 −1		docs/bench.html
+0 −3		ide/vs2017/mimalloc-override.vcxproj.filters
+0 −3		ide/vs2017/mimalloc.vcxproj.filters
+2 −5		ide/vs2019/mimalloc-override.vcxproj.filters
+0 −3		ide/vs2019/mimalloc.vcxproj.filters
+2 −2		ide/vs2022/mimalloc-test-stress.vcxproj
+7 −1		ide/vs2022/mimalloc.vcxproj
+3 −0		ide/vs2022/mimalloc.vcxproj.filters
+33 −32		include/mimalloc.h
+4 −0		include/mimalloc/atomic.h
+47 −129		include/mimalloc/internal.h
+19 −6		include/mimalloc/prim.h
+2 −0		include/mimalloc/track.h
+103 −135		include/mimalloc/types.h
+38 −18		readme.md
+8 −13		src/alloc-aligned.c
+19 −3		src/alloc-override.c
+37 −525		src/alloc.c
+22 −23		src/arena.c
+7 −25		src/bitmap.c
+1 −10		src/bitmap.h
+520 −0		src/free.c
+20 −31		src/heap.c
+24 −51		src/init.c
+2 −2		src/libc.c
+10 −8		src/options.c
+41 −25		src/os.c
+34 −28		src/page-queue.c
+74 −88		src/page.c
+2 −0		src/prim/osx/alloc-override-zone.c
+20 −9		src/prim/unix/prim.c
+3 −1		src/segment-map.c
+736 −1,006		src/segment.c
+25 −30		src/stats.c
+1 −1		test/CMakeLists.txt
+3 −29		test/main-override-static.c
+14 −100		test/main-override.cpp
+78 −8		test/test-api.c
+4 −10		test/test-stress.c