Use CRITICAL job priority class for long running dispatcher jobs

diff --git a/src/libcharon/network/receiver.c b/src/libcharon/network/receiver.c
index e2e4d92..2887595 100644 (file)
--- a/src/libcharon/network/receiver.c
+++ b/src/libcharon/network/receiver.c
@@ -478,8 +478,8 @@ receiver_t *receiver_create()
        this->rng->get_bytes(this->rng, SECRET_LENGTH, this->secret);
        memcpy(this->secret_old, this->secret, SECRET_LENGTH);
 
-       this->job = callback_job_create((callback_job_cb_t)receive_packets,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)receive_packets,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        return &this->public;

diff --git a/src/libcharon/network/sender.c b/src/libcharon/network/sender.c
index 4177fb3..4df930b 100644 (file)
--- a/src/libcharon/network/sender.c
+++ b/src/libcharon/network/sender.c
@@ -183,8 +183,8 @@ sender_t * sender_create()
                .mutex = mutex_create(MUTEX_TYPE_DEFAULT),
                .got = condvar_create(CONDVAR_TYPE_DEFAULT),
                .sent = condvar_create(CONDVAR_TYPE_DEFAULT),
-               .job = callback_job_create((callback_job_cb_t)send_packets,
-                                                                       this, NULL, NULL),
+               .job = callback_job_create_with_prio((callback_job_cb_t)send_packets,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL),
                .send_delay = lib->settings->get_int(lib->settings,
                                                                                        "charon.send_delay", 0),
                .send_delay_type = lib->settings->get_int(lib->settings,

diff --git a/src/libcharon/plugins/dhcp/dhcp_socket.c b/src/libcharon/plugins/dhcp/dhcp_socket.c
index c98d505..5d98e5b 100644 (file)
--- a/src/libcharon/plugins/dhcp/dhcp_socket.c
+++ b/src/libcharon/plugins/dhcp/dhcp_socket.c
@@ -760,8 +760,8 @@ dhcp_socket_t *dhcp_socket_create()
                return NULL;
        }
 
-       this->job = callback_job_create((callback_job_cb_t)receive_dhcp,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)receive_dhcp,
+                                                                       this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        return &this->public;

diff --git a/src/libcharon/plugins/duplicheck/duplicheck_notify.c b/src/libcharon/plugins/duplicheck/duplicheck_notify.c
index 4e76182..b86f1ef 100644 (file)
--- a/src/libcharon/plugins/duplicheck/duplicheck_notify.c
+++ b/src/libcharon/plugins/duplicheck/duplicheck_notify.c
@@ -203,8 +203,8 @@ duplicheck_notify_t *duplicheck_notify_create()
                destroy(this);
                return NULL;
        }
-       this->job = callback_job_create((callback_job_cb_t)receive,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)receive,
+                                                                       this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        return &this->public;

diff --git a/src/libcharon/plugins/farp/farp_spoofer.c b/src/libcharon/plugins/farp/farp_spoofer.c
index a904a65..7a8ca85 100644 (file)
--- a/src/libcharon/plugins/farp/farp_spoofer.c
+++ b/src/libcharon/plugins/farp/farp_spoofer.c
@@ -189,8 +189,8 @@ farp_spoofer_t *farp_spoofer_create(farp_listener_t *listener)
                return NULL;
        }
 
-       this->job = callback_job_create((callback_job_cb_t)receive_arp,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)receive_arp,
+                                                                       this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        return &this->public;

diff --git a/src/libcharon/plugins/ha/ha_cache.c b/src/libcharon/plugins/ha/ha_cache.c
index c27cd0b..b6525a8 100644 (file)
--- a/src/libcharon/plugins/ha/ha_cache.c
+++ b/src/libcharon/plugins/ha/ha_cache.c
@@ -355,8 +355,8 @@ ha_cache_t *ha_cache_create(ha_kernel_t *kernel, ha_socket_t *socket,
        {
                /* request a resync as soon as we are up */
                lib->scheduler->schedule_job(lib->scheduler, (job_t*)
-                                               callback_job_create((callback_job_cb_t)request_resync,
-                                                                                       this, NULL, NULL), 1);
+                       callback_job_create_with_prio((callback_job_cb_t)request_resync,
+                                                                       this, NULL, NULL, JOB_PRIO_CRITICAL), 1);
        }
        return &this->public;
 }

