[Openais] struct evs_address...

Steven Dake sdake at redhat.com
Wed Jul 1 12:04:51 PDT 2009


Patch is correct (minus missing some consts).  I've fixed that up and
merged.

Thanks
-steve

On Wed, 2009-07-01 at 12:44 +0200, Wojtek Meler wrote:
> is only referenced in man pages. Attached patch removes it.
> 
> Regards,
> Wojtek
> plain text document attachment (evs_address.patch)
> Index: include/corosync/evs.h
> ===================================================================
> --- include/corosync/evs.h	(wersja 2331)
> +++ include/corosync/evs.h	(kopia robocza)
> @@ -62,12 +62,6 @@
>  #define TOTEMIP_ADDRLEN (sizeof(struct in6_addr))
>  
>  /** These are the things that get passed around */
> -struct evs_address {
> -	unsigned int nodeid;
> -	unsigned short family;
> -	unsigned char addr[TOTEMIP_ADDRLEN];
> -};
> -
>  struct evs_group {
>  	char key[32];
>  };
> Index: man/evs_initialize.3
> ===================================================================
> --- man/evs_initialize.3	(wersja 2331)
> +++ man/evs_initialize.3	(kopia robocza)
> @@ -61,14 +61,14 @@
>  .nf
>  .ta 4n 20n 32n
>  typedef void (*evs_deliver_fn_t) (
> -        struct evs_address source_addr,
> +	unsigned int nodeid,
>          const void *msg,
>          size_t msg_len);
>  
>  typedef void (*evs_confchg_fn_t) (
> -        const struct evs_address *member_list, size_t member_list_entries,
> -        const struct evs_address *left_list, size_t left_list_entries,
> -        const struct evs_address *joined_list, size_t joined_list_entries);
> +	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);
>  .ta
>  .fi
>  .RE
> @@ -101,27 +101,6 @@
>  .I evs_deliver_fn
>  is called.
>  
> -The
> -.I evs_address
> -structure is defined
> -.IP
> -.RS
> -.ne 18
> -.nf
> -.PP
> -struct evs_address {
> -        unsigned int nodeid;
> -        unsigned short family;
> -        unsigned char addr[TOTEMIP_ADDRLEN];
> -};
> -.ta
> -.fi
> -.RE
> -.IP
> -.PP
> -where nodeid is a 32 bit unique node identifier, family is of the value AF_INET  for an IPV4 network, or AF_INET6 for an IPV6 network, and addr is a 32 bit address for an IPV4 network, or 128 bit address for an IPV6 network.
> -
> -
>  .SH RETURN VALUE
>  This call returns the EVS_OK value if successful, otherwise an error is returned.
>  .PP
> Index: man/evs_membership_get.3
> ===================================================================
> --- man/evs_membership_get.3	(wersja 2331)
> +++ man/evs_membership_get.3	(kopia robocza)
> @@ -37,7 +37,7 @@
>  .SH SYNOPSIS
>  .B #include <corosync/evs.h>
>  .sp
> -.BI "int evs_membership_get(evs_handle_t " handle ", struct evs_address *" local_addr ", struct evs_address *" member_list ", int *" member_list_entries ");
> +.BI "int evs_membership_get(evs_handle_t " handle ", unsigned int *" local_nodeid ", unsigned int *" member_list ", int *" member_list_entries ");
>  .SH DESCRIPTION
>  The
>  .B evs_membership_get
> @@ -47,8 +47,8 @@
>  .I handle
>  is used to reference the evs instantiation.
>  The argument
> -.I local_addr
> -will return the local address of the processor.
> +.I local_nodeid
> +will return the local node id  of the processor.
>  The argument
>  .I member_list
>  will return the list of processors in the current membership.
> _______________________________________________
> Openais mailing list
> Openais at lists.linux-foundation.org
> https://lists.linux-foundation.org/mailman/listinfo/openais



More information about the Openais mailing list