nijinlong1
/
sledge-serverles-framwork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Allocate http_session on listener

Browse Source
master
Sean McBride 3 years ago
parent 80b4d0e99c
commit 160b38e4dd
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File

4
runtime/include/sandbox_functions.h
Unescape View File

@ -11,8 +11,8 @@
* Public API *
**************************/
struct sandbox *sandbox_alloc(struct module *module, int socket_descriptor, const struct sockaddr *socket_address,
uint64_t request_arrival_timestamp, uint64_t admissions_estimate);
struct sandbox *sandbox_alloc(struct module *module, struct http_session *session, uint64_t request_arrival_timestamp,
uint64_t admissions_estimate);
int sandbox_prepare_execution_environment(struct sandbox *sandbox);
void sandbox_free(struct sandbox *sandbox);
void sandbox_main(struct sandbox *sandbox);

12
runtime/src/listener_thread.c
Unescape View File

@ -163,6 +163,13 @@ listener_thread_main(void *dummy)
http_total_increment_request();
/* Allocate HTTP Session */
struct http_session *session =
http_session_alloc(module->max_request_size, module->max_response_size, client_socket,
(const struct sockaddr *)&client_address);
/* TODO: Read HTTP request */
/*
* Perform admissions control.
* If 0, workload was rejected, so close with 429 "Too Many Requests" and continue
@ -179,9 +186,8 @@ listener_thread_main(void *dummy)
}
/* Allocate a Sandbox */
struct sandbox *sandbox = sandbox_alloc(module, client_socket,
(const struct sockaddr *)&client_address,
request_arrival_timestamp, work_admitted);
struct sandbox *sandbox = sandbox_alloc(module, session, request_arrival_timestamp,
work_admitted);
if (unlikely(sandbox == NULL)) {
http_session_send_err_oneshot(sandbox->http, 503);
http_session_close(sandbox->http);

16
runtime/src/sandbox.c
Unescape View File

@ -132,8 +132,8 @@ err_http_allocation_failed:
}
void
sandbox_init(struct sandbox *sandbox, struct module *module, int socket_descriptor,
const struct sockaddr *socket_address, uint64_t request_arrival_timestamp, uint64_t admissions_estimate)
sandbox_init(struct sandbox *sandbox, struct module *module, struct http_session *session,
uint64_t request_arrival_timestamp, uint64_t admissions_estimate)
{
/* Sets the ID to the value before the increment */
sandbox->id = sandbox_total_postfix_increment();
@ -144,9 +144,8 @@ sandbox_init(struct sandbox *sandbox, struct module *module, int socket_descript
ps_list_init_d(sandbox);
/* Allocate HTTP session structure */
sandbox->http = http_session_alloc(sandbox->module->max_request_size, sandbox->module->max_response_size,
socket_descriptor, socket_address);
assert(sandbox->http);
assert(session);
sandbox->http = session;
sandbox->timestamp_of.request_arrival = request_arrival_timestamp;
sandbox->absolute_deadline = request_arrival_timestamp + module->relative_deadline;
@ -172,8 +171,8 @@ sandbox_init(struct sandbox *sandbox, struct module *module, int socket_descript
* @return the new sandbox request
*/
struct sandbox *
sandbox_alloc(struct module *module, int socket_descriptor, const struct sockaddr *socket_address,
uint64_t request_arrival_timestamp, uint64_t admissions_estimate)
sandbox_alloc(struct module *module, struct http_session *session, uint64_t request_arrival_timestamp,
uint64_t admissions_estimate)
{
struct sandbox *sandbox = NULL;
size_t page_aligned_sandbox_size = round_up_to_page(sizeof(struct sandbox));
@ -182,8 +181,7 @@ sandbox_alloc(struct module *module, int socket_descriptor, const struct sockadd
if (unlikely(sandbox == NULL)) return NULL;
sandbox_set_as_allocated(sandbox);
sandbox_init(sandbox, module, socket_descriptor, socket_address, request_arrival_timestamp,
admissions_estimate);
sandbox_init(sandbox, module, session, request_arrival_timestamp, admissions_estimate);
return sandbox;

Write Preview
Loading…
Cancel
Save