From af4f8826dcecc87e93d636b923ce55d5ed528f41 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 13 Nov 2020 16:20:31 +0100 Subject: [PATCH] timer-list: Rename delete and reschedule ops Add entry to the name so it is more evident change is happening to the entry and not to the list. Signed-off-by: Jan Friesse --- qdevices/qdevice-heuristics-worker-cmd.c | 2 +- qdevices/qdevice-heuristics-worker.c | 4 +-- qdevices/qdevice-model-net.c | 4 +-- qdevices/qdevice-net-cast-vote-timer.c | 2 +- qdevices/qdevice-net-echo-request-timer.c | 2 +- qdevices/qdevice-net-heuristics.c | 2 +- qdevices/qdevice-net-msg-received.c | 2 +- qdevices/qdevice-pr-poll-loop.c | 2 +- qdevices/qnetd-client-algo-timer.c | 2 +- qdevices/qnetd-dpd-timer.c | 2 +- qdevices/test-pr-poll-loop.c | 44 +++++++++++------------ qdevices/test-timer-list.c | 20 +++++------ qdevices/timer-list.c | 6 ++-- qdevices/timer-list.h | 4 +-- 14 files changed, 49 insertions(+), 49 deletions(-) diff --git a/qdevices/qdevice-heuristics-worker-cmd.c b/qdevices/qdevice-heuristics-worker-cmd.c index 3745faf..21d1b08 100644 --- a/qdevices/qdevice-heuristics-worker-cmd.c +++ b/qdevices/qdevice-heuristics-worker-cmd.c @@ -154,7 +154,7 @@ qdevice_heuristics_worker_cmd_process_exec(struct qdevice_heuristics_worker_inst if (instance->exec_timeout_timer != NULL) { process_list_move_active_entries_to_kill_list(&instance->main_process_list); - timer_list_delete(&instance->main_timer_list, instance->exec_timeout_timer); + timer_list_entry_delete(&instance->main_timer_list, instance->exec_timeout_timer); instance->exec_timeout_timer = NULL; } diff --git a/qdevices/qdevice-heuristics-worker.c b/qdevices/qdevice-heuristics-worker.c index 1c6eac4..0d6c9bf 100644 --- a/qdevices/qdevice-heuristics-worker.c +++ b/qdevices/qdevice-heuristics-worker.c @@ -254,7 +254,7 @@ qdevice_heuristics_worker_poll(struct qdevice_heuristics_worker_instance *instan process_list_move_active_entries_to_kill_list(&instance->main_process_list); - timer_list_delete(&instance->main_timer_list, instance->exec_timeout_timer); + timer_list_entry_delete(&instance->main_timer_list, instance->exec_timeout_timer); instance->exec_timeout_timer = NULL; break; @@ -269,7 +269,7 @@ qdevice_heuristics_worker_poll(struct qdevice_heuristics_worker_instance *instan process_list_move_active_entries_to_kill_list(&instance->main_process_list); - timer_list_delete(&instance->main_timer_list, instance->exec_timeout_timer); + timer_list_entry_delete(&instance->main_timer_list, instance->exec_timeout_timer); instance->exec_timeout_timer = NULL; break; default: diff --git a/qdevices/qdevice-model-net.c b/qdevices/qdevice-model-net.c index e8b2aa9..afcc649 100644 --- a/qdevices/qdevice-model-net.c +++ b/qdevices/qdevice-model-net.c @@ -256,13 +256,13 @@ qdevice_model_net_post_poll_loop(struct qdevice_instance *instance, ret_val = -1; if (net_instance->connect_timer != NULL) { - timer_list_delete(pr_poll_loop_get_timer_list(&instance->main_poll_loop), + timer_list_entry_delete(pr_poll_loop_get_timer_list(&instance->main_poll_loop), net_instance->connect_timer); net_instance->connect_timer = NULL; } if (net_instance->echo_request_timer != NULL) { - timer_list_delete(pr_poll_loop_get_timer_list(&instance->main_poll_loop), + timer_list_entry_delete(pr_poll_loop_get_timer_list(&instance->main_poll_loop), net_instance->echo_request_timer); net_instance->echo_request_timer = NULL; } diff --git a/qdevices/qdevice-net-cast-vote-timer.c b/qdevices/qdevice-net-cast-vote-timer.c index 7b1c998..21f6c43 100644 --- a/qdevices/qdevice-net-cast-vote-timer.c +++ b/qdevices/qdevice-net-cast-vote-timer.c @@ -162,7 +162,7 @@ qdevice_net_cast_vote_timer_update(struct qdevice_net_instance *instance, enum t } } else { if (instance->cast_vote_timer != NULL) { - timer_list_delete( + timer_list_entry_delete( pr_poll_loop_get_timer_list(&instance->qdevice_instance_ptr->main_poll_loop), instance->cast_vote_timer); instance->cast_vote_timer = NULL; diff --git a/qdevices/qdevice-net-echo-request-timer.c b/qdevices/qdevice-net-echo-request-timer.c index 0c0c547..e0305b7 100644 --- a/qdevices/qdevice-net-echo-request-timer.c +++ b/qdevices/qdevice-net-echo-request-timer.c @@ -85,7 +85,7 @@ qdevice_net_echo_request_timer_schedule(struct qdevice_net_instance *instance) instance->echo_reply_received_msg_seq_num = 0; if (instance->echo_request_timer != NULL) { - timer_list_delete( + timer_list_entry_delete( pr_poll_loop_get_timer_list(&instance->qdevice_instance_ptr->main_poll_loop), instance->echo_request_timer); instance->echo_request_timer = NULL; diff --git a/qdevices/qdevice-net-heuristics.c b/qdevices/qdevice-net-heuristics.c index 0c9364a..15053fd 100644 --- a/qdevices/qdevice-net-heuristics.c +++ b/qdevices/qdevice-net-heuristics.c @@ -362,7 +362,7 @@ qdevice_net_heuristics_stop_timer(struct qdevice_net_instance *net_instance) if (net_instance->regular_heuristics_timer != NULL) { log(LOG_DEBUG, "Regular heuristics timer stopped"); - timer_list_delete(pr_poll_loop_get_timer_list(&instance->main_poll_loop), + timer_list_entry_delete(pr_poll_loop_get_timer_list(&instance->main_poll_loop), net_instance->regular_heuristics_timer); net_instance->regular_heuristics_timer = NULL; diff --git a/qdevices/qdevice-net-msg-received.c b/qdevices/qdevice-net-msg-received.c index 8096d47..917f302 100644 --- a/qdevices/qdevice-net-msg-received.c +++ b/qdevices/qdevice-net-msg-received.c @@ -381,7 +381,7 @@ qdevice_net_msg_received_init_reply(struct qdevice_net_instance *instance, * Finally fully connected so it's possible to remove connection timer */ if (instance->connect_timer != NULL) { - timer_list_delete( + timer_list_entry_delete( pr_poll_loop_get_timer_list(&instance->qdevice_instance_ptr->main_poll_loop), instance->connect_timer); instance->connect_timer = NULL; diff --git a/qdevices/qdevice-pr-poll-loop.c b/qdevices/qdevice-pr-poll-loop.c index ae43d13..7ebf340 100644 --- a/qdevices/qdevice-pr-poll-loop.c +++ b/qdevices/qdevice-pr-poll-loop.c @@ -83,7 +83,7 @@ qdevice_pr_poll_loop_wait_for_initial_heuristics_exec_result(struct qdevice_inst return (-1); } - timer_list_delete(pr_poll_loop_get_timer_list(&instance->main_poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(&instance->main_poll_loop), timeout_timer); return (poll_res); } diff --git a/qdevices/qnetd-client-algo-timer.c b/qdevices/qnetd-client-algo-timer.c index d9ffbd2..3dfb948 100644 --- a/qdevices/qnetd-client-algo-timer.c +++ b/qdevices/qnetd-client-algo-timer.c @@ -138,7 +138,7 @@ qnetd_client_algo_timer_abort(struct qnetd_client *client) { if (qnetd_client_algo_timer_is_scheduled(client)) { - timer_list_delete(client->main_timer_list, client->algo_timer); + timer_list_entry_delete(client->main_timer_list, client->algo_timer); client->algo_timer = NULL; } diff --git a/qdevices/qnetd-dpd-timer.c b/qdevices/qnetd-dpd-timer.c index 23a530e..1917982 100644 --- a/qdevices/qnetd-dpd-timer.c +++ b/qdevices/qnetd-dpd-timer.c @@ -92,7 +92,7 @@ qnetd_dpd_timer_destroy(struct qnetd_instance *instance) { if (instance->dpd_timer != NULL) { - timer_list_delete(pr_poll_loop_get_timer_list(&instance->main_poll_loop), instance->dpd_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(&instance->main_poll_loop), instance->dpd_timer); instance->dpd_timer = NULL; } } diff --git a/qdevices/test-pr-poll-loop.c b/qdevices/test-pr-poll-loop.c index da0c10a..28d284c 100644 --- a/qdevices/test-pr-poll-loop.c +++ b/qdevices/test-pr-poll-loop.c @@ -523,7 +523,7 @@ test_fd_basics(struct pr_poll_loop *poll_loop) assert(pr_poll_loop_exec(poll_loop) == -1); assert(fd_set_events_cb1_return_called == 1); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Remove entry and try with zero events and -2 return callback @@ -540,7 +540,7 @@ test_fd_basics(struct pr_poll_loop *poll_loop) assert(pr_poll_loop_exec(poll_loop) == -1); assert(fd_set_events_cb1_return_called == 1); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Remove entry and try different cb @@ -559,7 +559,7 @@ test_fd_basics(struct pr_poll_loop *poll_loop) assert(fd_set_events_cb1_return_called == 0); assert(fd_set_events_cb2_return_called == 1); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Delete entry and try timeout again @@ -593,7 +593,7 @@ test_fd_basics(struct pr_poll_loop *poll_loop) assert(fd_read_cb1_called == 1); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Try timeout with valid entry @@ -631,7 +631,7 @@ test_fd_basics(struct pr_poll_loop *poll_loop) assert(fd_read_cb1_called == 0); assert(fd_read_cb2_called == 1); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Try writing @@ -652,7 +652,7 @@ test_fd_basics(struct pr_poll_loop *poll_loop) assert(fd_write_cb1_called == 1); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Try err cb @@ -678,7 +678,7 @@ test_fd_basics(struct pr_poll_loop *poll_loop) assert(fd_write_cb1_called == 0); assert(timeout_cb_called == 0); assert(pr_poll_loop_del_fd(poll_loop, pipe_fd1[0]) == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); } static void @@ -727,7 +727,7 @@ test_prfd_basics(struct pr_poll_loop *poll_loop) assert(pr_poll_loop_exec(poll_loop) == -1); assert(prfd_set_events_cb1_return_called == 1); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Remove entry and try different cb @@ -746,7 +746,7 @@ test_prfd_basics(struct pr_poll_loop *poll_loop) assert(prfd_set_events_cb1_return_called == 0); assert(prfd_set_events_cb2_return_called == 1); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Delete entry and try timeout again @@ -780,7 +780,7 @@ test_prfd_basics(struct pr_poll_loop *poll_loop) assert(prfd_read_cb1_called == 1); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Try timeout with valid entry @@ -818,7 +818,7 @@ test_prfd_basics(struct pr_poll_loop *poll_loop) assert(prfd_read_cb1_called == 0); assert(prfd_read_cb2_called == 1); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Try writing @@ -839,7 +839,7 @@ test_prfd_basics(struct pr_poll_loop *poll_loop) assert(prfd_write_cb1_called == 1); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); assert(PR_Close(read_pipe) == 0); assert(PR_Close(write_pipe) == 0); @@ -876,7 +876,7 @@ test_prfd_basics(struct pr_poll_loop *poll_loop) assert(prfd_write_cb1_called == 0); assert(timeout_cb_called == 0); assert(pr_poll_loop_del_prfd(poll_loop, read_pipe) == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); assert(PR_DestroySocketPollFd(read_pipe) == PR_SUCCESS); } @@ -955,7 +955,7 @@ test_complex(struct pr_poll_loop *poll_loop) assert(test_complex_write_pipe2_write_called == 1); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Call for second time -> same as first time @@ -977,7 +977,7 @@ test_complex(struct pr_poll_loop *poll_loop) assert(test_complex_write_pipe2_write_called == 2); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Change state to prepare for writing @@ -1000,7 +1000,7 @@ test_complex(struct pr_poll_loop *poll_loop) assert(test_complex_write_pipe2_write_called == 3); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Write to first pipe @@ -1024,7 +1024,7 @@ test_complex(struct pr_poll_loop *poll_loop) assert(test_complex_write_pipe2_write_called == 4); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Delete pre poll cb @@ -1052,7 +1052,7 @@ test_complex(struct pr_poll_loop *poll_loop) assert(test_complex_write_pipe2_write_called == 5); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Add pre poll cb 1 and 2 @@ -1083,7 +1083,7 @@ test_complex(struct pr_poll_loop *poll_loop) assert(test_complex_write_pipe2_write_called == 6); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Write to second pipe @@ -1107,7 +1107,7 @@ test_complex(struct pr_poll_loop *poll_loop) assert(test_complex_write_pipe2_write_called == 7); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * And call again @@ -1129,7 +1129,7 @@ test_complex(struct pr_poll_loop *poll_loop) assert(test_complex_write_pipe2_write_called == 8); assert(timeout_cb_called == 0); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); assert(PR_DestroySocketPollFd(read_pipe1) == PR_SUCCESS); assert(PR_DestroySocketPollFd(write_pipe2) == PR_SUCCESS); @@ -1251,7 +1251,7 @@ test_pre_poll_cb(struct pr_poll_loop *poll_loop) assert(pre_poll_cb1_called == 4); assert(pre_poll_cb2_called == 3); assert(pre_poll_cb_return_called == 1); - timer_list_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); + timer_list_entry_delete(pr_poll_loop_get_timer_list(poll_loop), timeout_timer); /* * Remove cb_return diff --git a/qdevices/test-timer-list.c b/qdevices/test-timer-list.c index 84b7ade..82d5899 100644 --- a/qdevices/test-timer-list.c +++ b/qdevices/test-timer-list.c @@ -150,7 +150,7 @@ check_timer_list_basics(void) /* * Delete entry */ - timer_list_delete(&tlist, tlist_entry); + timer_list_entry_delete(&tlist, tlist_entry); assert(timer_list_time_to_expire(&tlist) == PR_INTERVAL_NO_TIMEOUT); assert(timer_list_time_to_expire_ms(&tlist) == ~((uint32_t)0)); @@ -166,7 +166,7 @@ check_timer_list_basics(void) } for (i = 0; i < SPEED_TEST_NO_ITEMS; i++) { - timer_list_reschedule(&tlist, tlist_speed_entry[i]); + timer_list_entry_reschedule(&tlist, tlist_speed_entry[i]); } (void)poll(NULL, 0, SHORT_TIMEOUT); @@ -229,7 +229,7 @@ check_timer_heap(void) * Remove all items */ for (i = 0; i < HEAP_TEST_NO_ITEMS; i++) { - timer_list_delete(&tlist, tlist_entry[i]); + timer_list_entry_delete(&tlist, tlist_entry[i]); assert(timer_list_debug_is_valid_heap(&tlist)); assert(tlist.entries[0] == tlist_entry_small); @@ -238,7 +238,7 @@ check_timer_heap(void) /* * Remove small item */ - timer_list_delete(&tlist, tlist_entry_small); + timer_list_entry_delete(&tlist, tlist_entry_small); assert(timer_list_debug_is_valid_heap(&tlist)); /* @@ -258,7 +258,7 @@ check_timer_heap(void) * Remove all items */ for (i = 0; i < HEAP_TEST_NO_ITEMS; i++) { - timer_list_delete(&tlist, tlist_entry[i]); + timer_list_entry_delete(&tlist, tlist_entry[i]); assert(timer_list_debug_is_valid_heap(&tlist)); } @@ -286,7 +286,7 @@ check_timer_heap(void) * Remove items */ for (i = 0; i < HEAP_TEST_NO_ITEMS; i++) { - timer_list_delete(&tlist, tlist_entry[i]); + timer_list_entry_delete(&tlist, tlist_entry[i]); assert(timer_list_debug_is_valid_heap(&tlist)); } @@ -320,7 +320,7 @@ check_timer_heap(void) * And try reschedule */ for (i = 0; i < HEAP_TEST_NO_ITEMS; i++) { - timer_list_reschedule(&tlist, tlist_entry[i]); + timer_list_entry_reschedule(&tlist, tlist_entry[i]); assert(timer_list_debug_is_valid_heap(&tlist)); @@ -330,11 +330,11 @@ check_timer_heap(void) /* * Try delete */ - timer_list_delete(&tlist, tlist_entry_small); + timer_list_entry_delete(&tlist, tlist_entry_small); assert(timer_list_debug_is_valid_heap(&tlist)); for (i = 0; i < HEAP_TEST_NO_ITEMS; i++) { - timer_list_delete(&tlist, tlist_entry[i]); + timer_list_entry_delete(&tlist, tlist_entry[i]); assert(timer_list_debug_is_valid_heap(&tlist)); } @@ -352,7 +352,7 @@ check_timer_heap(void) } for (i = 0; i < HEAP_SPEED_TEST_NO_ITEMS; i++) { - timer_list_reschedule(&tlist, tlist_speed_entry[i]); + timer_list_entry_reschedule(&tlist, tlist_speed_entry[i]); assert(timer_list_debug_is_valid_heap(&tlist)); } diff --git a/qdevices/timer-list.c b/qdevices/timer-list.c index 669e00f..dde10eb 100644 --- a/qdevices/timer-list.c +++ b/qdevices/timer-list.c @@ -345,7 +345,7 @@ timer_list_add(struct timer_list *tlist, PRUint32 interval, timer_list_cb_fn fun } void -timer_list_reschedule(struct timer_list *tlist, struct timer_list_entry *entry) +timer_list_entry_reschedule(struct timer_list *tlist, struct timer_list_entry *entry) { if (entry->is_active) { @@ -377,7 +377,7 @@ timer_list_expire(struct timer_list *tlist) /* * Move item to free list */ - timer_list_delete(tlist, entry); + timer_list_entry_delete(tlist, entry); } else if (entry->is_active) { /* * Schedule again @@ -422,7 +422,7 @@ timer_list_time_to_expire_ms(struct timer_list *tlist) } void -timer_list_delete(struct timer_list *tlist, struct timer_list_entry *entry) +timer_list_entry_delete(struct timer_list *tlist, struct timer_list_entry *entry) { if (entry->is_active) { diff --git a/qdevices/timer-list.h b/qdevices/timer-list.h index 19ca725..b620c7b 100644 --- a/qdevices/timer-list.h +++ b/qdevices/timer-list.h @@ -78,10 +78,10 @@ extern void timer_list_init(struct timer_list *tlist); extern struct timer_list_entry *timer_list_add(struct timer_list *tlist, PRUint32 interval, timer_list_cb_fn func, void *data1, void *data2); -extern void timer_list_reschedule(struct timer_list *tlist, +extern void timer_list_entry_reschedule(struct timer_list *tlist, struct timer_list_entry *entry); -extern void timer_list_delete(struct timer_list *tlist, +extern void timer_list_entry_delete(struct timer_list *tlist, struct timer_list_entry *entry); extern void timer_list_expire(struct timer_list *tlist); -- 2.39.2