Fix up benchmarks for new uSockets
This commit is contained in:
@@ -69,7 +69,7 @@ struct us_new_socket_t *on_http_socket_writable(struct us_new_socket_t *s) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/* Stream whatever is remaining of the request */
|
/* 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;
|
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));
|
//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 */
|
/* 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++;
|
responses++;
|
||||||
@@ -100,7 +100,7 @@ struct us_new_socket_t *on_http_socket_data(struct us_new_socket_t *s, char *dat
|
|||||||
return s;
|
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);
|
struct http_socket *http_socket = (struct http_socket *) us_new_socket_ext(SSL, s);
|
||||||
|
|
||||||
/* Reset offsets */
|
/* Reset offsets */
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ struct us_new_socket_t *on_http_socket_writable(struct us_new_socket_t *s) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/* Stream whatever is remaining of the request */
|
/* 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)) {
|
if (http_socket->offset == sizeof(web_socket_request)) {
|
||||||
/* Reset timeout if we managed to */
|
/* Reset timeout if we managed to */
|
||||||
us_new_socket_timeout(SSL, s, WEBSOCKET_PING_INTERVAL);
|
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;
|
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);
|
struct http_socket *http_socket = (struct http_socket *) us_new_socket_ext(SSL, s);
|
||||||
|
|
||||||
/* Display number of opened connections */
|
/* 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);
|
struct http_socket *http_socket = (struct http_socket *) us_new_socket_ext(SSL, s);
|
||||||
|
|
||||||
/* Send ping here */
|
/* 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)) {
|
if (http_socket->offset == sizeof(web_socket_request)) {
|
||||||
/* Reset timeout if we managed to */
|
/* Reset timeout if we managed to */
|
||||||
us_new_socket_timeout(SSL, s, WEBSOCKET_PING_INTERVAL);
|
us_new_socket_timeout(SSL, s, WEBSOCKET_PING_INTERVAL);
|
||||||
|
|||||||
Reference in New Issue
Block a user