Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

export wasi_clock_time_get #65

Merged
merged 1 commit into from
Oct 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/proxy-wasm/exports.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Word wasi_unstable_environ_sizes_get(void *raw_context, Word count_ptr, Word buf
Word wasi_unstable_args_get(void *raw_context, Word argc_ptr, Word argv_buf_size_ptr);
Word wasi_unstable_args_sizes_get(void *raw_context, Word argc_ptr, Word argv_buf_size_ptr);
void wasi_unstable_proc_exit(void *, Word);
void wasi_unstable_proc_exit(void *, Word);
Word wasi_unstable_clock_time_get(void *, Word, uint64_t, Word);
Word pthread_equal(void *, Word left, Word right);

// Support for embedders, not exported to Wasm.
Expand Down
6 changes: 4 additions & 2 deletions include/proxy-wasm/wasm_vm.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#include <functional>
#include <memory>
#include <string>
#include <optional>
#include <string>

#include "include/proxy-wasm/word.h"

Expand Down Expand Up @@ -78,6 +78,7 @@ template <size_t N> using WasmCallbackWord = WasmFuncType<N, Word, void *, Word>
using WasmCallback_WWl = Word (*)(void *, Word, int64_t);
using WasmCallback_WWlWW = Word (*)(void *, Word, int64_t, Word, Word);
using WasmCallback_WWm = Word (*)(void *, Word, uint64_t);
using WasmCallback_WWmW = Word (*)(void *, Word, uint64_t, Word);
using WasmCallback_dd = double (*)(void *, double);

#define FOR_ALL_WASM_VM_IMPORTS(_f) \
Expand All @@ -94,7 +95,8 @@ using WasmCallback_dd = double (*)(void *, double);
_f(proxy_wasm::WasmCallback_WWl) \
_f(proxy_wasm::WasmCallback_WWlWW) \
_f(proxy_wasm::WasmCallback_WWm) \
_f(proxy_wasm::WasmCallback_dd)
_f(proxy_wasm::WasmCallback_WWmW) \
_f(proxy_wasm::WasmCallback_dd)

enum class Cloneable {
NotCloneable, // VMs can not be cloned and should be created from scratch.
Expand Down
16 changes: 16 additions & 0 deletions src/exports.cc
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,22 @@ Word wasi_unstable_args_sizes_get(void *raw_context, Word argc_ptr, Word argv_bu
return 0; // __WASI_ESUCCESS
}

// __wasi_errno_t __wasi_clock_time_get(uint32_t id, uint64_t precision, uint64_t* time);
Word wasi_unstable_clock_time_get(void *raw_context, Word clock_id, uint64_t precision,
Word result_time_uint64_ptr) {

if (clock_id != 0 /* realtime */) {
return 58; // __WASI_ENOTSUP
}

auto context = WASM_CONTEXT(raw_context);
uint64_t result = context->getCurrentTimeNanoseconds();
if (!context->wasm()->setDatatype(result_time_uint64_ptr, result)) {
return 21; // __WASI_EFAULT
}
return 0; // __WASI_ESUCCESS
}

// void __wasi_proc_exit(__wasi_exitcode_t rval);
void wasi_unstable_proc_exit(void *raw_context, Word) {
auto context = WASM_CONTEXT(raw_context);
Expand Down
1 change: 1 addition & 0 deletions src/wasm.cc
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ void WasmBase::registerCallbacks() {
_REGISTER_WASI(environ_sizes_get);
_REGISTER_WASI(args_get);
_REGISTER_WASI(args_sizes_get);
_REGISTER_WASI(clock_time_get);
_REGISTER_WASI(proc_exit);
#undef _REGISTER_WASI

Expand Down