diff --git a/platform/include/packet_io.h b/platform/include/packet_io.h index ad45bb2..978d2f7 100644 --- a/platform/include/packet_io.h +++ b/platform/include/packet_io.h @@ -59,13 +59,13 @@ void packet_io_destory(struct packet_io *handle); // return 0 for success // return -1 for error -int packet_io_thread_init(struct packet_io *handle, struct thread_ctx *thread_ctx); -void packet_io_thread_wait(struct packet_io *handle, struct thread_ctx *thread_ctx, int timeout_ms); +int packet_io_init(struct packet_io *handle, struct thread_ctx *thread_ctx); +void packet_io_wait(struct packet_io *handle, struct thread_ctx *thread_ctx, int timeout_ms); // return n_packet_recved -int packet_io_thread_polling_nf(struct packet_io *handle, struct thread_ctx *thread_ctx); -int packet_io_thread_polling_endpoint_l3(struct packet_io *handle, struct thread_ctx *thread_ctx); -int packet_io_thread_polling_endpoint_l2(struct packet_io *handle, struct thread_ctx *thread_ctx); +int packet_io_polling_nf(struct packet_io *handle, struct thread_ctx *thread_ctx); +int packet_io_polling_endpoint_l3(struct packet_io *handle, struct thread_ctx *thread_ctx); +int packet_io_polling_endpoint_l2(struct packet_io *handle, struct thread_ctx *thread_ctx); #ifdef __cpluscplus } diff --git a/platform/src/main.cpp b/platform/src/main.cpp index 88cb26e..ae532b2 100644 --- a/platform/src/main.cpp +++ b/platform/src/main.cpp @@ -81,7 +81,7 @@ static void *worker_thread_cycle(void *arg) snprintf(thread_name, sizeof(thread_name), "sce:worker-%d", thread_index); prctl(PR_SET_NAME, (unsigned long long)thread_name, NULL, NULL, NULL); - if (packet_io_thread_init(handle, thread_ctx) != 0) + if (packet_io_init(handle, thread_ctx) != 0) { goto error_out; } @@ -90,9 +90,9 @@ static void *worker_thread_cycle(void *arg) while (!ATOMIC_READ(&is_need_stop)) { - n_packet_recved = packet_io_thread_polling_nf(handle, thread_ctx); - n_packet_recved += packet_io_thread_polling_endpoint_l3(handle, thread_ctx); - n_packet_recved += packet_io_thread_polling_endpoint_l2(handle, thread_ctx); + n_packet_recved = packet_io_polling_nf(handle, thread_ctx); + n_packet_recved += packet_io_polling_endpoint_l3(handle, thread_ctx); + n_packet_recved += packet_io_polling_endpoint_l2(handle, thread_ctx); if (n_packet_recved == 0) { timeout_ms = sf_metrics_last_send_ts + sf_metrics_send_interval - timestamp_get_msec(ts); @@ -101,7 +101,7 @@ static void *worker_thread_cycle(void *arg) timeout_ms = 0; } - packet_io_thread_wait(handle, thread_ctx, timeout_ms); + packet_io_wait(handle, thread_ctx, timeout_ms); } global_metrics_update(global_metrics, thread_metrics, thread_index); diff --git a/platform/src/packet_io.cpp b/platform/src/packet_io.cpp index 1896799..f1d15ae 100644 --- a/platform/src/packet_io.cpp +++ b/platform/src/packet_io.cpp @@ -1461,7 +1461,7 @@ void packet_io_destory(struct packet_io *handle) } } -int packet_io_thread_init(struct packet_io *handle, struct thread_ctx *thread_ctx) +int packet_io_init(struct packet_io *handle, struct thread_ctx *thread_ctx) { if (marsio_thread_init(handle->instance) != 0) { @@ -1472,7 +1472,7 @@ int packet_io_thread_init(struct packet_io *handle, struct thread_ctx *thread_ct return 0; } -void packet_io_thread_wait(struct packet_io *handle, struct thread_ctx *thread_ctx, int timeout_ms) +void packet_io_wait(struct packet_io *handle, struct thread_ctx *thread_ctx, int timeout_ms) { struct mr_vdev *vdevs[3] = { handle->dev_nf.mr_dev, @@ -1491,7 +1491,7 @@ void packet_io_thread_wait(struct packet_io *handle, struct thread_ctx *thread_c } } -int packet_io_thread_polling_nf(struct packet_io *handle, struct thread_ctx *thread_ctx) +int packet_io_polling_nf(struct packet_io *handle, struct thread_ctx *thread_ctx) { struct thread_metrics *thread_metrics = &thread_ctx->thread_metrics; int thread_index = thread_ctx->thread_index; @@ -1554,7 +1554,7 @@ int packet_io_thread_polling_nf(struct packet_io *handle, struct thread_ctx *thr return nr_recv; } -int packet_io_thread_polling_endpoint_l3(struct packet_io *handle, struct thread_ctx *thread_ctx) +int packet_io_polling_endpoint_l3(struct packet_io *handle, struct thread_ctx *thread_ctx) { struct thread_metrics *thread_metrics = &thread_ctx->thread_metrics; int thread_index = thread_ctx->thread_index; @@ -1590,7 +1590,7 @@ int packet_io_thread_polling_endpoint_l3(struct packet_io *handle, struct thread return nr_recv; } -int packet_io_thread_polling_endpoint_l2(struct packet_io *handle, struct thread_ctx *thread_ctx) +int packet_io_polling_endpoint_l2(struct packet_io *handle, struct thread_ctx *thread_ctx) { struct thread_metrics *thread_metrics = &thread_ctx->thread_metrics; int thread_index = thread_ctx->thread_index; diff --git a/test/gtest_data_pkt_mirr_forward.cpp b/test/gtest_data_pkt_mirr_forward.cpp index 48cfea0..f407b39 100644 --- a/test/gtest_data_pkt_mirr_forward.cpp +++ b/test/gtest_data_pkt_mirr_forward.cpp @@ -48,7 +48,7 @@ TEST(PACKET_IO, DATA_PKT_MIRR_FORWARD) mr_instance = packet_io_get_mr_instance(gtest_frame->sce_ctx->io); gtest_frame_run(gtest_frame, tx_mbuf1, dup_mbuf1, 1); marsio_set_recv_mbuff(mr_instance, tx_mbuf2); - EXPECT_TRUE(packet_io_thread_polling_nf(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); + EXPECT_TRUE(packet_io_polling_nf(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); temp_mbuf = marsio_get_send_mbuff(mr_instance); EXPECT_TRUE(mbuff_cmp_payload(dup_mbuf2, temp_mbuf) == 0); EXPECT_TRUE(marsio_mbuff_cmp(dup_mbuf2, marsio_get_send_mbuff(mr_instance)) == 0); diff --git a/test/gtest_data_pkt_mirr_rx_drop.cpp b/test/gtest_data_pkt_mirr_rx_drop.cpp index 3cc4859..ec8f5d0 100644 --- a/test/gtest_data_pkt_mirr_rx_drop.cpp +++ b/test/gtest_data_pkt_mirr_rx_drop.cpp @@ -53,14 +53,14 @@ TEST(PACKET_IO, DATA_PKT_MIRR_RX_DROP) // recv data_pkt from nf // send vxlan_pkt to sf marsio_set_recv_mbuff(mr_instance, tx_mbuf2); - EXPECT_TRUE(packet_io_thread_polling_nf(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); + EXPECT_TRUE(packet_io_polling_nf(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); temp_mbuf = marsio_get_send_mbuff(mr_instance); EXPECT_TRUE(mbuff_cmp_payload(dup_mbuf2, temp_mbuf) == 0); EXPECT_TRUE(marsio_mbuff_cmp(dup_mbuf2, marsio_get_send_mbuff(mr_instance)) == 0); // recv vxlan_pkt from sf // send data_pkt to nf marsio_set_recv_mbuff(mr_instance, temp_mbuf); - EXPECT_TRUE(packet_io_thread_polling_endpoint_l3(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); + EXPECT_TRUE(packet_io_polling_endpoint_l3(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); EXPECT_TRUE(marsio_get_send_mbuff(mr_instance) == NULL); gtest_frame_log(gtest_frame); diff --git a/test/gtest_data_pkt_stee_forward.cpp b/test/gtest_data_pkt_stee_forward.cpp index d0c1004..ac21f6b 100644 --- a/test/gtest_data_pkt_stee_forward.cpp +++ b/test/gtest_data_pkt_stee_forward.cpp @@ -46,7 +46,7 @@ TEST(PACKET_IO, DATA_PKT_STEE_FORWARD) mr_instance = packet_io_get_mr_instance(gtest_frame->sce_ctx->io); gtest_frame_run(gtest_frame, tx_mbuf1, dup_mbuf1, 1); marsio_set_recv_mbuff(mr_instance, tx_mbuf2); - EXPECT_TRUE(packet_io_thread_polling_nf(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); + EXPECT_TRUE(packet_io_polling_nf(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); EXPECT_TRUE(mbuff_cmp_payload(dup_mbuf2, marsio_get_send_mbuff(mr_instance)) == 0); gtest_frame_log(gtest_frame); diff --git a/test/gtest_data_pkt_stee_rx_egress.cpp b/test/gtest_data_pkt_stee_rx_egress.cpp index f917d9b..1d26ab3 100644 --- a/test/gtest_data_pkt_stee_rx_egress.cpp +++ b/test/gtest_data_pkt_stee_rx_egress.cpp @@ -52,13 +52,13 @@ TEST(PACKET_IO, DATA_PKT_STEE_RX_EGRESS) // recv data_pkt from nf // send vxlan_pkt to sf marsio_set_recv_mbuff(mr_instance, tx_mbuf2); - EXPECT_TRUE(packet_io_thread_polling_nf(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); + EXPECT_TRUE(packet_io_polling_nf(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); vxlan_mbuf = marsio_get_send_mbuff(mr_instance); EXPECT_TRUE(mbuff_cmp_payload(dup_mbuf2, vxlan_mbuf) == 0); // recv vxlan_pkt from sf // send data_pkt to nf marsio_set_recv_mbuff(mr_instance, vxlan_mbuf); - EXPECT_TRUE(packet_io_thread_polling_endpoint_l3(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); + EXPECT_TRUE(packet_io_polling_endpoint_l3(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); EXPECT_TRUE(marsio_mbuff_cmp(dup_mbuf2, marsio_get_send_mbuff(mr_instance)) == 0); gtest_frame_log(gtest_frame); diff --git a/test/gtest_mix_pkt_stee_forward.cpp b/test/gtest_mix_pkt_stee_forward.cpp index 17d37d6..13e9c8e 100644 --- a/test/gtest_mix_pkt_stee_forward.cpp +++ b/test/gtest_mix_pkt_stee_forward.cpp @@ -97,12 +97,12 @@ TEST(PACKET_IO, MIX_PKT_STEE_FORWARD) // recv raw packet from nf // send vxlan packet to sf marsio_set_recv_mbuff(mr_instance, tx_mbuf2); - EXPECT_TRUE(packet_io_thread_polling_nf(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); + EXPECT_TRUE(packet_io_polling_nf(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); EXPECT_TRUE(mbuff_cmp_payload(dup_mbuf2, marsio_get_send_mbuff(mr_instance)) == 0); // recv decrypted packet from nf // send vxlan packet to sf marsio_set_recv_mbuff(mr_instance, tx_mbuf4); - EXPECT_TRUE(packet_io_thread_polling_nf(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); + EXPECT_TRUE(packet_io_polling_nf(gtest_frame->sce_ctx->io, >est_frame->sce_ctx->work_threads[0]) == 1); EXPECT_TRUE(mbuff_cmp_payload(dup_mbuf4, marsio_get_send_mbuff(mr_instance)) == 0); gtest_frame_log(gtest_frame); diff --git a/test/gtest_utils.h b/test/gtest_utils.h index b7b3cc4..d70b924 100644 --- a/test/gtest_utils.h +++ b/test/gtest_utils.h @@ -109,7 +109,7 @@ inline struct gtest_frame *gtest_frame_new(const char *json_file, const char *de thread_ctx->ref_sce_ctx = sce_ctx; thread_ctx->session_table_need_reset = 0; - EXPECT_TRUE(packet_io_thread_init(sce_ctx->io, thread_ctx) == 0); + EXPECT_TRUE(packet_io_init(sce_ctx->io, thread_ctx) == 0); instance->sce_ctx = sce_ctx; instance->json_file = strdup(json_file); @@ -159,11 +159,11 @@ inline void gtest_frame_run(struct gtest_frame *instance, marsio_buff_t *tx_mbuf if (is_poll_nf) { - EXPECT_TRUE(packet_io_thread_polling_nf(sce_ctx->io, thread_ctx) == 1); + EXPECT_TRUE(packet_io_polling_nf(sce_ctx->io, thread_ctx) == 1); } else { - EXPECT_TRUE(packet_io_thread_polling_endpoint_l3(sce_ctx->io, thread_ctx) == 1); + EXPECT_TRUE(packet_io_polling_endpoint_l3(sce_ctx->io, thread_ctx) == 1); } rx_mbuf = marsio_get_send_mbuff(mr_instance);