Refer to scheduler via hydra and not charon.

This commit is contained in:
Tobias Brunner
2010-09-02 19:01:24 +02:00
parent 8c387909eb
commit 61e8e73206
14 changed files with 32 additions and 29 deletions
@@ -142,7 +142,7 @@ METHOD(listener_t, child_updown, bool,
* callback, but from a different thread. we also delay it to avoid
* a race condition during a regular shutdown */
job = callback_job_create(shutdown_callback, NULL, NULL, NULL);
charon->scheduler->schedule_job(charon->scheduler, (job_t*)job, 1);
hydra->scheduler->schedule_job(hydra->scheduler, (job_t*)job, 1);
return FALSE;
}
}
+1 -1
View File
@@ -346,7 +346,7 @@ static job_requeue_t send_status(private_ha_segments_t *this)
message->destroy(message);
/* schedule next invocation */
charon->scheduler->schedule_job_ms(charon->scheduler, (job_t*)
hydra->scheduler->schedule_job_ms(hydra->scheduler, (job_t*)
callback_job_create((callback_job_cb_t)
send_status, this, NULL, NULL),
this->heartbeat_delay);
@@ -1511,7 +1511,7 @@ static void schedule_expire(private_kernel_klips_ipsec_t *this,
expire->reqid = reqid;
expire->type = type;
job = callback_job_create((callback_job_cb_t)sa_expires, expire, free, NULL);
charon->scheduler->schedule_job(charon->scheduler, (job_t*)job, time);
hydra->scheduler->schedule_job(hydra->scheduler, (job_t*)job, time);
}
METHOD(kernel_ipsec_t, get_spi, status_t,
@@ -241,7 +241,7 @@ static void fire_roam_job(private_kernel_netlink_net_t *this, bool address)
now.tv_usec -= 1000000;
}
this->last_roam = now;
charon->scheduler->schedule_job_ms(charon->scheduler,
hydra->scheduler->schedule_job_ms(hydra->scheduler,
(job_t*)roam_job_create(address), ROAM_DELAY);
}
}
@@ -169,7 +169,7 @@ static void fire_roam_job(private_kernel_pfroute_net_t *this, bool address)
now.tv_usec -= 1000000;
}
this->last_roam = now;
charon->scheduler->schedule_job_ms(charon->scheduler,
hydra->scheduler->schedule_job_ms(hydra->scheduler,
(job_t*)roam_job_create(address), ROAM_DELAY);
}
}
+1 -1
View File
@@ -428,7 +428,7 @@ static void status(private_stroke_list_t *this, stroke_msg_t *msg, FILE *out, bo
fprintf(out, " job queue load: %d,",
hydra->processor->get_job_load(hydra->processor));
fprintf(out, " scheduled events: %d\n",
charon->scheduler->get_job_load(charon->scheduler));
hydra->scheduler->get_job_load(hydra->scheduler));
fprintf(out, " loaded plugins: ");
enumerator = lib->plugins->create_plugin_enumerator(lib->plugins);
while (enumerator->enumerate(enumerator, &plugin))