From 2ceede804ab8275f1f67f8945fec6404bc345977 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Tue, 14 Jul 2020 17:12:19 -0400 Subject: [PATCH] chore: revert sandbox alloc API --- runtime/include/sandbox.h | 11 +++---- runtime/src/local_runqueue_list.c | 5 +-- runtime/src/local_runqueue_minheap.c | 9 +++--- runtime/src/sandbox.c | 48 +++++++++++++--------------- 4 files changed, 35 insertions(+), 38 deletions(-) diff --git a/runtime/include/sandbox.h b/runtime/include/sandbox.h index 7c7a949..25cb029 100644 --- a/runtime/include/sandbox.h +++ b/runtime/include/sandbox.h @@ -92,13 +92,10 @@ extern void worker_thread_wakeup_sandbox(struct sandbox *sandbox); * Public API * **************************/ -int sandbox_allocate(struct sandbox **sandbox, struct sandbox_request *sandbox_request); -#define SANDBOX_ALLOCATE_OK 0 -#define SANDBOX_ALLOCATE_ERR -1 - -void sandbox_free(struct sandbox *sandbox); -void sandbox_main(struct sandbox *sandbox); -int sandbox_parse_http_request(struct sandbox *sandbox, size_t length); +struct sandbox *sandbox_allocate(struct sandbox_request *sandbox_request); +void sandbox_free(struct sandbox *sandbox); +void sandbox_main(struct sandbox *sandbox); +int sandbox_parse_http_request(struct sandbox *sandbox, size_t length); /** * Given a sandbox, returns the module that sandbox is executing diff --git a/runtime/src/local_runqueue_list.c b/runtime/src/local_runqueue_list.c index 6249804..888367d 100644 --- a/runtime/src/local_runqueue_list.c +++ b/runtime/src/local_runqueue_list.c @@ -49,8 +49,9 @@ local_runqueue_list_get_next() if (local_runqueue_is_empty()) { if (global_request_scheduler_remove(&sandbox_request) != GLOBAL_REQUEST_SCHEDULER_REMOVE_OK) goto err; - struct sandbox *sandbox; - if (sandbox_allocate(&sandbox, sandbox_request) == SANDBOX_ALLOCATE_ERR) goto sandbox_allocate_err; + struct sandbox *sandbox = sandbox_allocate(sandbox_request); + if (!sandbox) goto sandbox_allocate_err; + sandbox->state = SANDBOX_RUNNABLE; local_runqueue_add(sandbox); diff --git a/runtime/src/local_runqueue_minheap.c b/runtime/src/local_runqueue_minheap.c index 15cbcbb..014910b 100644 --- a/runtime/src/local_runqueue_minheap.c +++ b/runtime/src/local_runqueue_minheap.c @@ -90,7 +90,8 @@ local_runqueue_minheap_get_next() if (global_request_scheduler_remove(&sandbox_request) != GLOBAL_REQUEST_SCHEDULER_REMOVE_OK) goto err; /* Try to allocate a sandbox, returning the request on failure */ - if (sandbox_allocate(&sandbox, sandbox_request) == SANDBOX_ALLOCATE_ERR) goto sandbox_allocate_err; + sandbox = sandbox_allocate(sandbox_request); + if (!sandbox) goto sandbox_allocate_err; sandbox->state = SANDBOX_RUNNABLE; local_runqueue_minheap_add(sandbox); @@ -149,10 +150,10 @@ local_runqueue_minheap_preempt(ucontext_t *user_context) debuglog("Thread %lu Preempted %lu for %lu\n", pthread_self(), local_deadline, sandbox_request->absolute_deadline); + /* Allocate the request */ - struct sandbox *next_sandbox; - /* If sandbox allocation fails, add the request back and exit*/ - if (sandbox_allocate(&next_sandbox, sandbox_request) == -1) goto err_sandbox_allocate; + struct sandbox *next_sandbox = sandbox_allocate(sandbox_request); + if (!next_sandbox) goto err_sandbox_allocate; /* Set as runnable and add it to the runqueue */ next_sandbox->state = SANDBOX_RUNNABLE; diff --git a/runtime/src/sandbox.c b/runtime/src/sandbox.c index 06bc4bc..f8614e5 100644 --- a/runtime/src/sandbox.c +++ b/runtime/src/sandbox.c @@ -381,72 +381,70 @@ err_stack_allocation_failed: } /** - * Allocates a new sandbox from a sandbox request, freeing the sandbox request on success - * @param sandbox pointer to destination pointer to set to newly allocated sandbox + * Allocates a new sandbox from a sandbox request + * Frees the sandbox request on success * @param sandbox_request request being allocated - * @returns 0 on success, -1 on error + * @returns sandbox * on success, NULL on error */ -int -sandbox_allocate(struct sandbox **sandbox, struct sandbox_request *sandbox_request) +struct sandbox * +sandbox_allocate(struct sandbox_request *sandbox_request) { /* Assumption: Caller has disabled software interrupts */ assert(!software_interrupt_is_enabled()); /* Validate Arguments */ - assert(sandbox != NULL); assert(sandbox_request != NULL); module_validate(sandbox_request->module); - char *error_message = ""; - int rc; + struct sandbox *new_sandbox; + char * error_message = ""; /* Allocate Sandbox control structures, buffers, and linear memory in a 4GB address space */ - *sandbox = (struct sandbox *)sandbox_allocate_memory(sandbox_request->module); - if (!sandbox) { + new_sandbox = sandbox_allocate_memory(sandbox_request->module); + if (!new_sandbox) { error_message = "failed to allocate sandbox heap and linear memory"; goto err_memory_allocation_failed; } /* Set state to initializing */ - (*sandbox)->state = SANDBOX_INITIALIZING; + new_sandbox->state = SANDBOX_INITIALIZING; /* Allocate the Stack */ - if (sandbox_allocate_stack(*sandbox) == -1) { + if (sandbox_allocate_stack(new_sandbox) == -1) { error_message = "failed to allocate sandbox heap and linear memory"; goto err_stack_allocation_failed; } /* Copy the socket descriptor, address, and arguments of the client invocation */ - (*sandbox)->absolute_deadline = sandbox_request->absolute_deadline; - (*sandbox)->arguments = (void *)sandbox_request->arguments; - (*sandbox)->client_socket_descriptor = sandbox_request->socket_descriptor; - (*sandbox)->request_arrival_timestamp = sandbox_request->request_arrival_timestamp; + new_sandbox->absolute_deadline = sandbox_request->absolute_deadline; + new_sandbox->arguments = (void *)sandbox_request->arguments; + new_sandbox->client_socket_descriptor = sandbox_request->socket_descriptor; + new_sandbox->request_arrival_timestamp = sandbox_request->request_arrival_timestamp; /* Initialize the sandbox's context, stack, and instruction pointer */ - arch_context_init(&(*sandbox)->ctxt, (reg_t)current_sandbox_main, - (reg_t)((*sandbox)->stack_start + (*sandbox)->stack_size)); + arch_context_init(&new_sandbox->ctxt, (reg_t)current_sandbox_main, + (reg_t)(new_sandbox->stack_start + new_sandbox->stack_size)); /* TODO: What does it mean if there isn't a socket_address? Shouldn't this be a hard requirement? It seems that only the socket descriptor is used to send response */ const struct sockaddr *socket_address = sandbox_request->socket_address; - if (socket_address) memcpy(&(*sandbox)->client_address, socket_address, sizeof(struct sockaddr)); + if (socket_address) memcpy(&new_sandbox->client_address, socket_address, sizeof(struct sockaddr)); /* Initialize file descriptors to -1 */ - for (int i = 0; i < SANDBOX_MAX_IO_HANDLE_COUNT; i++) (*sandbox)->io_handles[i].file_descriptor = -1; + for (int i = 0; i < SANDBOX_MAX_IO_HANDLE_COUNT; i++) new_sandbox->io_handles[i].file_descriptor = -1; /* Initialize Parsec control structures (used by Completion Queue) */ - ps_list_init_d(*sandbox); + ps_list_init_d(new_sandbox); free(sandbox_request); - rc = 0; done: - return rc; + return new_sandbox; err_stack_allocation_failed: - sandbox_free(*sandbox); + sandbox_free(new_sandbox); err_memory_allocation_failed: err: perror(error_message); - rc = -1; + new_sandbox = NULL; goto done; }