Update session timer

This commit is contained in:
luwenpeng
2024-03-29 19:44:20 +08:00
parent 8e527a0f4c
commit 772860c1be
15 changed files with 151 additions and 211 deletions

View File

@@ -3,62 +3,42 @@
#include "session_timer.h"
#include "session_private.h"
static void session_expire(struct session *sess, void *arg)
{
printf("=== session %lu expired ===\n", session_get_id(sess));
}
TEST(SESSION_TIMER, ADD_DEL)
{
struct session sess;
struct session_timer *timer = session_timer_new();
EXPECT_TRUE(timer != NULL);
session_init(&sess);
session_set_id(&sess, 1);
session_set_expirecb(&sess, session_expire, NULL, 1000);
session_timer_add(timer, &sess);
session_timer_del(timer, &sess);
session_timer_free(timer);
}
TEST(SESSION_TIMER, EXPIRE)
{
struct session *sess = NULL;
struct session sess1;
struct session sess2;
struct session sess3;
struct session_timer *timer = session_timer_new();
struct session_timer *timer = session_timer_new(100);
EXPECT_TRUE(timer != NULL);
session_init(&sess1);
session_init(&sess2);
session_init(&sess3);
session_set_id(&sess1, 1);
session_set_id(&sess2, 2);
session_set_id(&sess3, 3);
session_set_expirecb(&sess1, session_expire, NULL, 5);
session_set_expirecb(&sess2, session_expire, NULL, 5);
session_set_expirecb(&sess3, session_expire, NULL, 10);
session_timer_add(timer, &sess1);
session_timer_add(timer, &sess2);
session_timer_add(timer, &sess3);
session_timer_add(timer, &sess1, 100 + 5);
session_timer_add(timer, &sess2, 100 + 5);
session_timer_add(timer, &sess3, 100 + 10);
for (uint64_t abs_current_ts = 0; abs_current_ts < 15; abs_current_ts++)
{
printf("current timestamp %lu\n", abs_current_ts);
do
{
sess = session_timer_expire(timer, abs_current_ts);
if (sess != NULL)
{
session_run_expirecb(sess);
}
} while (sess);
}
// not expire
sess = session_timer_expire(timer, 100 + 4);
EXPECT_TRUE(sess == NULL);
// expire
sess = session_timer_expire(timer, 100 + 5);
EXPECT_TRUE(sess == &sess1);
sess = session_timer_expire(timer, 100 + 5);
EXPECT_TRUE(sess == &sess2);
// not expire
sess = session_timer_expire(timer, 100 + 5);
EXPECT_TRUE(sess == NULL);
sess = session_timer_expire(timer, 100 + 9);
EXPECT_TRUE(sess == NULL);
// expire
sess = session_timer_expire(timer, 100 + 10);
EXPECT_TRUE(sess == &sess3);
// not expire
sess = session_timer_expire(timer, 100 + 10);
EXPECT_TRUE(sess == NULL);
session_timer_free(timer);
}
@@ -69,40 +49,65 @@ TEST(SESSION_TIMER, BEFORE_EXPIRE_DEL)
struct session sess1;
struct session sess2;
struct session sess3;
struct session_timer *timer = session_timer_new();
struct session_timer *timer = session_timer_new(1);
EXPECT_TRUE(timer != NULL);
session_init(&sess1);
session_init(&sess2);
session_init(&sess3);
session_set_id(&sess1, 1);
session_set_id(&sess2, 2);
session_set_id(&sess3, 3);
session_set_expirecb(&sess1, session_expire, NULL, 5);
session_set_expirecb(&sess2, session_expire, NULL, 5);
session_set_expirecb(&sess3, session_expire, NULL, 10);
session_timer_add(timer, &sess1);
session_timer_add(timer, &sess2);
session_timer_add(timer, &sess3);
session_timer_add(timer, &sess1, 100 + 5);
session_timer_add(timer, &sess2, 100 + 5);
session_timer_add(timer, &sess3, 100 + 10);
for (uint64_t abs_current_ts = 0; abs_current_ts < 15; abs_current_ts++)
{
printf("current timestamp %lu\n", abs_current_ts);
if (abs_current_ts == 2)
{
printf("delete timer 2\n");
session_timer_del(timer, &sess2);
}
do
{
sess = session_timer_expire(timer, abs_current_ts);
if (sess != NULL)
{
session_run_expirecb(sess);
}
} while (sess);
}
// not expire
sess = session_timer_expire(timer, 100 + 4);
EXPECT_TRUE(sess == NULL);
// del sess1
session_timer_del(timer, &sess1);
// expire
sess = session_timer_expire(timer, 100 + 5);
EXPECT_TRUE(sess == &sess2);
sess = session_timer_expire(timer, 100 + 5);
EXPECT_TRUE(sess == NULL);
// expire
sess = session_timer_expire(timer, 100 + 10);
EXPECT_TRUE(sess == &sess3);
// not expire
sess = session_timer_expire(timer, 100 + 10);
EXPECT_TRUE(sess == NULL);
session_timer_free(timer);
}
TEST(SESSION_TIMER, AFTER_EXPIRE_DEL)
{
struct session *sess = NULL;
struct session sess1;
struct session sess2;
struct session sess3;
struct session_timer *timer = session_timer_new(1);
EXPECT_TRUE(timer != NULL);
session_init(&sess1);
session_init(&sess2);
session_init(&sess3);
session_timer_add(timer, &sess1, 100 + 5);
session_timer_add(timer, &sess2, 100 + 5);
session_timer_add(timer, &sess3, 100 + 10);
// expire
sess = session_timer_expire(timer, 100 + 5);
EXPECT_TRUE(sess == &sess1);
// del sess2
session_timer_del(timer, &sess2);
// not expire
sess = session_timer_expire(timer, 100 + 5);
EXPECT_TRUE(sess == NULL);
// expire
sess = session_timer_expire(timer, 100 + 10);
EXPECT_TRUE(sess == &sess3);
session_timer_free(timer);
}
@@ -112,43 +117,32 @@ TEST(SESSION_TIMER, BEFORE_EXPIRE_UPDATE)
struct session *sess = NULL;
struct session sess1;
struct session sess2;
struct session sess3;
struct session_timer *timer = session_timer_new();
struct session_timer *timer = session_timer_new(100);
EXPECT_TRUE(timer != NULL);
session_init(&sess1);
session_init(&sess2);
session_init(&sess3);
session_set_id(&sess1, 1);
session_set_id(&sess2, 2);
session_set_id(&sess3, 3);
session_set_expirecb(&sess1, session_expire, NULL, 5);
session_set_expirecb(&sess2, session_expire, NULL, 5);
session_set_expirecb(&sess3, session_expire, NULL, 10);
session_timer_add(timer, &sess1);
session_timer_add(timer, &sess2);
session_timer_add(timer, &sess3);
session_timer_add(timer, &sess1, 100 + 5);
session_timer_add(timer, &sess2, 100 + 10);
for (uint64_t abs_current_ts = 0; abs_current_ts < 15; abs_current_ts++)
{
printf("current timestamp %lu\n", abs_current_ts);
if (abs_current_ts == 2)
{
printf("update timer 2\n");
session_timer_del(timer, &sess2);
session_set_expirecb(&sess2, session_expire, NULL, 8);
session_timer_add(timer, &sess2);
}
do
{
sess = session_timer_expire(timer, abs_current_ts);
if (sess != NULL)
{
session_run_expirecb(sess);
}
} while (sess);
}
// not expire
sess = session_timer_expire(timer, 100 + 4);
EXPECT_TRUE(sess == NULL);
// expire
sess = session_timer_expire(timer, 100 + 5);
EXPECT_TRUE(sess == &sess1);
// not expire
sess = session_timer_expire(timer, 100 + 5);
EXPECT_TRUE(sess == NULL);
// update sess2
session_timer_update(timer, &sess2, 100 + 20);
// not expire
sess = session_timer_expire(timer, 100 + 19);
EXPECT_TRUE(sess == NULL);
// expire
sess = session_timer_expire(timer, 100 + 20);
EXPECT_TRUE(sess == &sess2);
session_timer_free(timer);
}
@@ -157,20 +151,16 @@ TEST(SESSION_TIMER, NEXT_EXPIRE_INTERVAL)
{
struct session sess1;
struct session sess2;
struct session_timer *timer = session_timer_new();
struct session_timer *timer = session_timer_new(100);
EXPECT_TRUE(timer != NULL);
session_init(&sess1);
session_init(&sess2);
session_set_id(&sess1, 1);
session_set_id(&sess2, 2);
session_set_expirecb(&sess1, session_expire, NULL, 1000);
session_set_expirecb(&sess2, session_expire, NULL, 1000);
EXPECT_TRUE(session_timer_next_expire_interval(timer) == UINT64_MAX);
session_timer_add(timer, &sess1);
session_timer_add(timer, &sess2);
session_timer_add(timer, &sess1, 1000);
session_timer_add(timer, &sess2, 1000);
EXPECT_TRUE(session_timer_next_expire_interval(timer) < UINT64_MAX);
EXPECT_TRUE(session_timer_expire(timer, 900) == NULL);