From 2a31caedd3e34ddbf75ccb8ed8cf3587b2819e47 Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Wed, 1 Jul 2009 20:57:37 +0000
Subject: [PATCH] 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 | 8 +++++++-
 lib/evs.c              | 3 ++-
 test/evsbench.c        | 3 ++-
 test/evsverify.c       | 3 ++-
 test/testevs.c         | 3 ++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/include/corosync/evs.h b/include/corosync/evs.h
index 6f916200..1718e409 100644
--- a/include/corosync/evs.h
+++ b/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;
diff --git a/lib/evs.c b/lib/evs.c
index 003f8de7..6bf14489 100644
--- a/lib/evs.c
+++ b/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:
diff --git a/test/evsbench.c b/test/evsbench.c
index 949e8f80..786e0192 100644
--- a/test/evsbench.c
+++ b/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;
 
diff --git a/test/evsverify.c b/test/evsverify.c
index a5b2d624..709bdd6c 100644
--- a/test/evsverify.c
+++ b/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;
 
diff --git a/test/testevs.c b/test/testevs.c
index 3aaa3ef6..b738c9a6 100644
--- a/test/testevs.c
+++ b/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;