gfwleak/stellar-stellar
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename counter -> stat

Browse Source
This commit is contained in:
luwenpeng
2024-03-08 14:25:01 +08:00
parent c945931620
commit d0914483bb
7 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/packet_io/packet_io.cpp
View File

@@ -88,11 +88,6 @@ void packet_io_free(struct packet_io *handle)
} }
} }
struct packet_io_stat *packet_io_get_stat(struct packet_io *handle)
{
return (struct packet_io_stat *)handle->on_stat(handle->handle);
}
void packet_io_print_stat(struct packet_io *handle) void packet_io_print_stat(struct packet_io *handle)
{ {
struct packet_io_stat *stat = packet_io_get_stat(handle); struct packet_io_stat *stat = packet_io_get_stat(handle);
@@ -104,6 +99,11 @@ void packet_io_print_stat(struct packet_io *handle)
PACKET_IO_LOG_DEBUG("keepalive_pkts : %lu, keepalive_bytes : %lu", stat->keepalive_pkts, stat->keepalive_bytes); PACKET_IO_LOG_DEBUG("keepalive_pkts : %lu, keepalive_bytes : %lu", stat->keepalive_pkts, stat->keepalive_bytes);
} }
struct packet_io_stat *packet_io_get_stat(struct packet_io *handle)
{
return (struct packet_io_stat *)handle->on_stat(handle->handle);
}
int packet_io_init(struct packet_io *handle, uint16_t thread_id) int packet_io_init(struct packet_io *handle, uint16_t thread_id)
{ {
return handle->on_init(handle->handle, thread_id); return handle->on_init(handle->handle, thread_id);

2
src/packet_io/packet_io.h
View File

@@ -55,8 +55,8 @@ struct packet_io_config
struct packet_io; struct packet_io;
struct packet_io *packet_io_new(struct packet_io_config *config); struct packet_io *packet_io_new(struct packet_io_config *config);
void packet_io_free(struct packet_io *handle); void packet_io_free(struct packet_io *handle);
struct packet_io_stat *packet_io_get_stat(struct packet_io *handle);
void packet_io_print_stat(struct packet_io *handle); void packet_io_print_stat(struct packet_io *handle);
struct packet_io_stat *packet_io_get_stat(struct packet_io *handle);
// return 0 if success, -1 if failed // return 0 if success, -1 if failed
int packet_io_init(struct packet_io *handle, uint16_t thread_id); int packet_io_init(struct packet_io *handle, uint16_t thread_id);

40
src/session/session_manager.cpp
View File

@@ -1258,25 +1258,7 @@ uint64_t session_manager_get_expire_interval(struct session_manager *mgr)
return session_timer_next_expire_interval(mgr->sess_timer); return session_timer_next_expire_interval(mgr->sess_timer);
} }
void session_manager_get_session_counter(struct session_manager *mgr, struct session_counter *out) void session_manager_print_stat(struct session_manager *mgr)
{
out->tcp_sess_num = mgr->tcp_sess_num;
out->tcp_opening_sess_num = mgr->tcp_opening_sess_num;
out->tcp_active_sess_num = mgr->tcp_active_sess_num;
out->tcp_closing_sess_num = mgr->tcp_closing_sess_num;
out->udp_sess_num = mgr->udp_sess_num;
out->udp_opening_sess_num = mgr->udp_opening_sess_num;
out->udp_active_sess_num = mgr->udp_active_sess_num;
out->udp_closing_sess_num = mgr->udp_closing_sess_num;
out->tcp_overload_evict_old_sess_num = mgr->tcp_overload_evict_old_sess_num;
out->tcp_overload_evict_new_sess_num = mgr->tcp_overload_evict_new_sess_num;
out->udp_overload_evict_old_sess_num = mgr->udp_overload_evict_old_sess_num;
out->udp_overload_evict_new_sess_num = mgr->udp_overload_evict_new_sess_num;
}
void session_manager_print_status(struct session_manager *mgr)
{ {
printf("session manager status:\n"); printf("session manager status:\n");
@@ -1303,4 +1285,22 @@ void session_manager_print_status(struct session_manager *mgr)
printf(" hit tcp discard : %lu (drop)\n", mgr->npkts_hit_tcp_discard); printf(" hit tcp discard : %lu (drop)\n", mgr->npkts_hit_tcp_discard);
printf(" hit udp evicted : %lu (bypass)\n", mgr->npkts_hit_udp_evicted); printf(" hit udp evicted : %lu (bypass)\n", mgr->npkts_hit_udp_evicted);
} }
void session_manager_get_stat(struct session_manager *mgr, struct session_manager_stat *out)
{
out->tcp_sess_num = mgr->tcp_sess_num;
out->tcp_opening_sess_num = mgr->tcp_opening_sess_num;
out->tcp_active_sess_num = mgr->tcp_active_sess_num;
out->tcp_closing_sess_num = mgr->tcp_closing_sess_num;
out->udp_sess_num = mgr->udp_sess_num;
out->udp_opening_sess_num = mgr->udp_opening_sess_num;
out->udp_active_sess_num = mgr->udp_active_sess_num;
out->udp_closing_sess_num = mgr->udp_closing_sess_num;
out->tcp_overload_evict_old_sess_num = mgr->tcp_overload_evict_old_sess_num;
out->tcp_overload_evict_new_sess_num = mgr->tcp_overload_evict_new_sess_num;
out->udp_overload_evict_old_sess_num = mgr->udp_overload_evict_old_sess_num;
out->udp_overload_evict_new_sess_num = mgr->udp_overload_evict_new_sess_num;
}

