Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / pathd / path_pcep_controller.c

diff --git a/pathd/path_pcep_controller.c b/pathd/path_pcep_controller.c
index 92ab5a63bd716bb62d774bb8826af12dd47282d8..a00a114086685def86f9ede261da76a9469889fa 100644 (file)
--- a/pathd/path_pcep_controller.c
+++ b/pathd/path_pcep_controller.c
@@ -152,7 +152,7 @@ static const char *timeout_type_name(enum pcep_ctrl_timeout_type type);
 
 /* ------------ API Functions Called from Main Thread ------------ */
 
-int pcep_ctrl_initialize(struct thread_master *main_thread,
+int pcep_ctrl_initialize(struct event_loop *main_thread,
                         struct frr_pthread **fpt,
                         pcep_main_event_handler_t event_handler)
 {
@@ -319,8 +319,8 @@ int pcep_ctrl_send_error(struct frr_pthread *fpt, int pcc_id,
 
 int pcep_ctrl_halt_cb(struct frr_pthread *fpt, void **res)
 {
-       thread_add_event(fpt->master, pcep_thread_finish_event_handler,
-                        (void *)fpt, 0, NULL);
+       event_add_event(fpt->master, pcep_thread_finish_event_handler,
+                       (void *)fpt, 0, NULL);
        pthread_join(fpt->thread, res);
 
        return 0;
@@ -328,7 +328,7 @@ int pcep_ctrl_halt_cb(struct frr_pthread *fpt, void **res)
 
 void pcep_refine_path_event_cb(struct event *thread)
 {
-       struct pcep_refine_path_event_data *data = THREAD_ARG(thread);
+       struct pcep_refine_path_event_data *data = EVENT_ARG(thread);
        assert(data != NULL);
        struct ctrl_state *ctrl_state = data->ctrl_state;
        struct path *path = data->path;
@@ -390,7 +390,7 @@ void pcep_thread_cancel_timer(struct event **thread)
                return;
        }
 
-       struct pcep_ctrl_timer_data *data = THREAD_ARG(*thread);
+       struct pcep_ctrl_timer_data *data = EVENT_ARG(*thread);
        PCEP_DEBUG("Timer %s / %s canceled", timer_type_name(data->timer_type),
                   timeout_type_name(data->timeout_type));
        if (data != NULL) {
@@ -398,9 +398,9 @@ void pcep_thread_cancel_timer(struct event **thread)
        }
 
        if ((*thread)->master->owner == pthread_self()) {
-               thread_cancel(thread);
+               event_cancel(thread);
        } else {
-               thread_cancel_async((*thread)->master, thread, NULL);
+               event_cancel_async((*thread)->master, thread, NULL);
        }
 }
 
@@ -469,8 +469,8 @@ int pcep_thread_refine_path(struct ctrl_state *ctrl_state, int pcc_id,
        data->continue_lsp_update_handler = cb;
        data->payload = payload;
 
-       thread_add_event(ctrl_state->main, pcep_refine_path_event_cb,
-                        (void *)data, 0, NULL);
+       event_add_event(ctrl_state->main, pcep_refine_path_event_cb,
+                       (void *)data, 0, NULL);
        return 0;
 }
 
@@ -496,7 +496,7 @@ void pcep_thread_path_refined_event(struct ctrl_state *ctrl_state,
 void pcep_thread_finish_event_handler(struct event *thread)
 {
        int i;
-       struct frr_pthread *fpt = THREAD_ARG(thread);
+       struct frr_pthread *fpt = EVENT_ARG(thread);
        struct ctrl_state *ctrl_state = fpt->data;
 
        assert(ctrl_state != NULL);
@@ -535,8 +535,8 @@ int schedule_thread_timer_with_cb(struct ctrl_state *ctrl_state, int pcc_id,
        data->pcc_id = pcc_id;
        data->payload = payload;
 
-       thread_add_timer(ctrl_state->self, timer_cb, (void *)data, delay,
-                        thread);
+       event_add_timer(ctrl_state->self, timer_cb, (void *)data, delay,
+                       thread);
 
        return 0;
 }
@@ -554,7 +554,7 @@ int schedule_thread_timer(struct ctrl_state *ctrl_state, int pcc_id,
 void pcep_thread_timer_handler(struct event *thread)
 {
        /* data unpacking */
-       struct pcep_ctrl_timer_data *data = THREAD_ARG(thread);
+       struct pcep_ctrl_timer_data *data = EVENT_ARG(thread);
        assert(data != NULL);
        struct ctrl_state *ctrl_state = data->ctrl_state;
        assert(ctrl_state != NULL);
@@ -600,7 +600,7 @@ void pcep_thread_timer_handler(struct event *thread)
 
 void pcep_thread_pcep_event(struct event *thread)
 {
-       struct pcep_ctrl_event_data *data = THREAD_ARG(thread);
+       struct pcep_ctrl_event_data *data = EVENT_ARG(thread);
        assert(data != NULL);
        struct ctrl_state *ctrl_state = data->ctrl_state;
        pcep_event *event = data->payload;
@@ -640,11 +640,11 @@ int schedule_thread_socket(struct ctrl_state *ctrl_state, int pcc_id,
        data->payload = payload;
 
        if (is_read) {
-               thread_add_read(ctrl_state->self, socket_cb, (void *)data, fd,
-                               thread);
+               event_add_read(ctrl_state->self, socket_cb, (void *)data, fd,
+                              thread);
        } else {
-               thread_add_write(ctrl_state->self, socket_cb, (void *)data, fd,
-                                thread);
+               event_add_write(ctrl_state->self, socket_cb, (void *)data, fd,
+                               thread);
        }
 
        return 0;
@@ -702,7 +702,7 @@ int send_to_thread_with_cb(struct ctrl_state *ctrl_state, int pcc_id,
        data->pcc_id = pcc_id;
        data->payload = payload;
 
-       thread_add_event(ctrl_state->self, event_cb, (void *)data, 0, NULL);
+       event_add_event(ctrl_state->self, event_cb, (void *)data, 0, NULL);
 
        return 0;
 }
@@ -710,7 +710,7 @@ int send_to_thread_with_cb(struct ctrl_state *ctrl_state, int pcc_id,
 void pcep_thread_event_handler(struct event *thread)
 {
        /* data unpacking */
-       struct pcep_ctrl_event_data *data = THREAD_ARG(thread);
+       struct pcep_ctrl_event_data *data = EVENT_ARG(thread);
        assert(data != NULL);
        struct ctrl_state *ctrl_state = data->ctrl_state;
        assert(ctrl_state != NULL);
@@ -964,15 +964,15 @@ int send_to_main(struct ctrl_state *ctrl_state, int pcc_id,
        data->pcc_id = pcc_id;
        data->payload = payload;
 
-       thread_add_event(ctrl_state->main, pcep_main_event_handler,
-                        (void *)data, 0, NULL);
+       event_add_event(ctrl_state->main, pcep_main_event_handler, (void *)data,
+                       0, NULL);
        return 0;
 }
 
 void pcep_main_event_handler(struct event *thread)
 {
        /* data unpacking */
-       struct pcep_main_event_data *data = THREAD_ARG(thread);
+       struct pcep_main_event_data *data = EVENT_ARG(thread);
        assert(data != NULL);
        pcep_main_event_handler_t handler = data->handler;
        enum pcep_main_event_type type = data->type;