SilcSchedule schedule)
{
if (!schedule) {
- silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
- return FALSE;
+ schedule = silc_schedule_get_global();
+ if (!schedule) {
+ silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+ return FALSE;
+ }
}
fsm->fsm_context = fsm_context;
SILC_LOG_DEBUG(("Initializing new thread %p (%s)",
thread, real_thread ? "real" : "FSM"));
- SILC_ASSERT(!fsm->thread);
+ SILC_VERIFY(!fsm->thread);
thread->fsm_context = thread_context;
thread->state_context = NULL;
{
SilcFSM f = fsm;
- SILC_ASSERT(!f->finished);
+ SILC_VERIFY(!f->finished);
f->started = FALSE;
f->finished = TRUE;
SilcFSM silc_fsm_get_machine(SilcFSMThread thread)
{
- SILC_ASSERT(thread->thread);
+ SILC_VERIFY(thread->thread);
return (SilcFSM)thread->u.t.fsm;
}
{
SilcFSM t = thread;
- SILC_ASSERT(t->thread);
+ SILC_VERIFY(t->thread);
t->u.t.event = silc_fsm_event_alloc(t->u.t.fsm);
if (!t->u.t.event)
void silc_fsm_event_init(SilcFSMEvent event, SilcFSM fsm)
{
SILC_LOG_DEBUG(("Initializing event %p", event));
- SILC_ASSERT(!fsm->thread);
+ SILC_VERIFY(!fsm->thread);
memset(event, 0, sizeof(*event));
event->fsm = fsm;
event->refcnt = 0;
/* We allocate new SilcSchedule for the FSM, as the old SilcSchedule
cannot be used in this thread. Application may still use it if it
wants but we use our own. */
- fsm->schedule = silc_schedule_init(0, old, silc_schedule_get_stack(old));
+ fsm->schedule = silc_schedule_init(0, old, silc_schedule_get_stack(old), old);
if (silc_unlikely(!fsm->schedule)) {
fsm->schedule = old;
return NULL;
}
+ /* The new scheduler is a global scheduler in this thread */
+ silc_schedule_set_global(fsm->schedule);
+
/* Start the FSM thread */
if (silc_unlikely(!silc_schedule_task_add_timeout(fsm->schedule,
silc_fsm_run, fsm, 0, 0))) {
/* Run the scheduler */
silc_schedule(fsm->schedule);
+ /* Reset global scheduler */
+ silc_schedule_set_global(NULL);
+
/* Free resources */
silc_schedule_uninit(fsm->schedule);