From 5c8788572233d56333f69391d62a1bef090aa8c0 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Tue, 14 Jul 2020 13:49:46 -0400 Subject: [PATCH] chore: rename request_arrival_timestamp --- runtime/include/sandbox.h | 2 +- runtime/include/sandbox_request.h | 20 ++++++++++---------- runtime/src/local_runqueue_minheap.c | 2 +- runtime/src/runtime.c | 4 ++-- runtime/src/sandbox.c | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/runtime/include/sandbox.h b/runtime/include/sandbox.h index 7f66d84..e263155 100644 --- a/runtime/include/sandbox.h +++ b/runtime/include/sandbox.h @@ -44,7 +44,7 @@ struct sandbox { struct arch_context ctxt; /* register context for context switch. */ - uint64_t request_timestamp; + uint64_t request_arrival_timestamp; uint64_t absolute_deadline; uint64_t total_time; diff --git a/runtime/include/sandbox_request.h b/runtime/include/sandbox_request.h index 16ad890..6f22f17 100644 --- a/runtime/include/sandbox_request.h +++ b/runtime/include/sandbox_request.h @@ -14,8 +14,8 @@ struct sandbox_request { char * arguments; int socket_descriptor; struct sockaddr *socket_address; - uint64_t request_timestamp; /* cycles */ - uint64_t absolute_deadline; /* cycles */ + uint64_t request_arrival_timestamp; /* cycles */ + uint64_t absolute_deadline; /* cycles */ }; DEQUE_PROTOTYPE(sandbox, struct sandbox_request *); @@ -26,21 +26,21 @@ DEQUE_PROTOTYPE(sandbox, struct sandbox_request *); * @param arguments the arguments that we'll pass to the serverless function * @param socket_descriptor * @param socket_address - * @param request_timestamp the timestamp of when we receives the request from the network (in cycles) + * @param request_arrival_timestamp the timestamp of when we receives the request from the network (in cycles) * @return the new sandbox request */ static inline struct sandbox_request * sandbox_request_allocate(struct module *module, char *arguments, int socket_descriptor, - const struct sockaddr *socket_address, uint64_t request_timestamp) + const struct sockaddr *socket_address, uint64_t request_arrival_timestamp) { struct sandbox_request *sandbox_request = (struct sandbox_request *)malloc(sizeof(struct sandbox_request)); assert(sandbox_request); - sandbox_request->module = module; - sandbox_request->arguments = arguments; - sandbox_request->socket_descriptor = socket_descriptor; - sandbox_request->socket_address = (struct sockaddr *)socket_address; - sandbox_request->request_timestamp = request_timestamp; - sandbox_request->absolute_deadline = request_timestamp + sandbox_request->module = module; + sandbox_request->arguments = arguments; + sandbox_request->socket_descriptor = socket_descriptor; + sandbox_request->socket_address = (struct sockaddr *)socket_address; + sandbox_request->request_arrival_timestamp = request_arrival_timestamp; + sandbox_request->absolute_deadline = request_arrival_timestamp + module->relative_deadline_us * runtime_processor_speed_MHz; debuglog("[%p: %s]\n", sandbox_request, sandbox_request->module->name); diff --git a/runtime/src/local_runqueue_minheap.c b/runtime/src/local_runqueue_minheap.c index f05b988..d614e74 100644 --- a/runtime/src/local_runqueue_minheap.c +++ b/runtime/src/local_runqueue_minheap.c @@ -55,7 +55,7 @@ local_runqueue_minheap_delete(struct sandbox *sandbox) int rc = priority_queue_delete(&local_runqueue_minheap, sandbox); if (rc == -1) { panic("Err: Thread Local %lu tried to delete sandbox %lu from runqueue, but was not present\n", - pthread_self(), sandbox->request_timestamp); + pthread_self(), sandbox->request_arrival_timestamp); } } diff --git a/runtime/src/runtime.c b/runtime/src/runtime.c index 87fd3ee..30105ec 100644 --- a/runtime/src/runtime.c +++ b/runtime/src/runtime.c @@ -74,7 +74,7 @@ listener_thread_main(void *dummy) LISTENER_THREAD_MAX_EPOLL_EVENTS, -1); /* Capture Start Time to calculate absolute deadline */ - uint64_t request_timestamp = __getcycles(); + uint64_t request_arrival_timestamp = __getcycles(); for (int i = 0; i < request_count; i++) { if (epoll_events[i].events & EPOLLERR) { perror("epoll_wait"); @@ -97,7 +97,7 @@ listener_thread_main(void *dummy) /* Allocate a Sandbox Request */ struct sandbox_request *sandbox_request = sandbox_request_allocate(module, module->name, socket_descriptor, - (const struct sockaddr *)&client_address, request_timestamp); + (const struct sockaddr *)&client_address, request_arrival_timestamp); assert(sandbox_request); /* Add to the Global Sandbox Request Scheduler */ diff --git a/runtime/src/sandbox.c b/runtime/src/sandbox.c index 69028be..96ce195 100644 --- a/runtime/src/sandbox.c +++ b/runtime/src/sandbox.c @@ -151,7 +151,7 @@ sandbox_build_and_send_client_response(struct sandbox *sandbox) done: assert(sndsz == sandbox->request_response_data_length); uint64_t end_time = __getcycles(); - sandbox->total_time = end_time - sandbox->request_timestamp; + sandbox->total_time = end_time - sandbox->request_arrival_timestamp; uint64_t total_time_us = sandbox->total_time / runtime_processor_speed_MHz; debuglog("%s():%d, %u, %lu\n", sandbox->module->name, sandbox->module->port, @@ -409,10 +409,10 @@ sandbox_allocate(struct sandbox_request *sandbox_request) } /* 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_timestamp = sandbox_request->request_timestamp; + 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; /* Initialize the sandbox's context, stack, and instruction pointer */ arch_context_init(&sandbox->ctxt, (reg_t)current_sandbox_main,