[Openais] [PATCH 10/13] libqb: fix timer handles (don't alloc on stack)

[Angus Salkeld]

Signed-off-by: Angus Salkeld <asalk...@redhat.com>
---
 cts/agents/cpg_test_agent.c |    4 ++--
 exec/ipc_glue.c             |    4 ++--
 exec/main.c                 |    3 ++-
 exec/totemsrp.c             |    2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cts/agents/cpg_test_agent.c b/cts/agents/cpg_test_agent.c
index d46055c..3729fe9 100644
--- a/cts/agents/cpg_test_agent.c
+++ b/cts/agents/cpg_test_agent.c
@@ -317,16 +317,16 @@ static void read_messages (int sock, char* atmost_str)
        send (sock, big_and_buf, strlen (big_and_buf), 0);
 }
 
+static qb_loop_timer_handle more_msg_timer_handle;
 static void send_some_more_messages_later (void)
 {
-       qb_loop_timer_handle timer_handle;
        cpg_dispatch (cpg_handle, CS_DISPATCH_ALL);
        qb_loop_timer_add (
                ta_poll_handle_get(),
                QB_LOOP_MED,
                300, NULL,
                send_some_more_messages,
-               &timer_handle);
+               &more_msg_timer_handle);
 }
 
 static void send_some_more_messages_zcb (void)
diff --git a/exec/ipc_glue.c b/exec/ipc_glue.c
index a8f0e92..f34046d 100644
--- a/exec/ipc_glue.c
+++ b/exec/ipc_glue.c
@@ -555,11 +555,11 @@ int32_t cs_ipcs_q_level_get(void)
        return ipc_fc_totem_queue_level;
 }
 
+static qb_loop_timer_handle ipcs_check_for_flow_control_timer;
 static void cs_ipcs_check_for_flow_control(void)
 {
        int32_t i;
        int32_t fc_enabled;
-       qb_loop_timer_handle tm;
 
        for (i = 0; i < SERVICE_HANDLER_MAXIMUM_COUNT; i++) {
                if (ais_service[i] == NULL || ipcs_mapper[i].inst == NULL) {
@@ -581,7 +581,7 @@ static void cs_ipcs_check_for_flow_control(void)
                        qb_ipcs_request_rate_limit(ipcs_mapper[i].inst, 
QB_IPCS_RATE_OFF);
 
                        qb_loop_timer_add(corosync_poll_handle_get(), 
QB_LOOP_MED, 1,
-                              NULL, corosync_recheck_the_q_level, &tm);
+                              NULL, corosync_recheck_the_q_level, 
&ipcs_check_for_flow_control_timer);
                } else if (ipc_fc_totem_queue_level == TOTEM_Q_LEVEL_LOW) {
                        qb_ipcs_request_rate_limit(ipcs_mapper[i].inst, 
QB_IPCS_RATE_FAST);
                } else if (ipc_fc_totem_queue_level == TOTEM_Q_LEVEL_GOOD) {
diff --git a/exec/main.c b/exec/main.c
index 7778454..f07c90f 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -817,6 +817,7 @@ int main_mcast (
        return (totempg_groups_mcast_joined (corosync_group_handle, iovec, 
iov_len, guarantee));
 }
 
+static qb_loop_timer_handle recheck_the_q_level_timer;
 void corosync_recheck_the_q_level(void *data)
 {
        qb_loop_timer_handle tm;
@@ -824,7 +825,7 @@ void corosync_recheck_the_q_level(void *data)
        totempg_check_q_level(corosync_group_handle);
        if (cs_ipcs_q_level_get() == TOTEM_Q_LEVEL_CRITICAL) {
                qb_loop_timer_add(corosync_poll_handle_get(), QB_LOOP_MED, 1,
-                       NULL, corosync_recheck_the_q_level, &tm);
+                       NULL, corosync_recheck_the_q_level, 
&recheck_the_q_level_timer);
        }
 }
 
diff --git a/exec/totemsrp.c b/exec/totemsrp.c
index 7595c0a..a802c68 100644
--- a/exec/totemsrp.c
+++ b/exec/totemsrp.c
@@ -499,7 +499,7 @@ struct totemsrp_instance {
 
        unsigned int my_cbl;
 
-       unsigned long long int pause_timestamp;
+       uint64_t pause_timestamp;
 
        struct memb_commit_token *commit_token;
 
-- 
1.7.3.1

_______________________________________________
Openais mailing list
Openais@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/openais