Reviewed-by: Steven Dake <sdake@xxxxxxxxxx>
On 10/24/2011 05:33 AM, Jan Friesse wrote:
> 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@xxxxxxxxxx>
> ---
> exec/apidef.c | 8 ++++----
> exec/vsf_ykd.c | 2 +-
> include/corosync/engine/coroapi.h | 16 ++++++++--------
> 3 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/exec/apidef.c b/exec/apidef.c
> index 479b797..2d0b6cd 100644
> --- a/exec/apidef.c
> +++ b/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 *,
> diff --git a/exec/vsf_ykd.c b/exec/vsf_ykd.c
> index ccc26c6..3e3dfa8 100644
> --- a/exec/vsf_ykd.c
> +++ b/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];
>
> diff --git a/include/corosync/engine/coroapi.h b/include/corosync/engine/coroapi.h
> index c1a6de5..567d14f 100644
> --- a/include/corosync/engine/coroapi.h
> +++ b/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,
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
