Pass handle is evs callback functions.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2339 fd59a12c-fef9-0310-b244-a6a79926bd2f

include/corosync/evs.h

@@ -36,6 +36,7 @@
 #include <inttypes.h>
 #include <netinet/in.h>
 #include <corosync/corotypes.h>
+#include <corosync/hdb.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -67,11 +68,13 @@ struct evs_group {
 };
 
 typedef void (*evs_deliver_fn_t) (
+	hdb_handle_t handle, 
 	unsigned int nodeid,
 	const void *msg,
 	size_t msg_len);
 
 typedef void (*evs_confchg_fn_t) (
+	hdb_handle_t handle, 
 	const unsigned int *member_list, size_t member_list_entries,
 	const unsigned int *left_list, size_t left_list_entries,
 	const unsigned int *joined_list, size_t joined_list_entries);

lib/evs.c

@@ -279,6 +279,7 @@ evs_error_t evs_dispatch (
 		case MESSAGE_RES_EVS_DELIVER_CALLBACK:
 			res_evs_deliver_callback = (struct res_evs_deliver_callback *)dispatch_data;
 			callbacks.evs_deliver_fn (
+				handle,
 				res_evs_deliver_callback->local_nodeid,
 				&res_evs_deliver_callback->msg,
 				res_evs_deliver_callback->msglen);
@@ -287,6 +288,7 @@ evs_error_t evs_dispatch (
 		case MESSAGE_RES_EVS_CONFCHG_CALLBACK:
 			res_evs_confchg_callback = (struct res_evs_confchg_callback *)dispatch_data;
 			callbacks.evs_confchg_fn (
+				handle,
 				res_evs_confchg_callback->member_list,
 				res_evs_confchg_callback->member_list_entries,
 				res_evs_confchg_callback->left_list,

test/evsbench.c

@@ -69,6 +69,7 @@
 volatile static int alarm_notice = 0;
 
 static void evs_deliver_fn (
+	hdb_handle_t handle,
 	unsigned int nodeid,
 	const void *msg,
 	size_t msg_len)
@@ -76,6 +77,7 @@ static void evs_deliver_fn (
 }
 
 static void evs_confchg_fn (
+	hdb_handle_t handle,
 	const unsigned int *member_list, size_t member_list_entries,
 	const unsigned int *left_list, size_t left_list_entries,
 	const unsigned int *joined_list, size_t joined_list_entries)

test/evsverify.c

@@ -55,6 +55,7 @@ struct my_msg {
 
 static int deliveries = 0;
 static void evs_deliver_fn (
+	hdb_handle_t handle,
 	unsigned int nodeid,
 	const void *m,
 	size_t msg_len)
@@ -81,9 +82,10 @@ printf ("\n");
 }
 
 static void evs_confchg_fn (
-	unsigned int *member_list, size_t member_list_entries,
-	unsigned int *left_list, size_t left_list_entries,
-	unsigned int *joined_list, size_t joined_list_entries)
+	hdb_handle_t handle,
+	const unsigned int *member_list, size_t member_list_entries,
+	const unsigned int *left_list, size_t left_list_entries,
+	const unsigned int *joined_list, size_t joined_list_entries)
 {
 	int i;
 

test/testevs.c

@@ -48,6 +48,7 @@ static const char *delivery_string;
 
 static int deliveries = 0;
 static void evs_deliver_fn (
+	hdb_handle_t handle,
 	unsigned int nodeid,
 	const void *msg,
 	size_t msg_len)
@@ -59,6 +60,7 @@ static void evs_deliver_fn (
 }
 
 static void evs_confchg_fn (
+	hdb_handle_t handle,
 	const unsigned int *member_list, size_t member_list_entries,
 	const unsigned int *left_list, size_t left_list_entries,
 	const unsigned int *joined_list, size_t joined_list_entries)