Refer to scheduler and processor via lib and not hydra.

This commit is contained in:
Tobias Brunner
2010-09-02 19:04:18 +02:00
parent e18556e9e9
commit bb381e26c6
37 changed files with 79 additions and 103 deletions
@@ -15,7 +15,6 @@
#include "stroke_control.h"
#include <hydra.h>
#include <daemon.h>
#include <processing/jobs/delete_ike_sa_job.h>
@@ -355,7 +354,7 @@ static void terminate_srcip(private_stroke_control_t *this,
}
/* schedule delete asynchronously */
hydra->processor->queue_job(hydra->processor, (job_t*)
lib->processor->queue_job(lib->processor, (job_t*)
delete_ike_sa_job_create(ike_sa->get_id(ike_sa), TRUE));
}
enumerator->destroy(enumerator);
+4 -4
View File
@@ -423,12 +423,12 @@ static void status(private_stroke_list_t *this, stroke_msg_t *msg, FILE *out, bo
}
#endif /* HAVE_MALLINFO */
fprintf(out, " worker threads: %d idle of %d,",
hydra->processor->get_idle_threads(hydra->processor),
hydra->processor->get_total_threads(hydra->processor));
lib->processor->get_idle_threads(lib->processor),
lib->processor->get_total_threads(lib->processor));
fprintf(out, " job queue load: %d,",
hydra->processor->get_job_load(hydra->processor));
lib->processor->get_job_load(lib->processor));
fprintf(out, " scheduled events: %d\n",
hydra->scheduler->get_job_load(hydra->scheduler));
lib->scheduler->get_job_load(lib->scheduler));
fprintf(out, " loaded plugins: ");
enumerator = lib->plugins->create_plugin_enumerator(lib->plugins);
while (enumerator->enumerate(enumerator, &plugin))
+2 -2
View File
@@ -586,7 +586,7 @@ static job_requeue_t receive(private_stroke_socket_t *this)
ctx->this = this;
job = callback_job_create((callback_job_cb_t)process,
ctx, (void*)stroke_job_context_destroy, this->job);
hydra->processor->queue_job(hydra->processor, (job_t*)job);
lib->processor->queue_job(lib->processor, (job_t*)job);
return JOB_REQUEUE_FAIR;
}
@@ -684,7 +684,7 @@ stroke_socket_t *stroke_socket_create()
this->job = callback_job_create((callback_job_cb_t)receive,
this, NULL, NULL);
hydra->processor->queue_job(hydra->processor, (job_t*)this->job);
lib->processor->queue_job(lib->processor, (job_t*)this->job);
return &this->public;
}