timeout types removal patch included. merged at revision 1675.
Regards
-steve
On Wed, 2008-10-15 at 15:08 +0200, Andrew Beekhof wrote:
> Corosync itself builds fine, but building against it is problematic.
>
> 1)
>
> The entry for logsys_mkpri() in the header file causes compiler warnings.
> /opt/local/include/corosync/engine/logsys.h:103: warning: inline
> function 'logsys_mkpri' declared but never defined
>
> I suggest:
>
> diff -r fdbf04a71d18 include/corosync/engine/logsys.h
> --- a/include/corosync/engine/logsys.h Thu Oct 09 06:20:12 2008 +0000
> +++ b/include/corosync/engine/logsys.h Wed Oct 15 15:05:17 2008 +0200
> @@ -100,7 +100,7 @@ extern struct logsys_logger logsys_logge
>
> extern int logsys_single_id;
>
> -extern inline int logsys_mkpri (int priority, int id);
> +extern int logsys_mkpri (int priority, int id);
>
> extern void logsys_config_mode_set (
> unsigned int mode);
>
>
> 2)
>
> Is the totem_timeout_types enum actually used anywhere?
> Because the presence of a variable declaration in a header file
> prevents linking:
> ld: duplicate symbol _totem_timeout_types in .libs/plugin.o and
> .libs/utils.o
>
> I can't find any reference to it, can it simply be removed?
>
> enum {
> TOTEM_RETRANSMITS_BEFORE_LOSS,
> TOTEM_TOKEN,
> TOTEM_RETRANSMIT_TOKEN,
> TOTEM_HOLD_TOKEN,
> TOTEM_JOIN,
> TOTEM_CONSENSUS,
> TOTEM_MERGE,
> TOTEM_DOWNCHECK,
> TOTEM_FAIL_RECV_CONST,
>
> MAX_TOTEM_TIMEOUTS /* Last item */
> } totem_timeout_types;
> _______________________________________________
> Openais mailing list
> [email protected]
> https://lists.linux-foundation.org/mailman/listinfo/openais
Index: include/corosync/totem/totem.h
===================================================================
--- include/corosync/totem/totem.h (revision 1674)
+++ include/corosync/totem/totem.h (working copy)
@@ -50,26 +50,6 @@
#define SEND_THREADS_MAX 16
#define INTERFACE_MAX 2
-/*
- * Array location of various timeouts as
- * specified in corosync.conf. The last enum
- * specifies the size of the timeouts array and
- * needs to remain the last item in the list.
- */
-enum {
- TOTEM_RETRANSMITS_BEFORE_LOSS,
- TOTEM_TOKEN,
- TOTEM_RETRANSMIT_TOKEN,
- TOTEM_HOLD_TOKEN,
- TOTEM_JOIN,
- TOTEM_CONSENSUS,
- TOTEM_MERGE,
- TOTEM_DOWNCHECK,
- TOTEM_FAIL_RECV_CONST,
-
- MAX_TOTEM_TIMEOUTS /* Last item */
-} totem_timeout_types;
-
struct totem_interface {
struct totem_ip_address bindnet;
struct totem_ip_address boundto;
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
