lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Reduce client_ctx_t footprint

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-01-02 15:20:02 +01:00
parent 555e8f62a1
commit 6ff6f0c73b
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/worker/func.h
View File

@ -21,7 +21,7 @@ typedef struct {
unsigned char in_use: 1, s_keep_alive:1, c_keep_alive:1; unsigned char in_use: 1, s_keep_alive:1, c_keep_alive:1;
char cc[3], host[256]; char cc[3], host[256];
char req_host[256], err_msg[256]; char req_host[256], err_msg[256];
char log_prefix[512]; char log_prefix[128];
char _c_addr[INET6_ADDRSTRLEN + 1], _s_addr[INET6_ADDRSTRLEN + 1]; char _c_addr[INET6_ADDRSTRLEN + 1], _s_addr[INET6_ADDRSTRLEN + 1];
long cnx_s, cnx_e, req_s, res_ts, req_e; long cnx_s, cnx_e, req_s, res_ts, req_e;
http_req req; http_req req;
@ -33,7 +33,7 @@ typedef struct {
host_config_t *conf; host_config_t *conf;
FILE *file; FILE *file;
long content_length; long content_length;
char msg_buf[8192], msg_content[1024]; char *msg_buf, *msg_buf_ptr, msg_content[1024];
proxy_ctx_t *proxy; proxy_ctx_t *proxy;
} client_ctx_t; } client_ctx_t;

6
src/worker/local_handler.c
View File