6
src/session/session_manager.h
View File

@@ -68,7 +68,7 @@ struct session *session_manager_get_evicted_session(struct session_manager *mgr)
// return >0: next expire interval // return >0: next expire interval
uint64_t session_manager_get_expire_interval(struct session_manager *mgr); uint64_t session_manager_get_expire_interval(struct session_manager *mgr);
struct session_counter struct session_manager_stat
{ {
uint64_t tcp_sess_num; uint64_t tcp_sess_num;
uint64_t tcp_opening_sess_num; uint64_t tcp_opening_sess_num;
@@ -86,8 +86,8 @@ struct session_counter
uint64_t udp_overload_evict_new_sess_num; uint64_t udp_overload_evict_new_sess_num;
}; };
void session_manager_get_session_counter(struct session_manager *mgr, struct session_counter *out); void session_manager_print_stat(struct session_manager *mgr);
void session_manager_print_status(struct session_manager *mgr); void session_manager_get_stat(struct session_manager *mgr, struct session_manager_stat *out);
#ifdef __cpluscplus #ifdef __cpluscplus
} }

10
src/session/test/gtest_overload_evict_tcp_sess.cpp
View File

@@ -35,7 +35,7 @@ TEST(OVERLOAD, EVICT_TCP_OLD_SESS)
EXPECT_TRUE(sess); EXPECT_TRUE(sess);
__session_dispatch(sess); __session_dispatch(sess);
session_manager_print_status(mgr); session_manager_print_stat(mgr);
if (i == config.max_tcp_session_num - 1) if (i == config.max_tcp_session_num - 1)
{ {
@@ -67,14 +67,14 @@ TEST(OVERLOAD, EVICT_TCP_OLD_SESS)
packet_get_innermost_tuple6(&pkt, &key); packet_get_innermost_tuple6(&pkt, &key);
EXPECT_TRUE(tuple6_cmp(session_get0_key(sess), &key) == 0); EXPECT_TRUE(tuple6_cmp(session_get0_key(sess), &key) == 0);
__session_dispatch(sess); __session_dispatch(sess);
session_manager_print_status(mgr); session_manager_print_stat(mgr);
printf("\n====================== expired session ======================\n\n"); printf("\n====================== expired session ======================\n\n");
__session_manager_wait(mgr, CLOSING_BY_TIMEOUT); __session_manager_wait(mgr, CLOSING_BY_TIMEOUT);
__session_manager_wait(mgr, CLOSING_BY_TIMEOUT); __session_manager_wait(mgr, CLOSING_BY_TIMEOUT);
printf("\n====================== end status ======================\n\n"); printf("\n====================== end status ======================\n\n");
session_manager_print_status(mgr); session_manager_print_stat(mgr);
__session_manager_check_counter(mgr, __session_manager_check_counter(mgr,
0, 0, 0, // tcp_opening_sess_num, tcp_active_sess_num, tcp_closing_sess_num, 0, 0, 0, // tcp_opening_sess_num, tcp_active_sess_num, tcp_closing_sess_num,
0, 0, 0, // udp_opening_sess_num, udp_active_sess_num, udp_closing_sess_num, 0, 0, 0, // udp_opening_sess_num, udp_active_sess_num, udp_closing_sess_num,
@@ -131,7 +131,7 @@ TEST(OVERLOAD, EVICT_TCP_NEW_SESS)
} }
__session_dispatch(sess); __session_dispatch(sess);
session_manager_print_status(mgr); session_manager_print_stat(mgr);
} }
printf("\n====================== expired session ======================\n\n"); printf("\n====================== expired session ======================\n\n");
@@ -139,7 +139,7 @@ TEST(OVERLOAD, EVICT_TCP_NEW_SESS)
__session_manager_wait(mgr, CLOSING_BY_TIMEOUT); __session_manager_wait(mgr, CLOSING_BY_TIMEOUT);
printf("\n====================== end status ======================\n\n"); printf("\n====================== end status ======================\n\n");
session_manager_print_status(mgr); session_manager_print_stat(mgr);
__session_manager_check_counter(mgr, __session_manager_check_counter(mgr,
0, 0, 0, // tcp_opening_sess_num, tcp_active_sess_num, tcp_closing_sess_num, 0, 0, 0, // tcp_opening_sess_num, tcp_active_sess_num, tcp_closing_sess_num,
0, 0, 0, // udp_opening_sess_num, udp_active_sess_num, udp_closing_sess_num, 0, 0, 0, // udp_opening_sess_num, udp_active_sess_num, udp_closing_sess_num,

10
src/session/test/gtest_overload_evict_udp_sess.cpp
View File

@@ -35,7 +35,7 @@ TEST(OVERLOAD, EVICT_UDP_OLD_SESS)
EXPECT_TRUE(sess); EXPECT_TRUE(sess);
__session_dispatch(sess); __session_dispatch(sess);
session_manager_print_status(mgr); session_manager_print_stat(mgr);
if (i == config.max_udp_session_num - 1) if (i == config.max_udp_session_num - 1)
{ {
@@ -67,14 +67,14 @@ TEST(OVERLOAD, EVICT_UDP_OLD_SESS)
packet_get_innermost_tuple6(&pkt, &key); packet_get_innermost_tuple6(&pkt, &key);
EXPECT_TRUE(tuple6_cmp(session_get0_key(sess), &key) == 0); EXPECT_TRUE(tuple6_cmp(session_get0_key(sess), &key) == 0);
__session_dispatch(sess); __session_dispatch(sess);
session_manager_print_status(mgr); session_manager_print_stat(mgr);
printf("\n====================== expired session ======================\n\n"); printf("\n====================== expired session ======================\n\n");
__session_manager_wait(mgr, CLOSING_BY_TIMEOUT); __session_manager_wait(mgr, CLOSING_BY_TIMEOUT);
__session_manager_wait(mgr, CLOSING_BY_TIMEOUT); __session_manager_wait(mgr, CLOSING_BY_TIMEOUT);
printf("\n====================== end status ======================\n\n"); printf("\n====================== end status ======================\n\n");
session_manager_print_status(mgr); session_manager_print_stat(mgr);
__session_manager_check_counter(mgr, __session_manager_check_counter(mgr,
0, 0, 0, // tcp_opening_sess_num, tcp_active_sess_num, tcp_closing_sess_num, 0, 0, 0, // tcp_opening_sess_num, tcp_active_sess_num, tcp_closing_sess_num,
0, 0, 0, // udp_opening_sess_num, udp_active_sess_num, udp_closing_sess_num, 0, 0, 0, // udp_opening_sess_num, udp_active_sess_num, udp_closing_sess_num,
@@ -131,7 +131,7 @@ TEST(OVERLOAD, EVICT_UDP_NEW_SESS)
} }
__session_dispatch(sess); __session_dispatch(sess);
session_manager_print_status(mgr); session_manager_print_stat(mgr);
} }
printf("\n====================== expired session ======================\n\n"); printf("\n====================== expired session ======================\n\n");
@@ -139,7 +139,7 @@ TEST(OVERLOAD, EVICT_UDP_NEW_SESS)
__session_manager_wait(mgr, CLOSING_BY_TIMEOUT); __session_manager_wait(mgr, CLOSING_BY_TIMEOUT);
printf("\n====================== end status ======================\n\n"); printf("\n====================== end status ======================\n\n");
session_manager_print_status(mgr); session_manager_print_stat(mgr);
__session_manager_check_counter(mgr, __session_manager_check_counter(mgr,
0, 0, 0, // tcp_opening_sess_num, tcp_active_sess_num, tcp_closing_sess_num, 0, 0, 0, // tcp_opening_sess_num, tcp_active_sess_num, tcp_closing_sess_num,
0, 0, 0, // udp_opening_sess_num, udp_active_sess_num, udp_closing_sess_num, 0, 0, 0, // udp_opening_sess_num, udp_active_sess_num, udp_closing_sess_num,

4
src/session/test/test_utils.h
View File

@@ -93,8 +93,8 @@ __attribute__((unused)) static void __session_manager_check_counter(struct sessi
uint64_t tcp_overload_evict_new_sess_num, uint64_t tcp_overload_evict_old_sess_num, uint64_t tcp_overload_evict_new_sess_num, uint64_t tcp_overload_evict_old_sess_num,
uint64_t udp_overload_evict_new_sess_num, uint64_t udp_overload_evict_old_sess_num) uint64_t udp_overload_evict_new_sess_num, uint64_t udp_overload_evict_old_sess_num)
{ {
struct session_counter counter; struct session_manager_stat counter;
session_manager_get_session_counter(mgr, &counter); session_manager_get_stat(mgr, &counter);
EXPECT_TRUE(counter.tcp_sess_num == tcp_opening_sess_num + tcp_active_sess_num + tcp_closing_sess_num); EXPECT_TRUE(counter.tcp_sess_num == tcp_opening_sess_num + tcp_active_sess_num + tcp_closing_sess_num);
EXPECT_TRUE(counter.tcp_opening_sess_num == tcp_opening_sess_num); EXPECT_TRUE(counter.tcp_opening_sess_num == tcp_opening_sess_num);