diff --git a/src/libcharon/plugins/ha/ha_ctl.c b/src/libcharon/plugins/ha/ha_ctl.c
index 15f7824..9c99807 100644 (file)
--- a/src/libcharon/plugins/ha/ha_ctl.c
+++ b/src/libcharon/plugins/ha/ha_ctl.c
@@ -141,8 +141,8 @@ ha_ctl_t *ha_ctl_create(ha_segments_t *segments, ha_cache_t *cache)
                         strerror(errno));
        }
 
-       this->job = callback_job_create((callback_job_cb_t)dispatch_fifo,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)dispatch_fifo,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
        return &this->public;
 }

diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
index 0d0df8d..04267f5 100644 (file)
--- a/src/libcharon/plugins/ha/ha_dispatcher.c
+++ b/src/libcharon/plugins/ha/ha_dispatcher.c
@@ -872,8 +872,8 @@ ha_dispatcher_t *ha_dispatcher_create(ha_socket_t *socket,
                .kernel = kernel,
                .attr = attr,
        );
-       this->job = callback_job_create((callback_job_cb_t)dispatch,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)dispatch,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        return &this->public;

diff --git a/src/libcharon/plugins/ha/ha_segments.c b/src/libcharon/plugins/ha/ha_segments.c
index 70b8d1d..c5a1806 100644 (file)
--- a/src/libcharon/plugins/ha/ha_segments.c
+++ b/src/libcharon/plugins/ha/ha_segments.c
@@ -280,8 +280,8 @@ static job_requeue_t watchdog(private_ha_segments_t *this)
  */
 static void start_watchdog(private_ha_segments_t *this)
 {
-       this->job = callback_job_create((callback_job_cb_t)watchdog,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)watchdog,
+                                                                       this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 }
 

diff --git a/src/libcharon/plugins/ha/ha_socket.c b/src/libcharon/plugins/ha/ha_socket.c
index 0861784..c02cf10 100644 (file)
--- a/src/libcharon/plugins/ha/ha_socket.c
+++ b/src/libcharon/plugins/ha/ha_socket.c
@@ -105,8 +105,8 @@ METHOD(ha_socket_t, push, void,
                                .fd = this->fd,
                        );
 
-                       job = callback_job_create((callback_job_cb_t)send_message,
-                                                                         data, (void*)job_data_destroy, NULL);
+                       job = callback_job_create_with_prio((callback_job_cb_t)send_message,
+                                                       data, (void*)job_data_destroy, NULL, JOB_PRIO_HIGH);
                        lib->processor->queue_job(lib->processor, (job_t*)job);
                        return;
                }

diff --git a/src/libcharon/plugins/led/led_listener.c b/src/libcharon/plugins/led/led_listener.c
index 18def80..4aae2ab 100644 (file)
--- a/src/libcharon/plugins/led/led_listener.c
+++ b/src/libcharon/plugins/led/led_listener.c
@@ -156,9 +156,9 @@ static void blink_activity(private_led_listener_t *this)
                {
                        set_led(this->activity, this->activity_max);
                }
-               lib->scheduler->schedule_job_ms(lib->scheduler,
-                       (job_t*)callback_job_create((callback_job_cb_t)reset_activity_led,
-                                                                               this, NULL, NULL), this->blink_time);
+               lib->scheduler->schedule_job_ms(lib->scheduler, (job_t*)
+                       callback_job_create_with_prio((callback_job_cb_t)reset_activity_led,
+                                               this, NULL, NULL, JOB_PRIO_CRITICAL), this->blink_time);
                this->mutex->unlock(this->mutex);
        }
 }

diff --git a/src/libcharon/plugins/load_tester/load_tester_plugin.c b/src/libcharon/plugins/load_tester/load_tester_plugin.c
index 94115e3..dbdf96f 100644 (file)
--- a/src/libcharon/plugins/load_tester/load_tester_plugin.c
+++ b/src/libcharon/plugins/load_tester/load_tester_plugin.c
@@ -235,9 +235,9 @@ plugin_t *load_tester_plugin_create()
        this->running = 0;
        for (i = 0; i < this->initiators; i++)
        {
-               lib->processor->queue_job(lib->processor,
-                                       (job_t*)callback_job_create((callback_job_cb_t)do_load_test,
-                                                                                               this, NULL, NULL));
+               lib->processor->queue_job(lib->processor, (job_t*)
+                               callback_job_create_with_prio((callback_job_cb_t)do_load_test,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL));
        }
        return &this->public.plugin;
 }