@ -47,10 +47,12 @@ static int local_handler(client_ctx_t *ctx) {
res->status = http_get_status(200); res->status = http_get_status(200);
http_add_header_field(&res->hdr, "Content-Type", "message/http"); http_add_header_field(&res->hdr, "Content-Type", "message/http");
ctx->content_length = snprintf(ctx->msg_buf, sizeof(ctx->msg_buf) - ctx->content_length, "%s %s HTTP/%s\r\n", req->method, req->uri, req->version); ctx->msg_buf_ptr = malloc(4096);
ctx->msg_buf = ctx->msg_buf_ptr;
ctx->content_length = snprintf(ctx->msg_buf, 4096 - ctx->content_length, "%s %s HTTP/%s\r\n", req->method, req->uri, req->version);
for (int i = 0; i < req->hdr.field_num; i++) { for (int i = 0; i < req->hdr.field_num; i++) {
const http_field *f = &req->hdr.fields[i]; const http_field *f = &req->hdr.fields[i];
ctx->content_length += snprintf(ctx->msg_buf + ctx->content_length, sizeof(ctx->msg_buf) - ctx->content_length, "%s: %s\r\n", http_field_get_name(f), http_field_get_value(f)); ctx->content_length += snprintf(ctx->msg_buf + ctx->content_length, 4096 - ctx->content_length, "%s: %s\r\n", http_field_get_name(f), http_field_get_value(f));
} }
return 0; return 0;

14
src/worker/request_handler.c
View File

@ -57,7 +57,8 @@ static int request_handler(client_ctx_t *ctx) {
ctx->use_proxy = 0; ctx->use_proxy = 0;
ctx->proxy = NULL; ctx->proxy = NULL;
ctx->msg_content[0] = 0; ctx->msg_content[0] = 0;
ctx->msg_buf[0] = 0; ctx->msg_buf = NULL;
ctx->msg_buf_ptr = NULL;
ctx->req_host[0] = 0; ctx->req_host[0] = 0;
ctx->err_msg[0] = 0; ctx->err_msg[0] = 0;
@ -130,7 +131,7 @@ static int request_handler(client_ctx_t *ctx) {
info(BLD_STR "%s %s", req->method, req->uri); info(BLD_STR "%s %s", req->method, req->uri);
if (strcmp(req->uri, "/.sesimos/style.css") == 0 && (strcmp(req->method, "GET") == 0 || strcmp(req->method, "HEAD") == 0)) { if (strcmp(req->uri, "/.sesimos/style.css") == 0 && (strcmp(req->method, "GET") == 0 || strcmp(req->method, "HEAD") == 0)) {
memcpy(ctx->msg_buf, http_style_doc, http_style_doc_size); ctx->msg_buf = (char *) http_style_doc;
ctx->content_length = http_style_doc_size; ctx->content_length = http_style_doc_size;
res->status= http_get_status(200); res->status= http_get_status(200);
http_add_header_field(&res->hdr, "Content-Type", "text/css; charset=UTF-8"); http_add_header_field(&res->hdr, "Content-Type", "text/css; charset=UTF-8");
@ -226,7 +227,7 @@ int respond(client_ctx_t *ctx) {
if (http_get_header_field(&res->hdr, "Accept-Ranges") == NULL) { if (http_get_header_field(&res->hdr, "Accept-Ranges") == NULL) {
http_add_header_field(&res->hdr, "Accept-Ranges", "none"); http_add_header_field(&res->hdr, "Accept-Ranges", "none");
} }
if (!ctx->use_fastcgi && ctx->file == NULL && ctx->msg_buf[0] == 0) { if (!ctx->use_fastcgi && ctx->file == NULL && ctx->msg_buf == NULL) {
http_remove_header_field(&res->hdr, "Date", HTTP_REMOVE_ALL); http_remove_header_field(&res->hdr, "Date", HTTP_REMOVE_ALL);
http_remove_header_field(&res->hdr, "Server", HTTP_REMOVE_ALL); http_remove_header_field(&res->hdr, "Server", HTTP_REMOVE_ALL);
http_remove_header_field(&res->hdr, "Cache-Control", HTTP_REMOVE_ALL); http_remove_header_field(&res->hdr, "Cache-Control", HTTP_REMOVE_ALL);
@ -276,9 +277,11 @@ int respond(client_ctx_t *ctx) {
proxy_doc = msg_pre_buf_2; proxy_doc = msg_pre_buf_2;
} }
ctx->msg_buf_ptr = malloc(4096);
ctx->msg_buf = ctx->msg_buf_ptr;
snprintf(msg_pre_buf_1, sizeof(msg_pre_buf_1), http_info->doc, snprintf(msg_pre_buf_1, sizeof(msg_pre_buf_1), http_info->doc,
res->status->code, res->status->msg, http_msg != NULL ? http_msg->msg : "", err_msg[0] != 0 ? err_msg : ""); res->status->code, res->status->msg, http_msg != NULL ? http_msg->msg : "", err_msg[0] != 0 ? err_msg : "");
ctx->content_length = snprintf(ctx->msg_buf, sizeof(ctx->msg_buf), http_default_doc, res->status->code, ctx->content_length = snprintf(ctx->msg_buf, 4096, http_default_doc, res->status->code,
res->status->msg, msg_pre_buf_1, http_info->mode, http_info->icon, http_info->color, ctx->req_host, res->status->msg, msg_pre_buf_1, http_info->mode, http_info->icon, http_info->color, ctx->req_host,
proxy_doc, ctx->msg_content[0] != 0 ? ctx->msg_content : "", SERVER_STR_HTML); proxy_doc, ctx->msg_content[0] != 0 ? ctx->msg_content : "", SERVER_STR_HTML);
} }
@ -328,7 +331,7 @@ int respond(client_ctx_t *ctx) {
// default response // default response
unsigned long snd_len = 0; unsigned long snd_len = 0;
unsigned long len; unsigned long len;
if (ctx->msg_buf[0] != 0) { if (ctx->msg_buf != NULL) {
ret = sock_send(client, ctx->msg_buf, ctx->content_length, 0); ret = sock_send(client, ctx->msg_buf, ctx->content_length, 0);
if (ret <= 0) { if (ret <= 0) {
error("Unable to send: %s", sock_strerror(client)); error("Unable to send: %s", sock_strerror(client));
@ -372,6 +375,7 @@ void request_complete(client_ctx_t *ctx) {
ctx->req_e = clock_micros(); ctx->req_e = clock_micros();
info("Transfer complete: %s", format_duration(ctx->req_e - ctx->req_s, buf)); info("Transfer complete: %s", format_duration(ctx->req_e - ctx->req_s, buf));
free(ctx->msg_buf_ptr);
uri_free(&ctx->uri); uri_free(&ctx->uri);
http_free_req(&ctx->req); http_free_req(&ctx->req);
http_free_res(&ctx->res); http_free_res(&ctx->res);