Refactor: controller: Rename register_fsa_input_before to...

...controld_fsa_prepend. For clarity.

Signed-off-by: Reid Wahl <[email protected]>

Author: nrwahl2

daemons/controld/controld_callbacks.c

@@ -276,7 +276,7 @@ peer_update_callback(enum pcmk__node_update type, pcmk__node_status_t *node,
                   alive, appeared, (down? down->id : -1));
 
         if (appeared && (alive > 0) && !is_remote) {
-            register_fsa_input_before(C_FSA_INTERNAL, I_NODE_JOIN, NULL);
+            controld_fsa_prepend(C_FSA_INTERNAL, I_NODE_JOIN, NULL);
         }
 
         if (down) {

daemons/controld/controld_control.c

@@ -696,7 +696,7 @@ crm_shutdown(int nsig)
 
     if (pcmk__is_set(controld_globals.fsa_input_register, R_SHUTDOWN)) {
         crm_err("Escalating shutdown");
-        register_fsa_input_before(C_SHUTDOWN, I_ERROR, NULL);
+        controld_fsa_prepend(C_SHUTDOWN, I_ERROR, NULL);
         return;
     }
 

daemons/controld/controld_fsa.c

@@ -529,7 +529,7 @@ check_join_counts(fsa_data_t *msg_data)
     } else if (controld_globals.membership_id != controld_globals.peer_seq) {
         crm_info("New join needed because membership changed (%llu -> %llu)",
                  controld_globals.membership_id, controld_globals.peer_seq);
-        register_fsa_input_before(C_FSA_INTERNAL, I_NODE_JOIN, NULL);
+        controld_fsa_prepend(C_FSA_INTERNAL, I_NODE_JOIN, NULL);
 
     } else {
         crm_warn("Only %d of %u active cluster nodes fully joined "

daemons/controld/controld_join_dc.c

@@ -1007,7 +1007,7 @@ check_join_state(enum crmd_fsa_state cur_state, const char *source)
         if (highest_seq < controld_globals.peer_seq) {
             /* Don't spam the FSA with duplicates */
             highest_seq = controld_globals.peer_seq;
-            register_fsa_input_before(C_FSA_INTERNAL, I_NODE_JOIN, NULL);
+            controld_fsa_prepend(C_FSA_INTERNAL, I_NODE_JOIN, NULL);
         }
 
     } else if (cur_state == S_INTEGRATION) {
@@ -1018,7 +1018,7 @@ check_join_state(enum crmd_fsa_state cur_state, const char *source)
                       QB_XS " state=%s for=%s",
                       current_join_id, count, pcmk__plural_s(count),
                       fsa_state2string(cur_state), source);
-            register_fsa_input_before(C_FSA_INTERNAL, I_INTEGRATED, NULL);
+            controld_fsa_prepend(C_FSA_INTERNAL, I_INTEGRATED, NULL);
             return TRUE;
         }
 

daemons/controld/controld_messages.c

@@ -225,7 +225,7 @@ route_message(enum crmd_fsa_cause cause, xmlNode * input)
              *
              * @FIXME controld_fsa_append() adds the input to the tail of the
              * queue. To add to the front (the head), we would call
-             * register_fsa_input_before(). Which one is correct?
+             * controld_fsa_prepend(). Which one is correct?
              * - The "Add to the front" comment and the below
              *   controld_fsa_append() call (formerly register_fsa_input()) go
              *   back to a1606db9 in 2006.

daemons/controld/controld_messages.h

@@ -56,8 +56,16 @@ extern void route_message(enum crmd_fsa_cause cause, xmlNode * input);
 #define controld_fsa_append(cause, input, data) \
     register_fsa_input_adv(cause, input, data, A_NOTHING, false, __func__)
 
-#define register_fsa_input_before(cause, input, data)   \
-    register_fsa_input_adv(cause, input, data, A_NOTHING, TRUE, __func__)
+/*!
+ * \internal
+ * \brief Prepend an input to the FSA message queue without actions
+ *
+ * \param[in] cause  Cause of input creation (<tt>enum crmd_fsa_cause</tt>)
+ * \param[in] input  Input type (<tt>enum crmd_fsa_input</tt>)
+ * \param[in] data   Message data (\c ha_msg_input_t)
+ */
+#define controld_fsa_prepend(cause, input, data)    \
+    register_fsa_input_adv(cause, input, data, A_NOTHING, true, __func__)
 
 void delete_fsa_input(fsa_data_t * fsa_data);
 

daemons/controld/controld_schedulerd.c

@@ -341,7 +341,7 @@ do_pe_invoke(long long action,
     if (!pcmk__is_set(controld_globals.fsa_input_register, R_PE_CONNECTED)) {
         if (pcmk__is_set(controld_globals.fsa_input_register, R_SHUTDOWN)) {
             crm_err("Cannot shut down gracefully without the scheduler");
-            register_fsa_input_before(C_FSA_INTERNAL, I_TERMINATE, NULL);
+            controld_fsa_prepend(C_FSA_INTERNAL, I_TERMINATE, NULL);
 
         } else {
             crm_info("Waiting for the scheduler to connect");
@@ -361,7 +361,7 @@ do_pe_invoke(long long action,
         crm_err("Attempted to invoke scheduler without consistent Cluster Information Base!");
 
         /* start the join from scratch */
-        register_fsa_input_before(C_FSA_INTERNAL, I_ELECTION, NULL);
+        controld_fsa_prepend(C_FSA_INTERNAL, I_ELECTION, NULL);
         return;
     }
     if (controld_cib_retry_timer != NULL) {

daemons/controld/controld_timers.c

@@ -202,7 +202,7 @@ crm_timer_popped(gpointer data)
             register_fsa_error_adv(I_ELECTION, NULL, NULL, __func__);
 
         } else {
-            register_fsa_input_before(C_TIMER_POPPED, timer->fsa_input, NULL);
+            controld_fsa_prepend(C_TIMER_POPPED, timer->fsa_input, NULL);
         }
 
     } else if ((timer == recheck_timer)