Add ring id field to evs.

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

include/corosync/evs.h

@@ -67,6 +67,11 @@ struct evs_group {
 	char key[32];
 };
 
+struct evs_ring_id {
+	unsigned int nodeid;
+	unsigned long long seq;
+};
+
 typedef void (*evs_deliver_fn_t) (
 	hdb_handle_t handle, 
 	unsigned int nodeid,
@@ -77,7 +82,8 @@ 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);
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct evs_ring_id *ring_id);
 
 typedef struct {
 	evs_deliver_fn_t evs_deliver_fn;

lib/evs.c

@@ -294,7 +294,8 @@ evs_error_t evs_dispatch (
 				res_evs_confchg_callback->left_list,
 				res_evs_confchg_callback->left_list_entries,
 				res_evs_confchg_callback->joined_list,
-				res_evs_confchg_callback->joined_list_entries);
+				res_evs_confchg_callback->joined_list_entries,
+				NULL);
 			break;
 
 		default:

test/evsbench.c

@@ -80,7 +80,8 @@ 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)
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct evs_ring_id *ring_id)
 {
 	int i;
 

test/evsverify.c

@@ -85,7 +85,8 @@ 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)
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct evs_ring_id *ring_id)
 {
 	int i;
 

test/testevs.c

@@ -63,7 +63,8 @@ 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)
+	const unsigned int *joined_list, size_t joined_list_entries,
+	const struct evs_ring_id *ring_id)
 {
 	int i;