diff --git a/src/libcharon/plugins/maemo/maemo_service.c b/src/libcharon/plugins/maemo/maemo_service.c
index 0e9fd8c..d6ba8fa 100644 (file)
--- a/src/libcharon/plugins/maemo/maemo_service.c
+++ b/src/libcharon/plugins/maemo/maemo_service.c
@@ -502,7 +502,8 @@ maemo_service_t *maemo_service_create()
        }
 
        lib->processor->queue_job(lib->processor,
-               (job_t*)callback_job_create((callback_job_cb_t)run, this, NULL, NULL));
+                               (job_t*)callback_job_create_with_prio((callback_job_cb_t)run,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL));
 
        return &this->public;
 }

diff --git a/src/libcharon/plugins/nm/nm_plugin.c b/src/libcharon/plugins/nm/nm_plugin.c
index f1d3be7..fb8c16f 100644 (file)
--- a/src/libcharon/plugins/nm/nm_plugin.c
+++ b/src/libcharon/plugins/nm/nm_plugin.c
@@ -134,7 +134,8 @@ plugin_t *nm_plugin_create()
        charon->keep_cap(charon, CAP_DAC_OVERRIDE);
 
        lib->processor->queue_job(lib->processor,
-                (job_t*)callback_job_create((callback_job_cb_t)run, this, NULL, NULL));
+                               (job_t*)callback_job_create_with_prio((callback_job_cb_t)run,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL));
 
        return &this->public.plugin;
 }

diff --git a/src/libcharon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c
index 8fb59d3..58f98cf 100644 (file)
--- a/src/libcharon/plugins/smp/smp.c
+++ b/src/libcharon/plugins/smp/smp.c
@@ -774,7 +774,8 @@ plugin_t *smp_plugin_create()
                return NULL;
        }
 
-       this->job = callback_job_create((callback_job_cb_t)dispatch, this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)dispatch,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        return &this->public.plugin;

diff --git a/src/libcharon/plugins/stroke/stroke_socket.c b/src/libcharon/plugins/stroke/stroke_socket.c
index d684680..74374ba 100644 (file)
--- a/src/libcharon/plugins/stroke/stroke_socket.c
+++ b/src/libcharon/plugins/stroke/stroke_socket.c
@@ -625,8 +625,8 @@ static job_requeue_t receive(private_stroke_socket_t *this)
        ctx = malloc_thing(stroke_job_context_t);
        ctx->fd = strokefd;
        ctx->this = this;
-       job = callback_job_create((callback_job_cb_t)process,
-                                                         ctx, (void*)stroke_job_context_destroy, this->job);
+       job = callback_job_create_with_prio((callback_job_cb_t)process,
+                       ctx, (void*)stroke_job_context_destroy, this->job, JOB_PRIO_HIGH);
        lib->processor->queue_job(lib->processor, (job_t*)job);
 
        return JOB_REQUEUE_FAIR;
@@ -723,8 +723,8 @@ stroke_socket_t *stroke_socket_create()
        charon->backends->add_backend(charon->backends, &this->config->backend);
        hydra->attributes->add_provider(hydra->attributes, &this->attribute->provider);
 
-       this->job = callback_job_create((callback_job_cb_t)receive,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)receive,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        return &this->public;

diff --git a/src/libcharon/plugins/uci/uci_control.c b/src/libcharon/plugins/uci/uci_control.c
index 8296c41..1fe9818 100644 (file)
--- a/src/libcharon/plugins/uci/uci_control.c
+++ b/src/libcharon/plugins/uci/uci_control.c
@@ -294,8 +294,8 @@ uci_control_t *uci_control_create()
        }
        else
        {
-               this->job = callback_job_create((callback_job_cb_t)receive,
-                                                                               this, NULL, NULL);
+               this->job = callback_job_create_with_prio((callback_job_cb_t)receive,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL);
                lib->processor->queue_job(lib->processor, (job_t*)this->job);
        }
        return &this->public;

