Преглед изворни кода

api: Change some of totempg definitons

Recent changes in patch "Get rid of hdb usage in totempg.h interface"
caused incompatibility between corosync API and totempg.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Steven Dake <sdake@redhat.com>
Jan Friesse пре 14 година
родитељ
комит
26db8b21b2
3 измењених фајлова са 13 додато и 13 уклоњено
  1. 4 4
      exec/apidef.c
  2. 1 1
      exec/vsf_ykd.c
  3. 8 8
      include/corosync/engine/coroapi.h

+ 4 - 4
exec/apidef.c

@@ -63,23 +63,23 @@ LOGSYS_DECLARE_SUBSYS ("APIDEF");
  * Remove compile warnings about type name changes in corosync_tpg_group
  */
 typedef int (*typedef_tpg_join) (
-	hdb_handle_t,
+	void *,
 	const struct corosync_tpg_group *,
 	size_t);
 
-typedef int (*typedef_tpg_leave) (hdb_handle_t,
+typedef int (*typedef_tpg_leave) (void *,
 	const struct corosync_tpg_group *,
 	size_t);
 
 typedef int (*typedef_tpg_groups_mcast_groups) (
-	hdb_handle_t, int,
+	void *, int,
 	const struct corosync_tpg_group *,
 	size_t groups_cnt,
 	const struct iovec *,
 	unsigned int);
 
 typedef int (*typedef_tpg_groups_send_ok) (
-	hdb_handle_t,
+	void *,
 	const struct corosync_tpg_group *,
 	size_t groups_cnt,
 	struct iovec *,

+ 1 - 1
exec/vsf_ykd.c

@@ -111,7 +111,7 @@ struct state_received {
 
 struct ykd_state ykd_state;
 
-static hdb_handle_t ykd_group_handle;
+static void *ykd_group_handle;
 
 static struct state_received state_received_confchg[YKD_PROCESSOR_COUNT_MAX];
 

+ 8 - 8
include/corosync/engine/coroapi.h

@@ -483,7 +483,7 @@ struct corosync_api_v1 {
 	 * wanting their own groups
 	 */
 	int (*tpg_init) (
-		hdb_handle_t *handle,
+		void **instance,
 
 		void (*deliver_fn) (
 			unsigned int nodeid,
@@ -502,26 +502,26 @@ struct corosync_api_v1 {
 			const struct memb_ring_id *ring_id));
 
 	int (*tpg_exit) (
-       		hdb_handle_t handle);
+		void *instance);
 
 	int (*tpg_join) (
-		hdb_handle_t handle,
+		void *instance,
 		const struct corosync_tpg_group *groups,
 		size_t group_cnt);
 
 	int (*tpg_leave) (
-		hdb_handle_t handle,
+		void *instance,
 		const struct corosync_tpg_group *groups,
 		size_t group_cnt);
 
 	int (*tpg_joined_mcast) (
-		hdb_handle_t handle,
+		void *totempg_groups_instance,
 		const struct iovec *iovec,
 		unsigned int iov_len,
 		int guarantee);
 
 	int (*tpg_joined_reserve) (
-		hdb_handle_t handle,
+		void *totempg_groups_instance,
 		const struct iovec *iovec,
 		unsigned int iov_len);
 
@@ -529,7 +529,7 @@ struct corosync_api_v1 {
 		int reserved_msgs);
 
 	int (*tpg_groups_mcast) (
-		hdb_handle_t handle,
+		void *instance,
 		int guarantee,
 		const struct corosync_tpg_group *groups,
 		size_t groups_cnt,
@@ -537,7 +537,7 @@ struct corosync_api_v1 {
 		unsigned int iov_len);
 
 	int (*tpg_groups_reserve) (
-		hdb_handle_t handle,
+		void *instance,
 		const struct corosync_tpg_group *groups,
 		size_t groups_cnt,
 		const struct iovec *iovec,