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.

Sign up for GitHub

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

[runtime] fix polling and runtime values #85

Merged
merged 3 commits into from
Mar 15, 2023
Merged

[runtime] fix polling and runtime values #85

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
befe295
[runtime] fix polling return value
Littlefisher619 Mar 14, 2023
8e2e76c
[runtime] fix return value of examples
Littlefisher619 Mar 15, 2023
6a439c7
fix runtime print error
Littlefisher619 Mar 15, 2023
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
37 changes: 20 additions & 17 deletions runtime/cpp/src/wasm-bpf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ int bpf_buffer::bpf_buffer_sample(void* data, size_t size) {
// call the wasm callback handler
if (!wasm_runtime_call_indirect(callback_exec_env, wasm_sample_function, 3,
argv)) {
printf("call func1 failed\n");
return 0xDEAD;
printf("indirect call sample_function failed\n");
return -EINVAL;
}
return 0;
}
Expand Down Expand Up @@ -148,13 +148,15 @@ static int bpf_buffer_sample(void* ctx, void* data, size_t size) {

/// @brief create a bpf buffer based on the object map type
std::unique_ptr<bpf_buffer> bpf_buffer__new(struct bpf_map* events) {
bool use_ringbuf = bpf_map__type(events) == BPF_MAP_TYPE_RINGBUF;
if (use_ringbuf) {
return std::make_unique<ring_buffer_wrapper>(events);
} else {
return std::make_unique<perf_buffer_wrapper>(events);
bpf_map_type map_type = bpf_map__type(events);
switch (map_type) {
case BPF_MAP_TYPE_PERF_EVENT_ARRAY:
return std::make_unique<perf_buffer_wrapper>(events);
case BPF_MAP_TYPE_RINGBUF:
return std::make_unique<ring_buffer_wrapper>(events);
default:
return nullptr;
}
return nullptr;
}

/// Get the file descriptor of a map by name.
Expand Down Expand Up @@ -240,21 +242,23 @@ int wasm_bpf_program::bpf_buffer_poll(wasm_exec_env_t exec_env,
void* data,
size_t max_size,
int timeout_ms) {
int res;
if (buffer.get() == nullptr) {
// create buffer
auto map = this->map_ptr_by_fd(fd);
buffer = bpf_buffer__new(map);
buffer->bpf_buffer__open(fd, bpf_buffer_sample, buffer.get());
return 0;
if (!buffer) {
return -ENOMEM;
}
res = buffer->bpf_buffer__open(fd, bpf_buffer_sample, buffer.get());
if (res < 0) {
return res;
}
}
buffer->set_callback_params(exec_env, (uint32_t)sample_func, data, max_size,
ctx);
// poll the buffer
int res = buffer->bpf_buffer__poll(timeout_ms);
if (res < 0) {
return res;
}
return 0;
return buffer->bpf_buffer__poll(timeout_ms);
}

/// a wrapper function to call the bpf syscall
Expand Down Expand Up @@ -303,7 +307,6 @@ int bpf_map_operate(wasm_exec_env_t exec_env,
default: // More syscall commands can be allowed here
return -EINVAL;
}
return -EINVAL;
}

extern "C" {
Expand Down Expand Up @@ -333,7 +336,7 @@ int wasm_close_bpf_object(wasm_exec_env_t exec_env, uint64_t program) {
(bpf_program_manager*)wasm_runtime_get_user_data(exec_env);
if (!bpf_programs->count(program))
return 0;
return !bpf_programs->erase(program);
return bpf_programs->erase(program) > 0 ? 0 : -1;
}

int wasm_attach_bpf_program(wasm_exec_env_t exec_env,
Expand Down