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

rename: update session pool and packet pool API names for clarity

Browse Source
This commit is contained in:
luwenpeng
2024-11-08 19:16:06 +08:00
parent d0a8685914
commit 8349a631e1
10 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
infra/packet_io/mars_io.c
View File

@@ -243,7 +243,7 @@ static void origin_free_cb(struct packet *pkt, void *args)
stat->bytes_user_freed += packet_get_raw_len(pkt); stat->bytes_user_freed += packet_get_raw_len(pkt);
marsio_buff_free(mars_io->mr_ins, &mbuff, 1, 0, origin->thr_idx); marsio_buff_free(mars_io->mr_ins, &mbuff, 1, 0, origin->thr_idx);
packet_pool_push(pool, pkt); packet_pool_release_packet(pool, pkt);
} }
/****************************************************************************** /******************************************************************************
@@ -408,7 +408,7 @@ int mars_io_recv(void *handle, uint16_t thr_idx, struct packet *pkts[], int nr_p
} }
else else
{ {
pkt = packet_pool_pop(pool); pkt = packet_pool_acquire_packet(pool);
assert(pkt != NULL); assert(pkt != NULL);
struct packet_origin origin = { struct packet_origin origin = {
.type = ORIGIN_TYPE_MR, .type = ORIGIN_TYPE_MR,
@@ -449,7 +449,7 @@ void mars_io_send(void *handle, uint16_t thr_idx, struct packet *pkts[], int nr_
mbuff = (marsio_buff_t *)origin->ctx; mbuff = (marsio_buff_t *)origin->ctx;
copy_metadata_to_mbuff(pkt, mbuff); copy_metadata_to_mbuff(pkt, mbuff);
marsio_send_burst(mars_io->mr_path, thr_idx, &mbuff, 1); marsio_send_burst(mars_io->mr_path, thr_idx, &mbuff, 1);
packet_pool_push(mars_io->pool[thr_idx], pkt); packet_pool_release_packet(mars_io->pool[thr_idx], pkt);
} }
else else
{ {
@@ -501,7 +501,7 @@ void mars_io_drop(void *handle, uint16_t thr_idx, struct packet *pkts[], int nr_
{ {
mbuff = (marsio_buff_t *)origin->ctx; mbuff = (marsio_buff_t *)origin->ctx;
marsio_buff_free(mars_io->mr_ins, &mbuff, 1, 0, thr_idx); marsio_buff_free(mars_io->mr_ins, &mbuff, 1, 0, thr_idx);
packet_pool_push(mars_io->pool[thr_idx], pkt); packet_pool_release_packet(mars_io->pool[thr_idx], pkt);
} }
else else
{ {

8
infra/packet_io/pcap_io.c
View File

@@ -344,7 +344,7 @@ static void origin_free_cb(struct packet *pkt, void *args)
stat->bytes_user_freed += packet_get_raw_len(pkt); stat->bytes_user_freed += packet_get_raw_len(pkt);
free(pcap); free(pcap);
packet_pool_push(pool, pkt); packet_pool_release_packet(pool, pkt);
} }
/****************************************************************************** /******************************************************************************
@@ -476,7 +476,7 @@ int pcap_io_recv(void *handle, uint16_t thr_idx, struct packet *pkts[], int nr_p
stat->pkts_rx++; stat->pkts_rx++;
stat->bytes_rx += pcap->len; stat->bytes_rx += pcap->len;
pkt = packet_pool_pop(pool); pkt = packet_pool_acquire_packet(pool);
assert(pkt != NULL); assert(pkt != NULL);
struct packet_origin origin = { struct packet_origin origin = {
.type = ORIGIN_TYPE_PCAP, .type = ORIGIN_TYPE_PCAP,
@@ -524,7 +524,7 @@ void pcap_io_send(void *handle, uint16_t thr_idx, struct packet *pkts[], int nr_
{ {
pcap = (struct pcap_pkt *)origin->ctx; pcap = (struct pcap_pkt *)origin->ctx;
free(pcap); free(pcap);
packet_pool_push(pcap_io->pool[thr_idx], pkt); packet_pool_release_packet(pcap_io->pool[thr_idx], pkt);
} }
else else
{ {
@@ -582,7 +582,7 @@ void pcap_io_drop(void *handle, uint16_t thr_idx, struct packet *pkts[], int nr_
{ {
pcap = (struct pcap_pkt *)origin->ctx; pcap = (struct pcap_pkt *)origin->ctx;
free(pcap); free(pcap);
packet_pool_push(pcap_io->pool[thr_idx], pkt); packet_pool_release_packet(pcap_io->pool[thr_idx], pkt);
} }
else else
{ {

4
infra/packet_manager/packet_pool.c
View File

@@ -62,7 +62,7 @@ void packet_pool_free(struct packet_pool *pool)
} }
} }
struct packet *packet_pool_pop(struct packet_pool *pool) struct packet *packet_pool_acquire_packet(struct packet_pool *pool)
{ {
struct packet *pkt = TAILQ_FIRST(&pool->free_list); struct packet *pkt = TAILQ_FIRST(&pool->free_list);
if (pkt == NULL) if (pkt == NULL)
@@ -84,7 +84,7 @@ struct packet *packet_pool_pop(struct packet_pool *pool)
return pkt; return pkt;
} }
void packet_pool_push(struct packet_pool *pool, struct packet *pkt) void packet_pool_release_packet(struct packet_pool *pool, struct packet *pkt)
{ {
if (pool == NULL || pkt == NULL) if (pool == NULL || pkt == NULL)
{ {

4
infra/packet_manager/packet_pool.h
View File

@@ -11,8 +11,8 @@ struct packet_pool;
struct packet_pool *packet_pool_new(uint64_t capacity); struct packet_pool *packet_pool_new(uint64_t capacity);
void packet_pool_free(struct packet_pool *pool); void packet_pool_free(struct packet_pool *pool);
struct packet *packet_pool_pop(struct packet_pool *pool); struct packet *packet_pool_acquire_packet(struct packet_pool *pool);
void packet_pool_push(struct packet_pool *pool, struct packet *pkt); void packet_pool_release_packet(struct packet_pool *pool, struct packet *pkt);
uint64_t packet_pool_get_used_num(const struct packet_pool *pool); uint64_t packet_pool_get_used_num(const struct packet_pool *pool);
uint64_t packet_pool_get_free_num(const struct packet_pool *pool); uint64_t packet_pool_get_free_num(const struct packet_pool *pool);

16
infra/packet_manager/test/gtest_packet_pool.cpp
View File

@@ -16,40 +16,40 @@ TEST(PACKET_POOL, TEST)
EXPECT_TRUE(packet_pool_get_free_num(pool) == 3); EXPECT_TRUE(packet_pool_get_free_num(pool) == 3);
// pop // pop
pkt1 = packet_pool_pop(pool); pkt1 = packet_pool_acquire_packet(pool);
EXPECT_TRUE(pkt1 != NULL); EXPECT_TRUE(pkt1 != NULL);
EXPECT_TRUE(packet_pool_get_used_num(pool) == 1); EXPECT_TRUE(packet_pool_get_used_num(pool) == 1);
EXPECT_TRUE(packet_pool_get_free_num(pool) == 2); EXPECT_TRUE(packet_pool_get_free_num(pool) == 2);
pkt2 = packet_pool_pop(pool); pkt2 = packet_pool_acquire_packet(pool);
EXPECT_TRUE(pkt2 != NULL); EXPECT_TRUE(pkt2 != NULL);
EXPECT_TRUE(packet_pool_get_used_num(pool) == 2); EXPECT_TRUE(packet_pool_get_used_num(pool) == 2);
EXPECT_TRUE(packet_pool_get_free_num(pool) == 1); EXPECT_TRUE(packet_pool_get_free_num(pool) == 1);
pkt3 = packet_pool_pop(pool); pkt3 = packet_pool_acquire_packet(pool);
EXPECT_TRUE(pkt3 != NULL); EXPECT_TRUE(pkt3 != NULL);
EXPECT_TRUE(packet_pool_get_used_num(pool) == 3); EXPECT_TRUE(packet_pool_get_used_num(pool) == 3);
EXPECT_TRUE(packet_pool_get_free_num(pool) == 0); EXPECT_TRUE(packet_pool_get_free_num(pool) == 0);
pkt4 = packet_pool_pop(pool); pkt4 = packet_pool_acquire_packet(pool);
EXPECT_TRUE(pkt4 != NULL); EXPECT_TRUE(pkt4 != NULL);
EXPECT_TRUE(packet_pool_get_used_num(pool) == 4); EXPECT_TRUE(packet_pool_get_used_num(pool) == 4);
EXPECT_TRUE(packet_pool_get_free_num(pool) == 0); EXPECT_TRUE(packet_pool_get_free_num(pool) == 0);
// push // push
packet_pool_push(pool, pkt1); packet_pool_release_packet(pool, pkt1);
EXPECT_TRUE(packet_pool_get_used_num(pool) == 3); EXPECT_TRUE(packet_pool_get_used_num(pool) == 3);
EXPECT_TRUE(packet_pool_get_free_num(pool) == 1); EXPECT_TRUE(packet_pool_get_free_num(pool) == 1);
packet_pool_push(pool, pkt2); packet_pool_release_packet(pool, pkt2);
EXPECT_TRUE(packet_pool_get_used_num(pool) == 2); EXPECT_TRUE(packet_pool_get_used_num(pool) == 2);
EXPECT_TRUE(packet_pool_get_free_num(pool) == 2); EXPECT_TRUE(packet_pool_get_free_num(pool) == 2);
packet_pool_push(pool, pkt3); packet_pool_release_packet(pool, pkt3);
EXPECT_TRUE(packet_pool_get_used_num(pool) == 1); EXPECT_TRUE(packet_pool_get_used_num(pool) == 1);
EXPECT_TRUE(packet_pool_get_free_num(pool) == 3); EXPECT_TRUE(packet_pool_get_free_num(pool) == 3);
packet_pool_push(pool, pkt4); packet_pool_release_packet(pool, pkt4);
EXPECT_TRUE(packet_pool_get_used_num(pool) == 0); EXPECT_TRUE(packet_pool_get_used_num(pool) == 0);
EXPECT_TRUE(packet_pool_get_free_num(pool) == 3); EXPECT_TRUE(packet_pool_get_free_num(pool) == 3);

8
infra/session_manager/session_manager_rte.c
View File

@@ -581,7 +581,7 @@ static struct session *session_manager_rte_new_tcp_session(struct session_manage
} }
enum flow_type type = (flags & TH_ACK) ? FLOW_TYPE_S2C : FLOW_TYPE_C2S; enum flow_type type = (flags & TH_ACK) ? FLOW_TYPE_S2C : FLOW_TYPE_C2S;
struct session *sess = session_pool_pop(sess_mgr_rte->sess_pool); struct session *sess = session_pool_acquire_sessoin(sess_mgr_rte->sess_pool);
if (sess == NULL) if (sess == NULL)
{ {
assert(0); assert(0);
@@ -598,7 +598,7 @@ static struct session *session_manager_rte_new_tcp_session(struct session_manage
if (tcp_init(sess_mgr_rte, sess) == -1) if (tcp_init(sess_mgr_rte, sess) == -1)
{ {
assert(0); assert(0);
session_pool_push(sess_mgr_rte->sess_pool, sess); session_pool_release_sessoin(sess_mgr_rte->sess_pool, sess);
return NULL; return NULL;
} }
tcp_update(sess_mgr_rte, sess, type, tcp_layer); tcp_update(sess_mgr_rte, sess, type, tcp_layer);
@@ -628,7 +628,7 @@ static struct session *session_manager_rte_new_udp_session(struct session_manage
session_manager_rte_evicte_session(sess_mgr_rte, evic_sess, LRU_EVICT); session_manager_rte_evicte_session(sess_mgr_rte, evic_sess, LRU_EVICT);
} }
struct session *sess = session_pool_pop(sess_mgr_rte->sess_pool); struct session *sess = session_pool_acquire_sessoin(sess_mgr_rte->sess_pool);
if (sess == NULL) if (sess == NULL)
{ {
assert(sess); assert(sess);
@@ -933,7 +933,7 @@ void session_manager_rte_free_session(struct session_manager_rte *sess_mgr_rte,
session_set_current_packet(sess, NULL); session_set_current_packet(sess, NULL);
session_set_flow_type(sess, FLOW_TYPE_NONE); session_set_flow_type(sess, FLOW_TYPE_NONE);
session_init(sess); session_init(sess);
session_pool_push(sess_mgr_rte->sess_pool, sess); session_pool_release_sessoin(sess_mgr_rte->sess_pool, sess);
sess = NULL; sess = NULL;
} }
} }

4
infra/session_manager/session_pool.c
View File

@@ -53,7 +53,7 @@ void session_pool_free(struct session_pool *pool)
} }
} }
struct session *session_pool_pop(struct session_pool *pool) struct session *session_pool_acquire_sessoin(struct session_pool *pool)
{ {
if (pool == NULL) if (pool == NULL)
{ {
@@ -71,7 +71,7 @@ struct session *session_pool_pop(struct session_pool *pool)
return sess; return sess;
} }
void session_pool_push(struct session_pool *pool, struct session *sess) void session_pool_release_sessoin(struct session_pool *pool, struct session *sess)
{ {
if (pool == NULL || sess == NULL) if (pool == NULL || sess == NULL)
{ {

4
infra/session_manager/session_pool.h
View File

@@ -11,8 +11,8 @@ struct session_pool;
struct session_pool *session_pool_new(uint64_t capacity); struct session_pool *session_pool_new(uint64_t capacity);
void session_pool_free(struct session_pool *pool); void session_pool_free(struct session_pool *pool);
struct session *session_pool_pop(struct session_pool *pool); struct session *session_pool_acquire_sessoin(struct session_pool *pool);
void session_pool_push(struct session_pool *pool, struct session *sess); void session_pool_release_sessoin(struct session_pool *pool, struct session *sess);
const struct session *session_pool_get0(const struct session_pool *pool, uint64_t idx); const struct session *session_pool_get0(const struct session_pool *pool, uint64_t idx);
uint64_t session_pool_get_free_num(const struct session_pool *pool); uint64_t session_pool_get_free_num(const struct session_pool *pool);

14
infra/session_manager/test/gtest_session_pool.cpp
View File

@@ -15,36 +15,36 @@ TEST(SESSION_POOL, POP_PUSH)
EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 0); EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 0);
// pop // pop
sess1 = session_pool_pop(sess_pool); sess1 = session_pool_acquire_sessoin(sess_pool);
EXPECT_TRUE(sess1 != NULL); EXPECT_TRUE(sess1 != NULL);
EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 2); EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 2);
EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 1); EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 1);
sess2 = session_pool_pop(sess_pool); sess2 = session_pool_acquire_sessoin(sess_pool);
EXPECT_TRUE(sess2 != NULL); EXPECT_TRUE(sess2 != NULL);
EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 1); EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 1);
EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 2); EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 2);
sess3 = session_pool_pop(sess_pool); sess3 = session_pool_acquire_sessoin(sess_pool);
EXPECT_TRUE(sess3 != NULL); EXPECT_TRUE(sess3 != NULL);
EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 0); EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 0);
EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 3); EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 3);
sess4 = session_pool_pop(sess_pool); sess4 = session_pool_acquire_sessoin(sess_pool);
EXPECT_TRUE(sess4 == NULL); EXPECT_TRUE(sess4 == NULL);
EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 0); EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 0);
EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 3); EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 3);
// push // push
session_pool_push(sess_pool, sess1); session_pool_release_sessoin(sess_pool, sess1);
EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 1); EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 1);
EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 2); EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 2);
session_pool_push(sess_pool, sess2); session_pool_release_sessoin(sess_pool, sess2);
EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 2); EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 2);
EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 1); EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 1);
session_pool_push(sess_pool, sess3); session_pool_release_sessoin(sess_pool, sess3);
EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 3); EXPECT_TRUE(session_pool_get_free_num(sess_pool) == 3);
EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 0); EXPECT_TRUE(session_pool_get_used_num(sess_pool) == 0);

14
infra/session_manager/test/gtest_session_table.cpp
View File

@@ -51,7 +51,7 @@ static void session_free_callback(struct session *sess, void *arg)
if (sess) if (sess)
{ {
struct session_pool *sess_pool = (struct session_pool *)arg; struct session_pool *sess_pool = (struct session_pool *)arg;
session_pool_push(sess_pool, sess); session_pool_release_sessoin(sess_pool, sess);
sess = NULL; sess = NULL;
} }
} }
@@ -106,17 +106,17 @@ TEST(SESSION_TABLE, OP_SESSION)
session_table_set_freecb(sess_table, session_free_callback, sess_pool); session_table_set_freecb(sess_table, session_free_callback, sess_pool);
// Add // Add
sess1 = session_pool_pop(sess_pool); sess1 = session_pool_acquire_sessoin(sess_pool);
EXPECT_TRUE(sess1 != NULL); EXPECT_TRUE(sess1 != NULL);
session_set_id(sess1, 1); session_set_id(sess1, 1);
session_set_tuple6(sess1, &sess1_tup6); session_set_tuple6(sess1, &sess1_tup6);
sess2 = session_pool_pop(sess_pool); sess2 = session_pool_acquire_sessoin(sess_pool);
EXPECT_TRUE(sess2 != NULL); EXPECT_TRUE(sess2 != NULL);
session_set_id(sess2, 2); session_set_id(sess2, 2);
session_set_tuple6(sess2, &sess2_tup6); session_set_tuple6(sess2, &sess2_tup6);
sess3 = session_pool_pop(sess_pool); sess3 = session_pool_acquire_sessoin(sess_pool);
EXPECT_TRUE(sess3 != NULL); EXPECT_TRUE(sess3 != NULL);
session_set_id(sess3, 3); session_set_id(sess3, 3);
session_set_tuple6(sess3, &sess3_tup6); session_set_tuple6(sess3, &sess3_tup6);
@@ -200,21 +200,21 @@ TEST(SESSION_TABLE, FIND_OLDEST_NEWEST)
EXPECT_TRUE(session_table_find_lru(sess_table) == NULL); EXPECT_TRUE(session_table_find_lru(sess_table) == NULL);
sess1 = session_pool_pop(sess_pool); sess1 = session_pool_acquire_sessoin(sess_pool);
EXPECT_TRUE(sess1 != NULL); EXPECT_TRUE(sess1 != NULL);
session_set_id(sess1, 1); session_set_id(sess1, 1);
session_set_tuple6(sess1, &sess1_tup6); session_set_tuple6(sess1, &sess1_tup6);
session_table_add(sess_table, sess1); session_table_add(sess_table, sess1);
EXPECT_TRUE(session_table_find_lru(sess_table) == sess1); EXPECT_TRUE(session_table_find_lru(sess_table) == sess1);
sess2 = session_pool_pop(sess_pool); sess2 = session_pool_acquire_sessoin(sess_pool);
EXPECT_TRUE(sess2 != NULL); EXPECT_TRUE(sess2 != NULL);
session_set_id(sess2, 2); session_set_id(sess2, 2);
session_set_tuple6(sess2, &sess2_tup6); session_set_tuple6(sess2, &sess2_tup6);
session_table_add(sess_table, sess2); session_table_add(sess_table, sess2);
EXPECT_TRUE(session_table_find_lru(sess_table) == sess1); EXPECT_TRUE(session_table_find_lru(sess_table) == sess1);
sess3 = session_pool_pop(sess_pool); sess3 = session_pool_acquire_sessoin(sess_pool);
EXPECT_TRUE(sess3 != NULL); EXPECT_TRUE(sess3 != NULL);
session_set_id(sess3, 3); session_set_id(sess3, 3);
session_set_tuple6(sess3, &sess3_tup6); session_set_tuple6(sess3, &sess3_tup6);