noselasd/libucore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Name uc_timers_XXX consistently

Browse Source
This commit is contained in:
Nils O. Selåsdal
2013-05-28 01:05:38 +02:00
parent ecc9218e7c
commit 1e34c11265
6 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/iomux_test3.c
+3 -3
View File
@@ -100,11 +100,11 @@ void timer_cb(struct UCTimers *timers, struct UCTimer *timer)
struct UCTimer *t = calloc(1, sizeof *t);
t->callback = timer_cb;
t->cookie_int = timer->cookie_int + 1;
uc_timer_add(timers, t, 5,5);
uc_timers_add(timers, t, 5,5);
t = calloc(1, sizeof *t);
t->callback = timer_cb;
t->cookie_int = timer->cookie_int + 2;
uc_timer_add(timers, t, 5,4);
uc_timers_add(timers, t, 5,4);
}
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
struct IOMux *mux = iomux_create(IOMUX_TYPE_EPOLL);
iomux_register_fd(mux, &copy_ctx.in);
uc_timer_add(iomux_get_timers(mux), &timer, 5, 0);
uc_timers_add(iomux_get_timers(mux), &timer, 5, 0);
iomux_run(mux);
test/test_timers.c
+11 -11
View File
@@ -18,13 +18,13 @@ static void timer_test_cb_add(struct UCTimers *timers, struct UCTimer *timer)
{
struct TimerTest *tt = timer->cookie_ptr;
tt->cnt++;
uc_timer_add(timers, timer, 10, 0);
uc_timers_add(timers, timer, 10, 0);
}
static void timer_test_cb_remove(struct UCTimers *timers, struct UCTimer *timer)
{
struct UCTimer *timer2 = timer->cookie_ptr;
uc_timer_remove(timers, timer2);
uc_timers_remove(timers, timer2);
}
static void common_init(struct UCoreSettableClock *clk,
@@ -54,7 +54,7 @@ START_TEST (test_timers_simple)
timer.callback = timer_test_cb;
uc_timer_add(&timers, &timer, 10, 0);
uc_timers_add(&timers, &timer, 10, 0);
//5 seconds into the future, no timer should fire
t += 5;
@@ -62,7 +62,7 @@ START_TEST (test_timers_simple)
rc = uc_timers_run(&timers);
fail_if(rc != 0);
fail_if(tt.cnt != 0);
fail_if(uc_timer_count(&timers) != 1);
fail_if(uc_timers_count(&timers) != 1);
//10 seconds into the future, our timer should fire
t += 5;
@@ -77,7 +77,7 @@ START_TEST (test_timers_simple)
rc = uc_timers_run(&timers);
fail_if(rc != 0);
fail_if(tt.cnt != 1);
fail_if(uc_timer_count(&timers) != 0);
fail_if(uc_timers_count(&timers) != 0);
fail_if(uc_timer_running(&timer) != 0);
END_TEST
@@ -94,7 +94,7 @@ START_TEST (test_timers_add_from_callback)
timer.callback = timer_test_cb_add;
uc_timer_add(&timers, &timer, 10, 0);
uc_timers_add(&timers, &timer, 10, 0);
//10 seconds into the future, our timer should fire
t += 10;
@@ -112,7 +112,7 @@ START_TEST (test_timers_add_from_callback)
fail_if(tt.cnt != 2);
fail_if(uc_timer_running(&timer) == 0);
fail_if(uc_timer_count(&timers) != 1);
fail_if(uc_timers_count(&timers) != 1);
END_TEST
@@ -133,10 +133,10 @@ START_TEST (test_timers_remove_from_callback)
memset(&timer2, 0, sizeof timer2);
timer2.callback = timer_test_cb;
uc_timer_add(&timers, &timer, 5, 0);
uc_timer_add(&timers, &timer2, 10, 0);
uc_timers_add(&timers, &timer, 5, 0);
uc_timers_add(&timers, &timer2, 10, 0);
fail_if(uc_timer_count(&timers) != 2);
fail_if(uc_timers_count(&timers) != 2);
rc = uc_timers_first(&timers, &tv);
fail_if(rc != 0);
fail_if(tv.tv_sec != TEST_TIMER_START + 5);
@@ -152,7 +152,7 @@ START_TEST (test_timers_remove_from_callback)
//and our timer2 should be removed, and timer has fired so it
//should be removed too
fail_if(uc_timer_count(&timers) != 0);
fail_if(uc_timers_count(&timers) != 0);
fail_if(uc_timer_running(&timer) != 0);
fail_if(uc_timer_running(&timer2) != 0);
rc = uc_timers_first(&timers, &tv);
test/timers.c
+6 -6
View File
@@ -25,7 +25,7 @@ void mystruct1_cb(struct UCTimers *timers, struct UCTimer *timer)
struct MyStruct *mystruct = CONTAINER_OF(timer, struct MyStruct, timer);
TRACEF("MyStruct1 timer: %s\n", mystruct->str);
uc_timer_add(timers, timer, 1, 0);
uc_timers_add(timers, timer, 1, 0);
}
void mystruct2_cb(struct UCTimers *timers, struct UCTimer *timer)
@@ -33,7 +33,7 @@ void mystruct2_cb(struct UCTimers *timers, struct UCTimer *timer)
struct MyStruct *mystruct = timer->cookie_ptr;
TRACEF("MyStruct2 timer: %s\n", mystruct->str);
uc_timer_add(timers, timer, 5, 0);
uc_timers_add(timers, timer, 5, 0);
}
int main(int argc, char *argv[])
@@ -63,10 +63,10 @@ int main(int argc, char *argv[])
};
uc_timers_init(&timers);
uc_timer_add(&timers, &t1, 2, 0);
uc_timer_add(&timers, &t2, 5, 0);
uc_timer_add(&timers, &my_struct1.timer, 10, 0);
uc_timer_add(&timers, &my_struct2.timer, 10, 0);
uc_timers_add(&timers, &t1, 2, 0);
uc_timers_add(&timers, &t2, 5, 0);
uc_timers_add(&timers, &my_struct1.timer, 10, 0);
uc_timers_add(&timers, &my_struct2.timer, 10, 0);
for(;;) {
uc_timers_run(&timers);
test/udp_heartbeat.c
+2 -2
View File
@@ -74,7 +74,7 @@ void peer_timer_cb(struct UCTimers *timers, struct UCTimer *timer)
struct HBContext *ctx = timer->cookie_ptr;
time_t now;
uc_timer_add(timers, timer, PEER_HB_MISS , 0);
uc_timers_add(timers, timer, PEER_HB_MISS , 0);
now = time(NULL);
if (now - peer->last_ok > PEER_HB_MISS * PEER_HB_SEC) {
@@ -106,7 +106,7 @@ void peer_add_addr(struct HBContext *ctx, const struct sockaddr_in *addr)
sec = rand() % PEER_HB_SEC;
usec = rand() % 1000000;
uc_timer_add(iomux_get_timers(ctx->mux), &peer->timer, sec, usec);
uc_timers_add(iomux_get_timers(ctx->mux), &peer->timer, sec, usec);
}
void peer_add(struct HBContext *ctx, const char *host, uint16_t port)