Skip to content

Improve dispatch queue usage #69

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

Merged
AkihiroSuda merged 1 commit into from
Nov 20, 2024
Merged

Improve dispatch queue usage #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 19 additions & 18 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ struct conn {

struct state {
dispatch_semaphore_t sem;
dispatch_queue_t vms_queue;
dispatch_queue_t host_queue;
struct conn *conns; // TODO: avoid O(N) lookup
} _state;

Expand Down Expand Up @@ -252,16 +254,14 @@ static interface_ref start(struct state *state, struct cli_options *cliopt) {
cliopt->vmnet_nat66_prefix);
}

dispatch_queue_t q = dispatch_queue_create(
"io.github.lima-vm.socket_vmnet.start", DISPATCH_QUEUE_SERIAL);
dispatch_semaphore_t sem = dispatch_semaphore_create(0);

__block interface_ref iface;
__block vmnet_return_t status;

__block uint64_t max_bytes = 0;
iface = vmnet_start_interface(
dict, q, ^(vmnet_return_t x_status, xpc_object_t x_param) {
dict, state->host_queue, ^(vmnet_return_t x_status, xpc_object_t x_param) {
status = x_status;
if (x_status == VMNET_SUCCESS) {
print_vmnet_start_param(x_param);
Expand All @@ -271,17 +271,14 @@ static interface_ref start(struct state *state, struct cli_options *cliopt) {
dispatch_semaphore_signal(sem);
});
dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
dispatch_release(q);
xpc_release(dict);
if (status != VMNET_SUCCESS) {
ERRORF("vmnet_start_interface: [%d] %s", status, vmnet_strerror(status));
return NULL;
}

dispatch_queue_t event_q = dispatch_queue_create(
"io.github.lima-vm.socket_vmnet.events", DISPATCH_QUEUE_CONCURRENT);
vmnet_interface_set_event_callback(
iface, VMNET_INTERFACE_PACKETS_AVAILABLE, event_q,
iface, VMNET_INTERFACE_PACKETS_AVAILABLE, state->host_queue,
^(interface_event_t __attribute__((unused)) x_event_id,
xpc_object_t x_event) {
uint64_t estim_count = xpc_dictionary_get_uint64(
Expand All @@ -298,21 +295,17 @@ static void signalhandler(int signal) {
siglongjmp(jmpbuf, 1);
}

static void stop(interface_ref iface) {
static void stop(struct state *state, interface_ref iface) {
if (iface == NULL) {
return;
}
dispatch_queue_t q = dispatch_queue_create(
"io.github.lima-vm.socket_vmnet.stop", DISPATCH_QUEUE_SERIAL);
dispatch_semaphore_t sem = dispatch_semaphore_create(0);
__block vmnet_return_t status;
vmnet_stop_interface(iface, q, ^(vmnet_return_t x_status) {
vmnet_stop_interface(iface, state->host_queue, ^(vmnet_return_t x_status) {
status = x_status;
dispatch_semaphore_signal(sem);
});
dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
dispatch_release(q);
// TODO: release event_q ?
if (status != VMNET_SUCCESS) {
ERRORF("vmnet_stop_interface: [%d] %s", status, vmnet_strerror(status));
}
Expand Down Expand Up @@ -376,8 +369,6 @@ int main(int argc, char *argv[]) {
debug = getenv("DEBUG") != NULL;
int rc = 1, listen_fd = -1;
__block interface_ref iface = NULL;
dispatch_queue_t q = dispatch_queue_create(
"io.github.lima-vm.socket_vmnet.accept", DISPATCH_QUEUE_CONCURRENT);

struct cli_options *cliopt = cli_options_parse(argc, argv);
assert(cliopt != NULL);
Expand Down Expand Up @@ -420,6 +411,15 @@ int main(int argc, char *argv[]) {
struct state state;
memset(&state, 0, sizeof(state));
state.sem = dispatch_semaphore_create(1);

// Queue for vm connections, allowing processing vms requests in parallel.
state.vms_queue = dispatch_queue_create(
"io.github.lima-vm.socket_vmnet.vms", DISPATCH_QUEUE_CONCURRENT);

// Queue for processing vmnet events.
state.host_queue = dispatch_queue_create(
"io.github.lima-vm.socket_vmnet.host", DISPATCH_QUEUE_SERIAL);

iface = start(&state, cliopt);
if (iface == NULL) {
// Error already logged.
Expand All @@ -442,16 +442,15 @@ int main(int argc, char *argv[]) {
goto done;
}
struct state *state_p = &state;
dispatch_async(q, ^{
dispatch_async(state.vms_queue, ^{
on_accept(state_p, accept_fd, iface);
});
}
rc = 0;
done:
DEBUGF("shutting down with rc=%d", rc);
dispatch_release(q);
if (iface != NULL) {
stop(iface);
stop(&state, iface);
}
if (listen >= 0) {
close(listen_fd);
Expand All @@ -460,6 +459,8 @@ int main(int argc, char *argv[]) {
unlink(cliopt->pidfile);
close(pid_fd);
}
dispatch_release(state.vms_queue);
dispatch_release(state.host_queue);
cli_options_destroy(cliopt);
return rc;
}
Expand Down