X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Ftests%2Ftest_silcfsm.c;h=782165f65c7ea09298259afa8ee40ca9e96487f1;hb=e7b6c157b80152bf9fb9266e6bdd93f9fb0db776;hp=04cd98067711dc29014b8ade1128ca17a4fd11bd;hpb=d130c376d5e2475fc3cbf30b9fe70d6274f4b7ea;p=silc.git diff --git a/lib/silcutil/tests/test_silcfsm.c b/lib/silcutil/tests/test_silcfsm.c index 04cd9806..782165f6 100644 --- a/lib/silcutil/tests/test_silcfsm.c +++ b/lib/silcutil/tests/test_silcfsm.c @@ -11,7 +11,7 @@ typedef struct FooStruct *Foo; typedef struct { SilcFSMThreadStruct thread; - SilcFSMSemaStruct sema; + SilcFSMEventStruct sema; SilcBool finished; int rounds; Foo f; @@ -22,13 +22,16 @@ struct FooStruct { SilcFSM fsm; SilcFSMThreadStruct thread; int timeout; - SilcFSMSemaStruct sema; + SilcFSMEventStruct sema; + SilcFSMEventStruct wait2; SilcSchedule schedule; Callback cb; void *cb_context; T threads[NUM_THREADS]; T threads2[NUM_THREADS]; int c; + int got_wait1 : 1; + int got_wait2 : 1; }; SILC_FSM_STATE(test_st_start); @@ -44,6 +47,11 @@ SILC_FSM_STATE(test_st_ninth); SILC_FSM_STATE(test_st_tenth); SILC_FSM_STATE(test_st_finish); +SILC_FSM_STATE(test_st_wait1); +SILC_FSM_STATE(test_st_wait2); +SILC_FSM_STATE(test_st_signal1); +SILC_FSM_STATE(test_st_signal1_check); + SILC_FSM_STATE(test_thread_st_start); SILC_FSM_STATE(test_thread_st_finish); SILC_FSM_STATE(test_thread2_st_start); @@ -51,6 +59,12 @@ SILC_FSM_STATE(test_thread2_st_finish); SILC_FSM_STATE(test_thread3_st_start); SILC_FSM_STATE(test_thread4_st_start); +static void test_fsm_destr(SilcFSMThread thread, void *thread_context, + void *user_context) +{ + silc_fsm_free(thread); +} + SILC_TASK_CALLBACK(async_call_timeout) { Foo f = context; @@ -141,6 +155,7 @@ SILC_FSM_STATE(test_st_third) SILC_FSM_STATE(test_st_fourth) { Foo f = fsm_context; + SilcFSMThread t; SILC_LOG_DEBUG(("test_st_fourth")); @@ -152,12 +167,64 @@ SILC_FSM_STATE(test_st_fourth) /*** Start thread */ silc_fsm_start(&f->thread, test_thread_st_start); + SILC_LOG_DEBUG(("Creating two waiting threads")); + silc_fsm_event_init(&f->wait2, fsm); + t = silc_fsm_thread_alloc(fsm, f, test_fsm_destr, NULL, FALSE); + silc_fsm_start(t, test_st_wait1); + t = silc_fsm_thread_alloc(fsm, f, test_fsm_destr, NULL, FALSE); + silc_fsm_start(t, test_st_wait2); + + SILC_LOG_DEBUG(("Create signaller thread")); + t = silc_fsm_thread_alloc(fsm, f, test_fsm_destr, NULL, FALSE); + silc_fsm_start(t, test_st_signal1); + /** Waiting thread to terminate */ SILC_LOG_DEBUG(("Waiting for thread to terminate")); silc_fsm_next(fsm, test_st_fifth); SILC_FSM_THREAD_WAIT(&f->thread); } +SILC_FSM_STATE(test_st_wait1) +{ + Foo f = fsm_context; + + SILC_LOG_DEBUG(("Waiter 1")); + SILC_FSM_EVENT_WAIT(&f->wait2); + SILC_LOG_DEBUG(("Waiter 1 signalled")); + f->got_wait1 = 1; + return SILC_FSM_FINISH; +} + +SILC_FSM_STATE(test_st_wait2) +{ + Foo f = fsm_context; + + SILC_LOG_DEBUG(("Waiter 2")); + SILC_FSM_EVENT_WAIT(&f->wait2); + SILC_LOG_DEBUG(("Waiter 2 signalled")); + f->got_wait2 = 1; + return SILC_FSM_FINISH; +} + +SILC_FSM_STATE(test_st_signal1) +{ + Foo f = fsm_context; + + SILC_LOG_DEBUG(("Signaller 1")); + SILC_FSM_EVENT_SIGNAL(&f->wait2); + silc_fsm_next_later(fsm, test_st_signal1_check, 0, 500000); + return SILC_FSM_WAIT;; +} + +SILC_FSM_STATE(test_st_signal1_check) +{ + Foo f = fsm_context; + + SILC_LOG_DEBUG(("Signal check")); + assert(f->got_wait1 && f->got_wait2); + return SILC_FSM_FINISH; +} + SILC_FSM_STATE(test_thread_st_start) { Foo f = fsm_context; @@ -187,8 +254,8 @@ SILC_FSM_STATE(test_st_fifth) f->timeout = 7; - SILC_LOG_DEBUG(("Creating FSM semaphore")); - silc_fsm_sema_init(&f->sema, fsm, 0); + SILC_LOG_DEBUG(("Creating FSM event")); + silc_fsm_event_init(&f->sema, fsm); SILC_LOG_DEBUG(("Creating FSM thread")); silc_fsm_thread_init(&f->thread, fsm, f, NULL, NULL, TRUE); @@ -198,7 +265,7 @@ SILC_FSM_STATE(test_st_fifth) /** Waiting thread to terminate, timeout */ SILC_LOG_DEBUG(("Waiting for thread to terminate for 5 seconds")); silc_fsm_next(fsm, test_st_sixth); - SILC_FSM_SEMA_TIMEDWAIT(&f->sema, 5, 0, NULL); + SILC_FSM_EVENT_TIMEDWAIT(&f->sema, 5, 0, NULL); return SILC_FSM_CONTINUE; } @@ -220,7 +287,7 @@ SILC_FSM_STATE(test_thread2_st_finish) SILC_LOG_DEBUG(("test_thread2_st_finish")); SILC_LOG_DEBUG(("Post semaphore")); - SILC_FSM_SEMA_POST(&f->sema); + SILC_FSM_EVENT_SIGNAL(&f->sema); SILC_LOG_DEBUG(("Finishing the thread")); return SILC_FSM_FINISH; @@ -243,7 +310,7 @@ SILC_FSM_STATE(test_thread3_st_start) T *t = fsm_context; if (t->rounds == 0) { - SILC_FSM_SEMA_POST(&t->sema); + SILC_FSM_EVENT_SIGNAL(&t->sema); return SILC_FSM_FINISH; } @@ -266,7 +333,7 @@ SILC_FSM_STATE(test_st_seventh) for (i = 0; i < NUM_THREADS; i++) { f->threads[i].rounds = 10; f->threads[i].f = f; - silc_fsm_sema_init(&f->threads[i].sema, fsm, 0); + silc_fsm_event_init(&f->threads[i].sema, fsm); silc_fsm_thread_init(&f->threads[i].thread, fsm, &f->threads[i], NULL, NULL, FALSE); silc_fsm_start(&f->threads[i].thread, test_thread3_st_start); @@ -284,7 +351,7 @@ SILC_FSM_STATE(test_st_eighth) for (i = 0; i < NUM_THREADS; i++) { if (f->threads[i].finished == FALSE) { - SILC_FSM_SEMA_WAIT(&f->threads[i].sema); + SILC_FSM_EVENT_WAIT(&f->threads[i].sema); f->threads[i].finished = TRUE; } } @@ -301,7 +368,7 @@ SILC_FSM_STATE(test_thread4_st_start) T *t = fsm_context; if (t->rounds == 0) { - SILC_FSM_SEMA_POST(&t->sema); + SILC_FSM_EVENT_SIGNAL(&t->sema); return SILC_FSM_FINISH; } @@ -319,14 +386,14 @@ SILC_FSM_STATE(test_st_ninth) SILC_LOG_DEBUG(("test_st_ninth")); - SILC_LOG_DEBUG(("Creating FSM semaphore")); - silc_fsm_sema_init(&f->sema, fsm, NUM_THREADS + 1); + SILC_LOG_DEBUG(("Creating FSM event")); + silc_fsm_event_init(&f->sema, fsm); SILC_LOG_DEBUG(("Creating %d real FSM threads", NUM_THREADS)); for (i = 0; i < NUM_THREADS; i++) { f->threads2[i].rounds = 10; f->threads2[i].f = f; - silc_fsm_sema_init(&f->threads2[i].sema, fsm, 0); + silc_fsm_event_init(&f->threads2[i].sema, fsm); silc_fsm_thread_init(&f->threads2[i].thread, fsm, &f->threads2[i], NULL, NULL, TRUE); silc_fsm_start(&f->threads2[i].thread, test_thread4_st_start); @@ -344,7 +411,7 @@ SILC_FSM_STATE(test_st_tenth) for (i = 0; i < NUM_THREADS; i++) if (f->threads2[i].finished == FALSE) { - SILC_FSM_SEMA_WAIT(&f->threads2[i].sema); + SILC_FSM_EVENT_WAIT(&f->threads2[i].sema); f->threads2[i].finished = TRUE; } @@ -383,48 +450,11 @@ int main(int argc, char **argv) silc_log_debug(TRUE); silc_log_debug_hexdump(TRUE); silc_log_quick(TRUE); - silc_log_set_debug_string("*fsm*,*async*"); + silc_log_set_debug_string("*fsm*,*async*,*errno*"); } -{ -#define SSILC_GET32_MSB(l, cp) \ -do { \ - (l) = ((SilcUInt32)(SilcUInt8)(cp)[3]) << 24 \ - | ((SilcUInt32)(SilcUInt8)(cp)[2] << 16) \ - | ((SilcUInt32)(SilcUInt8)(cp)[1] << 8) \ - | ((SilcUInt32)(SilcUInt8)(cp)[0]); \ -} while(0) - unsigned char tmp[8], tmp2[8]; - SilcUInt32 t1, t2, t3, t4; - - tmp[0] = 0x11; - tmp[1] = 0x22; - tmp[2] = 0x33; - tmp[3] = 0x44; - tmp[4] = 0x55; - tmp[5] = 0x66; - tmp[6] = 0x77; - tmp[7] = 0x88; - - SILC_LOG_HEXDUMP(("DATA"), tmp, 4); - - SILC_GET32_LSB(t1, tmp); - SILC_LOG_DEBUG(("GET_LSB: %x", t1)); - - SSILC_GET32_MSB(t1, tmp); - SILC_LOG_DEBUG(("GET_MSB: %x", t1)); - - SILC_PUT32_LSB(t1, tmp2); - SILC_LOG_HEXDUMP(("PUT_LSB"), tmp2, 4); - - SILC_PUT32_MSB(t1, tmp2); - SILC_LOG_HEXDUMP(("PUT_MSB"), tmp2, 4); - - exit(1); -} - SILC_LOG_DEBUG(("Allocating scheduler")); - schedule = silc_schedule_init(0, NULL); + schedule = silc_schedule_init(0, NULL, NULL); f = silc_calloc(1, sizeof(*f)); if (!f)