From 9fb3580785a2ded855ddb809611450d82f174d94 Mon Sep 17 00:00:00 2001 From: Alex Hultman Date: Wed, 13 Mar 2019 17:05:56 +0100 Subject: [PATCH] Fix up benchmarks for new uSockets --- benchmarks/load_test.c | 6 +++--- benchmarks/scale_test.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/benchmarks/load_test.c b/benchmarks/load_test.c index cdef569..b7cc5aa 100644 --- a/benchmarks/load_test.c +++ b/benchmarks/load_test.c @@ -69,7 +69,7 @@ struct us_new_socket_t *on_http_socket_writable(struct us_new_socket_t *s) { } } else { /* Stream whatever is remaining of the request */ - http_socket->offset += us_new_socket_write(SSL, s, web_socket_request + http_socket->offset, sizeof(web_socket_request) - http_socket->offset, 0); + http_socket->offset += us_new_socket_write(SSL, s, (char *) web_socket_request + http_socket->offset, sizeof(web_socket_request) - http_socket->offset, 0); } return s; @@ -92,7 +92,7 @@ struct us_new_socket_t *on_http_socket_data(struct us_new_socket_t *s, char *dat //struct http_context *http_context = (struct http_context *) us_new_socket_context_ext(SSL, us_new_socket_context(SSL, s)); /* We treat all data events as a response */ - http_socket->offset = us_new_socket_write(SSL, s, web_socket_request, sizeof(web_socket_request), 0); + http_socket->offset = us_new_socket_write(SSL, s, (char *) web_socket_request, sizeof(web_socket_request), 0); /* */ responses++; @@ -100,7 +100,7 @@ struct us_new_socket_t *on_http_socket_data(struct us_new_socket_t *s, char *dat return s; } -struct us_new_socket_t *on_http_socket_open(struct us_new_socket_t *s, int is_client) { +struct us_new_socket_t *on_http_socket_open(struct us_new_socket_t *s, int is_client, char *ip, int ip_length) { struct http_socket *http_socket = (struct http_socket *) us_new_socket_ext(SSL, s); /* Reset offsets */ diff --git a/benchmarks/scale_test.c b/benchmarks/scale_test.c index 67dc0a3..36f9579 100644 --- a/benchmarks/scale_test.c +++ b/benchmarks/scale_test.c @@ -83,7 +83,7 @@ struct us_new_socket_t *on_http_socket_writable(struct us_new_socket_t *s) { } } else { /* Stream whatever is remaining of the request */ - http_socket->offset += us_new_socket_write(SSL, s, web_socket_request + http_socket->offset, sizeof(web_socket_request) - http_socket->offset, 0); + http_socket->offset += us_new_socket_write(SSL, s, (char *) web_socket_request + http_socket->offset, sizeof(web_socket_request) - http_socket->offset, 0); if (http_socket->offset == sizeof(web_socket_request)) { /* Reset timeout if we managed to */ us_new_socket_timeout(SSL, s, WEBSOCKET_PING_INTERVAL); @@ -112,7 +112,7 @@ struct us_new_socket_t *on_http_socket_data(struct us_new_socket_t *s, char *dat return s; } -struct us_new_socket_t *on_http_socket_open(struct us_new_socket_t *s, int is_client) { +struct us_new_socket_t *on_http_socket_open(struct us_new_socket_t *s, int is_client, char *ip, int ip_length) { struct http_socket *http_socket = (struct http_socket *) us_new_socket_ext(SSL, s); /* Display number of opened connections */ @@ -138,7 +138,7 @@ struct us_new_socket_t *on_http_socket_timeout(struct us_new_socket_t *s) { struct http_socket *http_socket = (struct http_socket *) us_new_socket_ext(SSL, s); /* Send ping here */ - http_socket->offset = us_new_socket_write(SSL, s, web_socket_request, sizeof(web_socket_request), 0); + http_socket->offset = us_new_socket_write(SSL, s, (char *) web_socket_request, sizeof(web_socket_request), 0); if (http_socket->offset == sizeof(web_socket_request)) { /* Reset timeout if we managed to */ us_new_socket_timeout(SSL, s, WEBSOCKET_PING_INTERVAL);