From 5fdf0e2aa4f97ffa2e46db926577e9a0bed8817e Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Thu, 25 Jul 2024 18:32:14 +0800 Subject: [PATCH] feature: session pool support forearch session by index --- src/session/session_pool.cpp | 46 +++++++++++++++++++------ src/session/session_pool.h | 7 ++-- src/session/test/gtest_session_pool.cpp | 27 ++++++++------- 3 files changed, 54 insertions(+), 26 deletions(-) diff --git a/src/session/session_pool.cpp b/src/session/session_pool.cpp index aff982a..798a8a1 100644 --- a/src/session/session_pool.cpp +++ b/src/session/session_pool.cpp @@ -5,25 +5,28 @@ struct session_pool { - uint64_t count; + uint64_t capacity; + uint64_t available; struct list_head free_queue; }; -struct session_pool *session_pool_new(uint64_t count) +struct session_pool *session_pool_new(uint64_t capacity) { - struct session_pool *pool = (struct session_pool *)calloc(1, sizeof(struct session_pool) + count * sizeof(struct session)); + struct session_pool *pool = (struct session_pool *)calloc(1, sizeof(struct session_pool) + capacity * sizeof(struct session)); if (pool == NULL) { return NULL; } + pool->available = 0; + pool->capacity = capacity; INIT_LIST_HEAD(&pool->free_queue); struct session *array = (struct session *)(pool + 1); - for (uint64_t i = 0; i < count; i++) + for (uint64_t i = 0; i < capacity; i++) { struct session *sess = &array[i]; list_add_tail(&sess->free, &pool->free_queue); - pool->count++; + pool->available++; } return pool; @@ -37,7 +40,7 @@ void session_pool_free(struct session_pool *pool) { struct session *sess = list_first_entry(&pool->free_queue, struct session, free); list_del(&sess->free); - pool->count--; + pool->available--; } free(pool); @@ -59,7 +62,7 @@ struct session *session_pool_pop(struct session_pool *pool) struct session *sess = list_first_entry(&pool->free_queue, struct session, free); list_del(&sess->free); - pool->count--; + pool->available--; return sess; } @@ -72,15 +75,36 @@ void session_pool_push(struct session_pool *pool, struct session *sess) } list_add_tail(&sess->free, &pool->free_queue); - pool->count++; + pool->available++; } -uint64_t session_pool_get_count(struct session_pool *pool) +const struct session *session_pool_get0(const struct session_pool *pool, uint64_t idx) +{ + if (pool == NULL || idx >= pool->capacity) + { + return NULL; + } + + struct session *array = (struct session *)(pool + 1); + return &array[idx]; +} + +uint64_t session_pool_available_num(const struct session_pool *pool) { if (pool == NULL) { return 0; } - return pool->count; -} \ No newline at end of file + return pool->available; +} + +uint64_t session_pool_capacity_size(const struct session_pool *pool) +{ + if (pool == NULL) + { + return 0; + } + + return pool->capacity; +} diff --git a/src/session/session_pool.h b/src/session/session_pool.h index 49d035c..9f607b9 100644 --- a/src/session/session_pool.h +++ b/src/session/session_pool.h @@ -8,12 +8,15 @@ extern "C" #include struct session_pool; -struct session_pool *session_pool_new(uint64_t count); +struct session_pool *session_pool_new(uint64_t capacity); void session_pool_free(struct session_pool *pool); struct session *session_pool_pop(struct session_pool *pool); void session_pool_push(struct session_pool *pool, struct session *sess); -uint64_t session_pool_get_count(struct session_pool *pool); +const struct session *session_pool_get0(const struct session_pool *pool, uint64_t idx); + +uint64_t session_pool_available_num(const struct session_pool *pool); +uint64_t session_pool_capacity_size(const struct session_pool *pool); #ifdef __cplusplus } diff --git a/src/session/test/gtest_session_pool.cpp b/src/session/test/gtest_session_pool.cpp index 40ca5e1..658369f 100644 --- a/src/session/test/gtest_session_pool.cpp +++ b/src/session/test/gtest_session_pool.cpp @@ -12,45 +12,46 @@ TEST(SESSION_POOL, POP_PUSH) sess_pool = session_pool_new(3); EXPECT_TRUE(sess_pool != NULL); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 3); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 3); + EXPECT_TRUE(session_pool_capacity_size(sess_pool) == 3); sess1 = session_pool_pop(sess_pool); EXPECT_TRUE(sess1 != NULL); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 2); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 2); sess2 = session_pool_pop(sess_pool); EXPECT_TRUE(sess2 != NULL); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 1); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 1); sess3 = session_pool_pop(sess_pool); EXPECT_TRUE(sess3 != NULL); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 0); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 0); sess4 = session_pool_pop(sess_pool); EXPECT_TRUE(sess4 == NULL); session_pool_push(sess_pool, sess1); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 1); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 1); session_pool_push(sess_pool, sess2); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 2); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 2); session_pool_push(sess_pool, sess3); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 3); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 3); sess1 = session_pool_pop(sess_pool); EXPECT_TRUE(sess1 != NULL); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 2); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 2); sess2 = session_pool_pop(sess_pool); EXPECT_TRUE(sess2 != NULL); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 1); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 1); sess3 = session_pool_pop(sess_pool); EXPECT_TRUE(sess3 != NULL); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 0); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 0); sess4 = session_pool_pop(sess_pool); EXPECT_TRUE(sess4 == NULL); session_pool_push(sess_pool, sess1); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 1); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 1); session_pool_push(sess_pool, sess2); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 2); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 2); session_pool_push(sess_pool, sess3); - EXPECT_TRUE(session_pool_get_count(sess_pool) == 3); + EXPECT_TRUE(session_pool_available_num(sess_pool) == 3); session_pool_free(sess_pool); }