diff --git a/src/libcharon/plugins/whitelist/whitelist_control.c b/src/libcharon/plugins/whitelist/whitelist_control.c
index 4a1fc5d..202c9a4 100644 (file)
--- a/src/libcharon/plugins/whitelist/whitelist_control.c
+++ b/src/libcharon/plugins/whitelist/whitelist_control.c
@@ -225,8 +225,8 @@ whitelist_control_t *whitelist_control_create(whitelist_listener_t *listener)
                return NULL;
        }
 
-       this->job = callback_job_create((callback_job_cb_t)receive,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)receive,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        return &this->public;

diff --git a/src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c b/src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c
index ff4f0ed..71c4bf8 100644 (file)
--- a/src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c
+++ b/src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c
@@ -2634,8 +2634,8 @@ kernel_klips_ipsec_t *kernel_klips_ipsec_create()
                return NULL;
        }
 
-       this->job = callback_job_create((callback_job_cb_t)receive_events,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)receive_events,
+                                                                       this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        return &this->public;

diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
index 8b2a1aa..23db187 100644 (file)
--- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
+++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
@@ -2321,8 +2321,8 @@ kernel_netlink_ipsec_t *kernel_netlink_ipsec_create()
                destroy(this);
                return NULL;
        }
-       this->job = callback_job_create((callback_job_cb_t)receive_events,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)receive_events,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        return &this->public;

diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
index 8315ed3..050b753 100644 (file)
--- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
+++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
@@ -1537,8 +1537,8 @@ kernel_netlink_net_t *kernel_netlink_net_create()
                return NULL;
        }
 
-       this->job = callback_job_create((callback_job_cb_t)receive_events,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)receive_events,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        if (init_address_list(this) != SUCCESS)

diff --git a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
index b252b70..e32866a 100644 (file)
--- a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
+++ b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
@@ -2172,8 +2172,8 @@ kernel_pfkey_ipsec_t *kernel_pfkey_ipsec_create()
                return NULL;
        }
 
-       this->job = callback_job_create((callback_job_cb_t)receive_events,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)receive_events,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        return &this->public;

diff --git a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
index fca46bf..5464568 100644 (file)
--- a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
+++ b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
@@ -710,8 +710,8 @@ kernel_pfroute_net_t *kernel_pfroute_net_create()
                return NULL;
        }
 
-       this->job = callback_job_create((callback_job_cb_t)receive_events,
-                                                                       this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)receive_events,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        if (init_address_list(this) != SUCCESS)

diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c b/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c
index 431cd6a..1d6237e 100644 (file)
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c
@@ -392,8 +392,8 @@ pkcs11_manager_t *pkcs11_manager_create(pkcs11_manager_token_event_t cb,
        while (enumerator->enumerate(enumerator, &entry))
        {
                query_slots(entry);
-               entry->job = callback_job_create((void*)dispatch_slot_events,
-                                                                                entry, (void*)end_dispatch, NULL);
+               entry->job = callback_job_create_with_prio((void*)dispatch_slot_events,
+                                                entry, (void*)end_dispatch, NULL, JOB_PRIO_CRITICAL);
                lib->processor->queue_job(lib->processor, (job_t*)entry->job);
        }
        enumerator->destroy(enumerator);

diff --git a/src/libstrongswan/processing/scheduler.c b/src/libstrongswan/processing/scheduler.c
index 7d9bcd7..f3cc116 100644 (file)
--- a/src/libstrongswan/processing/scheduler.c
+++ b/src/libstrongswan/processing/scheduler.c
@@ -341,7 +341,8 @@ scheduler_t * scheduler_create()
 
        this->heap = (event_t**)calloc(this->heap_size + 1, sizeof(event_t*));
 
-       this->job = callback_job_create((callback_job_cb_t)schedule, this, NULL, NULL);
+       this->job = callback_job_create_with_prio((callback_job_cb_t)schedule,
+                                                                               this, NULL, NULL, JOB_PRIO_CRITICAL);
        lib->processor->queue_job(lib->processor, (job_t*)this->job);
 
        return &this->public;