Skip to content

Commit

Permalink
adding some modifications to test/test_client.c and tests/test_server…
Browse files Browse the repository at this point in the history 
….c to avoid misunderstanding (#375)

Co-authored-by: tang <[email protected]>
  • Loading branch information
@tang-mouren
tang-mouren and tang authored Nov 20, 2023
1 parent 98301eb commit 3721d48
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
42 changes: 21 additions & 21 deletions tests/test_client.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ typedef struct user_stream_s {
size_t recv_body_len;
FILE *recv_body_fp;
int recv_fin;
xqc_msec_t start_time;
xqc_msec_t first_frame_time; /* first frame download time */
xqc_msec_t last_read_time;
xqc_usec_t start_time;
xqc_usec_t first_frame_time; /* first frame download time */
xqc_usec_t last_read_time;
int abnormal_count;
int body_read_notify_cnt;
xqc_msec_t last_recv_log_time;
xqc_usec_t last_recv_log_time;
uint64_t recv_log_bytes;

xqc_h3_ext_bytestream_t *h3_ext_bs;
Expand Down Expand Up @@ -745,7 +745,7 @@ static void xqc_client_timeout_multi_process_callback(int fd, short what, void *


void
xqc_client_set_event_timer(xqc_msec_t wake_after, void *user_data)
xqc_client_set_event_timer(xqc_usec_t wake_after, void *user_data)
{
client_ctx_t *ctx = (client_ctx_t *) user_data;
//printf("xqc_engine_wakeup_after %llu us, now %llu\n", wake_after, now());
Expand Down Expand Up @@ -2079,7 +2079,7 @@ xqc_client_stream_read_notify(xqc_stream_t *stream, void *user_data)
user_stream->recv_body_len += read;
user_stream->recv_log_bytes += read;

xqc_msec_t curr_time = now();
xqc_usec_t curr_time = now();
if ((curr_time - user_stream->last_recv_log_time) >= 200000) {
printf("[qperf]|ts:%"PRIu64"|recv_size:%"PRIu64"|\n", curr_time, user_stream->recv_log_bytes);
user_stream->last_recv_log_time = curr_time;
Expand All @@ -2098,7 +2098,7 @@ xqc_client_stream_read_notify(xqc_stream_t *stream, void *user_data)

/* test abnormal rate */
if (g_test_case == 14) {
xqc_msec_t tmp = now();
xqc_usec_t tmp = now();
if (tmp - user_stream->last_read_time > 150*1000 && user_stream->last_read_time != 0 ) {
user_stream->abnormal_count++;
printf("\033[33m!!!!!!!!!!!!!!!!!!!!abnormal!!!!!!!!!!!!!!!!!!!!!!!!\033[0m\n");
Expand All @@ -2108,15 +2108,15 @@ xqc_client_stream_read_notify(xqc_stream_t *stream, void *user_data)

if (fin) {
user_stream->recv_fin = 1;
xqc_msec_t now_us = now();
printf("\033[33m>>>>>>>> request time cost:%"PRIu64" us, speed:%"PRIu64" K/s \n"
xqc_usec_t now_us = now();
printf("\033[33m>>>>>>>> request time cost:%"PRIu64" us, speed:%"PRIu64" Kbit/s \n"
">>>>>>>> send_body_size:%zu, recv_body_size:%zu \033[0m\n",
now_us - user_stream->start_time,
(user_stream->send_body_len + user_stream->recv_body_len)*1000/(now_us - user_stream->start_time),
(user_stream->send_body_len + user_stream->recv_body_len)*8000/(now_us - user_stream->start_time),
user_stream->send_body_len, user_stream->recv_body_len);

printf("test_result_speed: %"PRIu64" K/s\n",
(user_stream->send_body_len + user_stream->recv_body_len)*1000/(now_us - user_stream->start_time));
printf("test_result_speed: %"PRIu64" Kbit/s\n",
(user_stream->send_body_len + user_stream->recv_body_len)*8000/(now_us - user_stream->start_time));

printf("[rr_benchmark]|request_time:%"PRIu64"|"
"request_size:%zu|response_size:%zu|\n",
Expand Down Expand Up @@ -2161,7 +2161,7 @@ xqc_client_stream_close_notify(xqc_stream_t *stream, void *user_data)
/* test first frame rendering time */
if (g_test_case == 14) {
printf("first_frame_time: %"PRIu64", start_time: %"PRIu64"\n", user_stream->first_frame_time, user_stream->start_time);
xqc_msec_t t = user_stream->first_frame_time - user_stream->start_time + 200000 /* server-side time consumption */;
xqc_usec_t t = user_stream->first_frame_time - user_stream->start_time + 200000 /* server-side time consumption */;
printf("\033[33m>>>>>>>> first_frame pass:%d time:%"PRIu64"\033[0m\n", t <= 1000000 ? 1 : 0, t);
}

Expand Down Expand Up @@ -2905,13 +2905,13 @@ xqc_client_request_read_notify(xqc_h3_request_t *h3_request, xqc_request_notify_
user_stream->recv_fin = 1;
xqc_request_stats_t stats;
stats = xqc_h3_request_get_stats(h3_request);
xqc_msec_t now_us = now();
printf("\033[33m>>>>>>>> request time cost:%"PRIu64" us, speed:%"PRIu64" K/s \n"
xqc_usec_t now_us = now();
printf("\033[33m>>>>>>>> request time cost:%"PRIu64" us, speed:%"PRIu64" Kbit/s \n"
">>>>>>>> send_body_size:%zu, recv_body_size:%zu \033[0m\n",
now_us - user_stream->start_time,
(stats.send_body_size + stats.recv_body_size)*1000/(now_us - user_stream->start_time),
(stats.send_body_size + stats.recv_body_size)*8000/(now_us - user_stream->start_time),
stats.send_body_size, stats.recv_body_size);
printf("test_result_speed: %"PRIu64" K/s. request_cnt: %d.\n", (stats.send_body_size + stats.recv_body_size)*1000/(now_us - user_stream->start_time), g_req_cnt);
printf("test_result_speed: %"PRIu64" Kbit/s. request_cnt: %d.\n", (stats.send_body_size + stats.recv_body_size)*8000/(now_us - user_stream->start_time), g_req_cnt);

printf("[rr_benchmark]|request_time:%"PRIu64"|"
"request_size:%zu|response_size:%zu|\n",
Expand Down Expand Up @@ -3098,12 +3098,12 @@ xqc_client_socket_read_handler(user_conn_t *user_conn, int fd)
ret = xqc_engine_packet_process(p_ctx->engine, iovecs[i].iov_base, msgs[i].msg_len,
user_conn->local_addr, user_conn->local_addrlen,
user_conn->peer_addr, user_conn->peer_addrlen,
(xqc_msec_t)recv_time, user_conn);
(xqc_usec_t)recv_time, user_conn);
#else
ret = xqc_engine_packet_process(p_ctx->engine, iovecs[i].iov_base, msgs[i].msg_len,
user_conn->local_addr, user_conn->local_addrlen,
user_conn->peer_addr, user_conn->peer_addrlen,
path_id, (xqc_msec_t)recv_time, user_conn);
path_id, (xqc_usec_t)recv_time, user_conn);
#endif
if (ret != XQC_OK)
{
Expand Down Expand Up @@ -3196,12 +3196,12 @@ xqc_client_socket_read_handler(user_conn_t *user_conn, int fd)
ret = xqc_engine_packet_process(p_ctx->engine, packet_buf, recv_size,
user_conn->local_addr, user_conn->local_addrlen,
user_conn->peer_addr, user_conn->peer_addrlen,
(xqc_msec_t)recv_time, user_conn);
(xqc_usec_t)recv_time, user_conn);
#else
ret = xqc_engine_packet_process(p_ctx->engine, packet_buf, recv_size,
user_conn->local_addr, user_conn->local_addrlen,
user_conn->peer_addr, user_conn->peer_addrlen,
path_id, (xqc_msec_t)recv_time, user_conn);
path_id, (xqc_usec_t)recv_time, user_conn);
#endif
if (ret != XQC_OK) {
printf("xqc_client_read_handler: packet process err, ret: %d\n", ret);
Expand Down
10 changes: 5 additions & 5 deletions tests/test_server.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ xqc_server_h3_ext_datagram_lost_callback(xqc_h3_conn_t *conn, uint64_t dgram_id,
}

void
xqc_server_set_event_timer(xqc_msec_t wake_after, void *user_data)
xqc_server_set_event_timer(xqc_usec_t wake_after, void *user_data)
{
xqc_server_ctx_t *ctx = (xqc_server_ctx_t *) user_data;

Expand Down Expand Up @@ -1635,12 +1635,12 @@ xqc_server_socket_read_handler(xqc_server_ctx_t *ctx)
if (xqc_engine_packet_process(ctx->engine, iovecs[i].iov_base, msgs[i].msg_len,
(struct sockaddr *) (&ctx->local_addr), ctx->local_addrlen,
(struct sockaddr *) (&pa[i]), peer_addrlen,
(xqc_msec_t)recv_time, NULL) != XQC_OK)
(xqc_usec_t)recv_time, NULL) != XQC_OK)
#else
if (xqc_engine_packet_process(ctx->engine, iovecs[i].iov_base, msgs[i].msg_len,
(struct sockaddr *) (&ctx->local_addr), ctx->local_addrlen,
(struct sockaddr *) (&pa[i]), peer_addrlen,
XQC_UNKNOWN_PATH_ID, (xqc_msec_t)recv_time, NULL) != XQC_OK)
XQC_UNKNOWN_PATH_ID, (xqc_usec_t)recv_time, NULL) != XQC_OK)
#endif
{
printf("xqc_server_read_handler: packet process err\n");
Expand Down Expand Up @@ -1685,12 +1685,12 @@ xqc_server_socket_read_handler(xqc_server_ctx_t *ctx)
ret = xqc_engine_packet_process(ctx->engine, packet_buf, recv_size,
(struct sockaddr *) (&ctx->local_addr), ctx->local_addrlen,
(struct sockaddr *) (&peer_addr), peer_addrlen,
(xqc_msec_t) recv_time, NULL);
(xqc_usec_t) recv_time, NULL);
#else
ret = xqc_engine_packet_process(ctx->engine, packet_buf, recv_size,
(struct sockaddr *) (&ctx->local_addr), ctx->local_addrlen,
(struct sockaddr *) (&peer_addr), peer_addrlen,
XQC_UNKNOWN_PATH_ID, (xqc_msec_t) recv_time, NULL);
XQC_UNKNOWN_PATH_ID, (xqc_usec_t) recv_time, NULL);
#endif
if (ret != XQC_OK)
{
Expand Down

0 comments on commit 3721d48

Please sign in to comment.