pgpool2.git / summary / log / commit / refs
commit a9db38b33971bf6c47391549be169d72fe3123dd
Author: Yugo Nagata <nagata@sraoss.co.jp>
Date: Mon Mar 18 05:42:02 2013 +0000
Add new watchdog mode using heartbeat signal of udp packet in lifecheck
pool_config.c | 1597 +++++++++++++++++++++++------------------------
pool_config.h | 9 +
pool_config.l | 150 ++++-
watchdog/Makefile.am | 3 +-
watchdog/watchdog.c | 64 +-
watchdog/watchdog.h | 45 +-
watchdog/wd_child.c | 3 +
watchdog/wd_ext.h | 10 +-
watchdog/wd_if.c | 1 +
watchdog/wd_init.c | 25 +-
watchdog/wd_lifecheck.c | 259 ++++++--
watchdog/wd_list.c | 28 +-
watchdog/wd_packet.c | 24 +-
watchdog/wd_udp.c | 527 ++++++++++++++++
14 files changed, 1817 insertions(+), 928 deletions(-)
diff --git a/pool_config.c b/pool_config.c
index 6c68ea428..55ebc5744 100644
--- a/pool_config.c
+++ b/pool_config.c
@@ -1,112 +1,67 @@
+/* A lexical scanner generated by flex*/
-#line 3 "pool_config.c"
-
-#define YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
+/* Scanner skeleton version:
+ * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
+ */
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with platform-specific or compiler-specific issues. */
-/* begin standard C headers. */
#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+#include <unistd.h>
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN (-2147483647-1)
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
#endif
-#ifndef INT8_MAX
-#define INT8_MAX (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX (4294967295U)
#endif
-#endif /* ! FLEXINT_H */
#ifdef __cplusplus
+#include <stdlib.h>
+
+/* Use prototypes in function declarations. */
+#define YY_USE_PROTOS
+
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
#else /* ! __cplusplus */
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
+#if __STDC__
+#define YY_USE_PROTOS
#define YY_USE_CONST
-#endif /* defined (__STDC__) */
+#endif /* __STDC__ */
#endif /* ! __cplusplus */
+#ifdef __TURBOC__
+ #pragma warn -rch
+ #pragma warn -use
+#include <io.h>
+#include <stdlib.h>
+#define YY_USE_CONST
+#define YY_USE_PROTOS
+#endif
+
#ifdef YY_USE_CONST
#define yyconst const
#else
#define yyconst
#endif
+
+#ifdef YY_USE_PROTOS
+#define YY_PROTO(proto) proto
+#else
+#define YY_PROTO(proto) ()
+#endif
+
/* Returned upon end-of-file. */
#define YY_NULL 0
@@ -121,70 +76,80 @@ typedef unsigned int flex_uint32_t;
* but we do it the disgusting crufty way forced on us by the ()-less
* definition of BEGIN.
*/
-#define BEGIN (yy_start) = 1 + 2 *
+#define BEGIN yy_start = 1 + 2 *
/* Translate the current start state into a value that can be later handed
* to BEGIN to return to the state. The YYSTATE alias is for lex
* compatibility.
*/
-#define YY_START (((yy_start) - 1) / 2)
+#define YY_START ((yy_start - 1) / 2)
#define YYSTATE YY_START
/* Action number for EOF rule of a given start state. */
#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin )
+#define YY_NEW_FILE yyrestart( yyin )
#define YY_END_OF_BUFFER_CHAR 0
/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
#define YY_BUF_SIZE 16384
-#endif
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
extern int yyleng;
-
extern FILE *yyin, *yyout;
#define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2
- #define YY_LESS_LINENO(n)
-
-/* Return all but the first "n" matched characters back to the input stream. */
+/* The funky do-while in the following #define is used to turn the definition
+ * int a single C statement (which needs a semi-colon terminator). This
+ * avoids problems with code like:
+ *
+ * if ( condition_holds )
+ * yyless( 5 );
+ * else
+ * do_something_else();
+ *
+ * Prior to using the do-while the compiler would get upset at the
+ * "else" because it interpreted the "if" statement as being all
+ * done when it reached the ';' after the yyless() call.
+ */
+
+/* Return all but the first 'n' matched characters back to the input stream. */
+
#define yyless(n) \
do \
{ \
/* Undo effects of setting up yytext. */ \
- int yyless_macro_arg = (n); \
- YY_LESS_LINENO(yyless_macro_arg);\
- *yy_cp = (yy_hold_char); \
+ *yy_cp = yy_hold_char; \
YY_RESTORE_YY_MORE_OFFSET \
- (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+ yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
YY_DO_BEFORE_ACTION; /* set up yytext again */ \
} \
while ( 0 )
-#define unput(c) yyunput( c, (yytext_ptr) )
+#define unput(c) yyunput( c, yytext_ptr )
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
+/* Some routines like yy_flex_realloc() are emitted as static but are
+ not called by all lexers. This generates warnings in some compilers,
+ notably GCC. Arrange to suppress these. */
+#ifdef __GNUC__
+#define YY_MAY_BE_UNUSED __attribute__((unused))
+#else
+#define YY_MAY_BE_UNUSED
#endif
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
+/* The following is because we cannot portably get our hands on size_t
+ * (without autoconf's help, which isn't available because we want
+ * flex-generated scanners to compile on their own).
+ */
+typedef unsigned int yy_size_t;
+
+
struct yy_buffer_state
{
FILE *yy_input_file;
@@ -221,16 +186,12 @@ struct yy_buffer_state
*/
int yy_at_bol;
- int yy_bs_lineno; /**< The line count. */
- int yy_bs_column; /**< The column count. */
-
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
int yy_fill_buffer;
int yy_buffer_status;
-
#define YY_BUFFER_NEW 0
#define YY_BUFFER_NORMAL 1
/* When an EOF's been seen but there's still some text to process
@@ -244,38 +205,28 @@ struct yy_buffer_state
* just pointing yyin at a new input file.
*/
#define YY_BUFFER_EOF_PENDING 2
-
};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE yy_current_buffer = 0;
/* We provide macros for accessing buffer states in case in the
* future we want to put the buffer states in a more general
* "scanner state".
- *
- * Returns the top of the stack, or NULL.
*/
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
- ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
- : NULL)
+#define YY_CURRENT_BUFFER yy_current_buffer
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
/* yy_hold_char holds the character lost when yytext is formed. */
static char yy_hold_char;
+
static int yy_n_chars; /* number of characters read into yy_ch_buf */
+
+
int yyleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0; /* whether we need to initialize */
+static int yy_init = 1; /* whether we need to initialize */
static int yy_start = 0; /* start state number */
/* Flag which is used to allow yywrap()'s to do buffer switches
@@ -283,95 +234,69 @@ static int yy_start = 0; /* start state number */
*/
static int yy_did_buffer_switch_on_eof;
-void yyrestart (FILE *input_file );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size );
-void yy_delete_buffer (YY_BUFFER_STATE b );
-void yy_flush_buffer (YY_BUFFER_STATE b );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file );
+void yyrestart YY_PROTO(( FILE *input_file ));
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
+void yy_load_buffer_state YY_PROTO(( void ));
+YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
+void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
+void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len );
+YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
+YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
+YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
-void *yyalloc (yy_size_t );
-void *yyrealloc (void *,yy_size_t );
-void yyfree (void * );
+static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
+static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;
+static void yy_flex_free YY_PROTO(( void * ));
#define yy_new_buffer yy_create_buffer
#define yy_set_interactive(is_interactive) \
{ \
- if ( ! YY_CURRENT_BUFFER ){ \
- yyensure_buffer_stack (); \
- YY_CURRENT_BUFFER_LVALUE = \
- yy_create_buffer(yyin,YY_BUF_SIZE ); \
- } \
- YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+ if ( ! yy_current_buffer ) \
+ yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+ yy_current_buffer->yy_is_interactive = is_interactive; \
}
#define yy_set_bol(at_bol) \
{ \
- if ( ! YY_CURRENT_BUFFER ){\
- yyensure_buffer_stack (); \
- YY_CURRENT_BUFFER_LVALUE = \
- yy_create_buffer(yyin,YY_BUF_SIZE ); \
- } \
- YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+ if ( ! yy_current_buffer ) \
+ yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+ yy_current_buffer->yy_at_bol = at_bol; \
}
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-/* Begin user sect3 */
-#define yywrap(n) 1
+#define yywrap() 1
#define YY_SKIP_YYWRAP
-
typedef unsigned char YY_CHAR;
-
FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
typedef int yy_state_type;
-
-extern int yylineno;
-
-int yylineno = 1;
-
extern char *yytext;
#define yytext_ptr yytext
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[] );
+static yy_state_type yy_get_previous_state YY_PROTO(( void ));
+static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
+static int yy_get_next_buffer YY_PROTO(( void ));
+static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
/* Done after the current pattern has been matched and before the
* corresponding action - sets up yytext.
*/
#define YY_DO_BEFORE_ACTION \
- (yytext_ptr) = yy_bp; \
- yyleng = (size_t) (yy_cp - yy_bp); \
- (yy_hold_char) = *yy_cp; \
+ yytext_ptr = yy_bp; \
+ yyleng = (int) (yy_cp - yy_bp); \
+ yy_hold_char = *yy_cp; \
*yy_cp = '\0'; \
- (yy_c_buf_p) = yy_cp;
+ yy_c_buf_p = yy_cp;
#define YY_NUM_RULES 11
#define YY_END_OF_BUFFER 12
-/* This struct is not used in this scanner,
- but its presence is necessary. */
-struct yy_trans_info
- {
- flex_int32_t yy_verify;
- flex_int32_t yy_nxt;
- };
-static yyconst flex_int16_t yy_accept[38] =
+static yyconst short int yy_accept[38] =
{ 0,
0, 0, 12, 10, 2, 1, 10, 10, 10, 8,
7, 7, 9, 4, 2, 0, 3, 0, 5, 0,
@@ -379,7 +304,7 @@ static yyconst flex_int16_t yy_accept[38] =
5, 0, 0, 8, 7, 6, 0
} ;
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst int yy_ec[256] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 1, 2, 1, 1, 1, 1, 1, 1, 1,
@@ -411,13 +336,13 @@ static yyconst flex_int32_t yy_ec[256] =
15, 15, 15, 15, 15
} ;
-static yyconst flex_int32_t yy_meta[19] =
+static yyconst int yy_meta[19] =
{ 0,
1, 1, 2, 1, 1, 1, 3, 3, 3, 4,
4, 1, 5, 4, 3, 1, 3, 3
} ;
-static yyconst flex_int16_t yy_base[45] =
+static yyconst short int yy_base[45] =
{ 0,
0, 0, 61, 86, 58, 86, 55, 14, 23, 43,
10, 46, 86, 28, 47, 40, 86, 16, 86, 22,
@@ -426,7 +351,7 @@ static yyconst flex_int16_t yy_base[45] =
70, 75, 77, 80
} ;
-static yyconst flex_int16_t yy_def[45] =
+static yyconst short int yy_def[45] =
{ 0,
37, 1, 37, 37, 37, 37, 38, 39, 37, 40,
9, 9, 37, 41, 37, 38, 37, 39, 37, 42,
@@ -435,7 +360,7 @@ static yyconst flex_int16_t yy_def[45] =
37, 37, 37, 37
} ;
-static yyconst flex_int16_t yy_nxt[105] =
+static yyconst short int yy_nxt[105] =
{ 0,
4, 5, 6, 7, 8, 9, 9, 10, 4, 11,
12, 13, 14, 14, 14, 4, 14, 14, 19, 23,
@@ -451,7 +376,7 @@ static yyconst flex_int16_t yy_nxt[105] =
37, 37, 37, 37
} ;
-static yyconst flex_int16_t yy_chk[105] =
+static yyconst short int yy_chk[105] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 8, 11,
@@ -470,9 +395,6 @@ static yyconst flex_int16_t yy_chk[105] =
static yy_state_type yy_last_accepting_state;
static char *yy_last_accepting_cpos;
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
-
/* The intent behind this definition is that it'll catch
* any uses of REJECT which flex missed.
*/
@@ -482,6 +404,7 @@ int yy_flex_debug = 0;
#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
#line 1 "pool_config.l"
+#define INITIAL 0
/* -*-pgsql-c-*- */
/*
*
@@ -490,7 +413,7 @@ char *yytext;
* pgpool: a language independent connection pool server for PostgreSQL
* written by Tatsuo Ishii
*
- * Copyright (c) 2003-2012 PgPool Global Development Group
+ * Copyright (c) 2003-2013 PgPool Global Development Group
*
* Permission to use, copy, modify, and distribute this software and
* its documentation for any purpose and without fee is hereby
@@ -541,52 +464,9 @@ static char *extract_string(char *value, POOL_TOKEN token);
static char **extract_string_tokens(char *str, char *delim, int *n);
static void clear_host_entry(int slot);
-#line 545 "pool_config.c"
-
-#define INITIAL 0
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-static int yy_init_globals (void );
-
-/* Accessor methods to globals.
- These are made visible to non-reentrant scanners for convenience. */
-
-int yylex_destroy (void );
-
-int yyget_debug (void );
-
-void yyset_debug (int debug_flag );
-
-YY_EXTRA_TYPE yyget_extra (void );
-
-void yyset_extra (YY_EXTRA_TYPE user_defined );
-
-FILE *yyget_in (void );
-
-void yyset_in (FILE * in_str );
-
-FILE *yyget_out (void );
-
-void yyset_out (FILE * out_str );
-
-int yyget_leng (void );
-
-char *yyget_text (void );
-
-int yyget_lineno (void );
-
-void yyset_lineno (int line_number );
+#define YY_NEVER_INTERACTIVE 1
+#define YY_NO_UNPUT 1
+#line 470 "pool_config.c"
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -594,28 +474,65 @@ void yyset_lineno (int line_number );
#ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int yywrap YY_PROTO(( void ));
#else
-extern int yywrap (void );
+extern int yywrap YY_PROTO(( void ));
#endif
#endif
+#ifndef YY_NO_UNPUT
+static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+#endif
+
#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
#endif
#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen YY_PROTO(( yyconst char * ));
#endif
#ifndef YY_NO_INPUT
-
#ifdef __cplusplus
-static int yyinput (void );
+static int yyinput YY_PROTO(( void ));
+#else
+static int input YY_PROTO(( void ));
+#endif
+#endif
+
+#if YY_STACK_USED
+static int yy_start_stack_ptr = 0;
+static int yy_start_stack_depth = 0;
+static int *yy_start_stack = 0;
+#ifndef YY_NO_PUSH_STATE
+static void yy_push_state YY_PROTO(( int new_state ));
+#endif
+#ifndef YY_NO_POP_STATE
+static void yy_pop_state YY_PROTO(( void ));
+#endif
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state YY_PROTO(( void ));
+#endif
+
#else
-static int input (void );
+#define YY_NO_PUSH_STATE 1
+#define YY_NO_POP_STATE 1
+#define YY_NO_TOP_STATE 1
#endif
+#ifdef YY_MALLOC_DECL
+YY_MALLOC_DECL
+#else
+#if __STDC__
+#ifndef __cplusplus
+#include <stdlib.h>
+#endif
+#else
+/* Just try to get by without declaring the routines. This will fail
+ * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
+ * or sizeof(void*) != sizeof(int).
+ */
+#endif
#endif
/* Amount of stuff to slurp up with each read. */
@@ -624,11 +541,12 @@ static int input (void );
#endif
/* Copy whatever the last rule matched to the standard output. */
+
#ifndef ECHO
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -636,10 +554,9 @@ static int input (void );
*/
#ifndef YY_INPUT
#define YY_INPUT(buf,result,max_size) \
- if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+ if ( yy_current_buffer->yy_is_interactive ) \
{ \
- int c = '*'; \
- unsigned n; \
+ int c = '*', n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -649,22 +566,9 @@ static int input (void );
YY_FATAL_ERROR( "input in flex scanner failed" ); \
result = n; \
} \
- else \
- { \
- errno=0; \
- while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
- { \
- if( errno != EINTR) \
- { \
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- break; \
- } \
- errno=0; \
- clearerr(yyin); \
- } \
- }\
-\
-
+ else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
+ && ferror( yyin ) ) \
+ YY_FATAL_ERROR( "input in flex scanner failed" );
#endif
/* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -685,18 +589,12 @@ static int input (void );
#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
#endif
-/* end tables serialization structures and prototypes */
-
/* Default declaration of generated scanner - a define so the user can
* easily add parameters.
*/
#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int yylex (void);
-
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
+#define YY_DECL int yylex YY_PROTO(( void ))
+#endif
/* Code executed at the beginning of each rule, after yytext and yyleng
* have been set up.
@@ -713,29 +611,27 @@ extern int yylex (void);
#define YY_RULE_SETUP \
YY_USER_ACTION
-/** The main scanner function which does all the work.
- */
YY_DECL
-{
+ {
register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
+ register char *yy_cp = NULL, *yy_bp = NULL;
register int yy_act;
-
+
#line 85 "pool_config.l"
-#line 728 "pool_config.c"
+#line 624 "pool_config.c"
- if ( !(yy_init) )
+ if ( yy_init )
{
- (yy_init) = 1;
+ yy_init = 0;
#ifdef YY_USER_INIT
YY_USER_INIT;
#endif
- if ( ! (yy_start) )
- (yy_start) = 1; /* first start state */
+ if ( ! yy_start )
+ yy_start = 1; /* first start state */
if ( ! yyin )
yyin = stdin;
@@ -743,36 +639,34 @@ YY_DECL
if ( ! yyout )
yyout = stdout;
- if ( ! YY_CURRENT_BUFFER ) {
- yyensure_buffer_stack ();
- YY_CURRENT_BUFFER_LVALUE =
- yy_create_buffer(yyin,YY_BUF_SIZE );
- }
+ if ( ! yy_current_buffer )
+ yy_current_buffer =
+ yy_create_buffer( yyin, YY_BUF_SIZE );
- yy_load_buffer_state( );
+ yy_load_buffer_state();
}
while ( 1 ) /* loops until end-of-file is reached */
{
- yy_cp = (yy_c_buf_p);
+ yy_cp = yy_c_buf_p;
/* Support of yytext. */
- *yy_cp = (yy_hold_char);
+ *yy_cp = yy_hold_char;
/* yy_bp points to the position in yy_ch_buf of the start of
* the current run.
*/
yy_bp = yy_cp;
- yy_current_state = (yy_start);
+ yy_current_state = yy_start;
yy_match:
do
{
register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
if ( yy_accept[yy_current_state] )
{
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
+ yy_last_accepting_state = yy_current_state;
+ yy_last_accepting_cpos = yy_cp;
}
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
@@ -783,28 +677,33 @@ yy_match:
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_current_state != 37 );
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
+ while ( yy_base[yy_current_state] != 86 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
+ if ( yy_act == 0 )
+ { /* have to back up */
+ yy_cp = yy_last_accepting_cpos;
+ yy_current_state = yy_last_accepting_state;
+ yy_act = yy_accept[yy_current_state];
+ }
YY_DO_BEFORE_ACTION;
+
do_action: /* This label is used only to access EOF actions. */
+
switch ( yy_act )
{ /* beginning of action switch */
case 0: /* must back up */
/* undo the effects of YY_DO_BEFORE_ACTION */
- *yy_cp = (yy_hold_char);
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
+ *yy_cp = yy_hold_char;
+ yy_cp = yy_last_accepting_cpos;
+ yy_current_state = yy_last_accepting_state;
goto yy_find_action;
case 1:
-/* rule 1 can match eol */
YY_RULE_SETUP
#line 87 "pool_config.l"
Lineno++; return POOL_EOL;
@@ -815,8 +714,8 @@ YY_RULE_SETUP
/* eat whitespace */
YY_BREAK
case 3:
-*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
-(yy_c_buf_p) = yy_cp -= 1;
+*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
+yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
#line 89 "pool_config.l"
@@ -862,33 +761,33 @@ YY_RULE_SETUP
#line 100 "pool_config.l"
ECHO;
YY_BREAK
-#line 866 "pool_config.c"
+#line 765 "pool_config.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
case YY_END_OF_BUFFER:
{
/* Amount of text matched not including the EOB char. */
- int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+ int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
/* Undo the effects of YY_DO_BEFORE_ACTION. */
- *yy_cp = (yy_hold_char);
+ *yy_cp = yy_hold_char;
YY_RESTORE_YY_MORE_OFFSET
- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+ if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
{
/* We're scanning a new file or input source. It's
* possible that this happened because the user
* just pointed yyin at a new source and called
* yylex(). If so, then we have to assure
- * consistency between YY_CURRENT_BUFFER and our
+ * consistency between yy_current_buffer and our
* globals. Here is the right place to do so, because
* this is the first action (other than possibly a
* back-up) that will match for the new input source.
*/
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+ yy_n_chars = yy_current_buffer->yy_n_chars;
+ yy_current_buffer->yy_input_file = yyin;
+ yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
}
/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -898,13 +797,13 @@ case YY_STATE_EOF(INITIAL):
* end-of-buffer state). Contrast this with the test
* in input().
*/
- if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+ if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
{ /* This was really a NUL. */
yy_state_type yy_next_state;
- (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+ yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
- yy_current_state = yy_get_previous_state( );
+ yy_current_state = yy_get_previous_state();
/* Okay, we're now positioned to make the NUL
* transition. We couldn't have
@@ -917,31 +816,30 @@ case YY_STATE_EOF(INITIAL):
yy_next_state = yy_try_NUL_trans( yy_current_state );
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+ yy_bp = yytext_ptr + YY_MORE_ADJ;
if ( yy_next_state )
{
/* Consume the NUL. */
- yy_cp = ++(yy_c_buf_p);
+ yy_cp = ++yy_c_buf_p;
yy_current_state = yy_next_state;
goto yy_match;
}
else
{
- yy_cp = (yy_last_accepting_cpos);
- yy_current_state = (yy_last_accepting_state);
+ yy_cp = yy_c_buf_p;
goto yy_find_action;
}
}
- else switch ( yy_get_next_buffer( ) )
+ else switch ( yy_get_next_buffer() )
{
case EOB_ACT_END_OF_FILE:
{
- (yy_did_buffer_switch_on_eof) = 0;
+ yy_did_buffer_switch_on_eof = 0;
- if ( yywrap( ) )
+ if ( yywrap() )
{
/* Note: because we've taken care in
* yy_get_next_buffer() to have set up
@@ -952,7 +850,7 @@ case YY_STATE_EOF(INITIAL):
* YY_NULL, it'll still work - another
* YY_NULL will get returned.
*/
- (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+ yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
yy_act = YY_STATE_EOF(YY_START);
goto do_action;
@@ -960,30 +858,30 @@ case YY_STATE_EOF(INITIAL):
else
{
- if ( ! (yy_did_buffer_switch_on_eof) )
+ if ( ! yy_did_buffer_switch_on_eof )
YY_NEW_FILE;
}
break;
}
case EOB_ACT_CONTINUE_SCAN:
- (yy_c_buf_p) =
- (yytext_ptr) + yy_amount_of_matched_text;
+ yy_c_buf_p =
+ yytext_ptr + yy_amount_of_matched_text;
- yy_current_state = yy_get_previous_state( );
+ yy_current_state = yy_get_previous_state();
- yy_cp = (yy_c_buf_p);
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+ yy_cp = yy_c_buf_p;
+ yy_bp = yytext_ptr + YY_MORE_ADJ;
goto yy_match;
case EOB_ACT_LAST_MATCH:
- (yy_c_buf_p) =
- &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+ yy_c_buf_p =
+ &yy_current_buffer->yy_ch_buf[yy_n_chars];
- yy_current_state = yy_get_previous_state( );
+ yy_current_state = yy_get_previous_state();
- yy_cp = (yy_c_buf_p);
- yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+ yy_cp = yy_c_buf_p;
+ yy_bp = yytext_ptr + YY_MORE_ADJ;
goto yy_find_action;
}
break;
@@ -994,7 +892,8 @@ case YY_STATE_EOF(INITIAL):
"fatal flex scanner internal error--no action found" );
} /* end of action switch */
} /* end of scanning one token */
-} /* end of yylex */
+ } /* end of yylex */
+
/* yy_get_next_buffer - try to read in a new buffer
*
@@ -1003,20 +902,21 @@ case YY_STATE_EOF(INITIAL):
* EOB_ACT_CONTINUE_SCAN - continue scanning from current position
* EOB_ACT_END_OF_FILE - end of file
*/
-static int yy_get_next_buffer (void)
-{
- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- register char *source = (yytext_ptr);
+
+static int yy_get_next_buffer()
+ {
+ register char *dest = yy_current_buffer->yy_ch_buf;
+ register char *source = yytext_ptr;
register int number_to_move, i;
int ret_val;
- if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+ if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
YY_FATAL_ERROR(
"fatal flex scanner internal error--end of buffer missed" );
- if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+ if ( yy_current_buffer->yy_fill_buffer == 0 )
{ /* Don't try to fill the buffer, so this is an EOF. */
- if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+ if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
{
/* We matched a single character, the EOB, so
* treat this as a final EOF.
@@ -1036,30 +936,34 @@ static int yy_get_next_buffer (void)
/* Try to read more data. */
/* First move last chars to start of buffer. */
- number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+ number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
for ( i = 0; i < number_to_move; ++i )
*(dest++) = *(source++);
- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+ if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
/* don't do the read, it's not guaranteed to return an EOF,
* just force an EOF
*/
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+ yy_current_buffer->yy_n_chars = yy_n_chars = 0;
else
{
- int num_to_read =
- YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+ int num_to_read =
+ yy_current_buffer->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */
+#ifdef YY_USES_REJECT
+ YY_FATAL_ERROR(
+"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+#else
/* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+ YY_BUFFER_STATE b = yy_current_buffer;
int yy_c_buf_p_offset =
- (int) ((yy_c_buf_p) - b->yy_ch_buf);
+ (int) (yy_c_buf_p - b->yy_ch_buf);
if ( b->yy_is_our_buffer )
{
@@ -1072,7 +976,8 @@ static int yy_get_next_buffer (void)
b->yy_ch_buf = (char *)
/* Include room in for 2 EOB chars. */
- yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
+ yy_flex_realloc( (void *) b->yy_ch_buf,
+ b->yy_buf_size + 2 );
}
else
/* Can't grow it, we don't own it. */
@@ -1082,35 +987,35 @@ static int yy_get_next_buffer (void)
YY_FATAL_ERROR(
"fatal error - scanner input buffer overflow" );
- (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+ yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
- num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+ num_to_read = yy_current_buffer->yy_buf_size -
number_to_move - 1;
-
+#endif
}
if ( num_to_read > YY_READ_BUF_SIZE )
num_to_read = YY_READ_BUF_SIZE;
/* Read in more data. */
- YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), (size_t) num_to_read );
+ YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
+ yy_n_chars, num_to_read );
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+ yy_current_buffer->yy_n_chars = yy_n_chars;
}
- if ( (yy_n_chars) == 0 )
+ if ( yy_n_chars == 0 )
{
if ( number_to_move == YY_MORE_ADJ )
{
ret_val = EOB_ACT_END_OF_FILE;
- yyrestart(yyin );
+ yyrestart( yyin );
}
else
{
ret_val = EOB_ACT_LAST_MATCH;
- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+ yy_current_buffer->yy_buffer_status =
YY_BUFFER_EOF_PENDING;
}
}
@@ -1118,39 +1023,32 @@ static int yy_get_next_buffer (void)
else
ret_val = EOB_ACT_CONTINUE_SCAN;
- if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
- /* Extend the array by 50%, plus the number we really need. */
- yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
- if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
- }
-
- (yy_n_chars) += number_to_move;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+ yy_n_chars += number_to_move;
+ yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
+ yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
- (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+ yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
return ret_val;
-}
+ }
+
/* yy_get_previous_state - get the state just before the EOB char was reached */
- static yy_state_type yy_get_previous_state (void)
-{
+static yy_state_type yy_get_previous_state()
+ {
register yy_state_type yy_current_state;
register char *yy_cp;
-
- yy_current_state = (yy_start);
- for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+ yy_current_state = yy_start;
+
+ for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
{
register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] )
{
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
+ yy_last_accepting_state = yy_current_state;
+ yy_last_accepting_cpos = yy_cp;
}
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
@@ -1162,23 +1060,30 @@ static int yy_get_next_buffer (void)
}
return yy_current_state;
-}
+ }
+
/* yy_try_NUL_trans - try to make a transition on the NUL character
*
* synopsis
* next_state = yy_try_NUL_trans( current_state );
*/
- static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
-{
+
+#ifdef YY_USE_PROTOS
+static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
+#else
+static yy_state_type yy_try_NUL_trans( yy_current_state )
+yy_state_type yy_current_state;
+#endif
+ {
register int yy_is_jam;
- register char *yy_cp = (yy_c_buf_p);
+ register char *yy_cp = yy_c_buf_p;
register YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] )
{
- (yy_last_accepting_state) = yy_current_state;
- (yy_last_accepting_cpos) = yy_cp;
+ yy_last_accepting_state = yy_current_state;
+ yy_last_accepting_cpos = yy_cp;
}
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
@@ -1190,36 +1095,81 @@ static int yy_get_next_buffer (void)
yy_is_jam = (yy_current_state == 37);
return yy_is_jam ? 0 : yy_current_state;
-}
+ }
+
+
+#ifndef YY_NO_UNPUT
+#ifdef YY_USE_PROTOS
+static void yyunput( int c, register char *yy_bp )
+#else
+static void yyunput( c, yy_bp )
+int c;
+register char *yy_bp;
+#endif
+ {
+ register char *yy_cp = yy_c_buf_p;
+
+ /* undo effects of setting up yytext */
+ *yy_cp = yy_hold_char;
+
+ if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+ { /* need to shift things up to make room */
+ /* +2 for EOB chars. */
+ register int number_to_move = yy_n_chars + 2;
+ register char *dest = &yy_current_buffer->yy_ch_buf[
+ yy_current_buffer->yy_buf_size + 2];
+ register char *source =
+ &yy_current_buffer->yy_ch_buf[number_to_move];
+
+ while ( source > yy_current_buffer->yy_ch_buf )
+ *--dest = *--source;
+
+ yy_cp += (int) (dest - source);
+ yy_bp += (int) (dest - source);
+ yy_current_buffer->yy_n_chars =
+ yy_n_chars = yy_current_buffer->yy_buf_size;
+
+ if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+ YY_FATAL_ERROR( "flex scanner push-back overflow" );
+ }
+
+ *--yy_cp = (char) c;
+
+
+ yytext_ptr = yy_bp;
+ yy_hold_char = *yy_cp;
+ yy_c_buf_p = yy_cp;
+ }
+#endif /* ifndef YY_NO_UNPUT */
+
#ifndef YY_NO_INPUT
#ifdef __cplusplus
- static int yyinput (void)
+static int yyinput()
#else
- static int input (void)
+static int input()
#endif
-
-{
+ {
int c;
-
- *(yy_c_buf_p) = (yy_hold_char);
- if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+ *yy_c_buf_p = yy_hold_char;
+
+ if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
{
/* yy_c_buf_p now points to the character we want to return.
* If this occurs *before* the EOB characters, then it's a
* valid NUL; if not, then we've hit the end of the buffer.
*/
- if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+ if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
/* This was really a NUL. */
- *(yy_c_buf_p) = '\0';
+ *yy_c_buf_p = '\0';
else
{ /* need more input */
- int offset = (yy_c_buf_p) - (yytext_ptr);
- ++(yy_c_buf_p);
+ int offset = yy_c_buf_p - yytext_ptr;
+ ++yy_c_buf_p;
- switch ( yy_get_next_buffer( ) )
+ switch ( yy_get_next_buffer() )
{
case EOB_ACT_LAST_MATCH:
/* This happens because yy_g_n_b()
@@ -1233,16 +1183,16 @@ static int yy_get_next_buffer (void)
*/
/* Reset buffer status. */
- yyrestart(yyin );
+ yyrestart( yyin );
- /*FALLTHROUGH*/
+ /* fall through */
case EOB_ACT_END_OF_FILE:
{
- if ( yywrap( ) )
+ if ( yywrap() )
return EOF;
- if ( ! (yy_did_buffer_switch_on_eof) )
+ if ( ! yy_did_buffer_switch_on_eof )
YY_NEW_FILE;
#ifdef __cplusplus
return yyinput();
@@ -1252,92 +1202,90 @@ static int yy_get_next_buffer (void)
}
case EOB_ACT_CONTINUE_SCAN:
- (yy_c_buf_p) = (yytext_ptr) + offset;
+ yy_c_buf_p = yytext_ptr + offset;
break;
}
}
}
- c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
- *(yy_c_buf_p) = '\0'; /* preserve yytext */
- (yy_hold_char) = *++(yy_c_buf_p);
+ c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */
+ *yy_c_buf_p = '\0'; /* preserve yytext */
+ yy_hold_char = *++yy_c_buf_p;
+
return c;
-}
-#endif /* ifndef YY_NO_INPUT */
+ }
+#endif /* YY_NO_INPUT */
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- *
- * @note This function does not reset the start condition to @c INITIAL .
- */
- void yyrestart (FILE * input_file )
-{
-
- if ( ! YY_CURRENT_BUFFER ){
- yyensure_buffer_stack ();
- YY_CURRENT_BUFFER_LVALUE =
- yy_create_buffer(yyin,YY_BUF_SIZE );
+#ifdef YY_USE_PROTOS
+void yyrestart( FILE *input_file )
+#else
+void yyrestart( input_file )
+FILE *input_file;
+#endif
+ {
+ if ( ! yy_current_buffer )
+ yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+
+ yy_init_buffer( yy_current_buffer, input_file );
+ yy_load_buffer_state();
}
- yy_init_buffer(YY_CURRENT_BUFFER,input_file );
- yy_load_buffer_state( );
-}
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- *
- */
- void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer )
-{
-
- /* TODO. We should be able to replace this entire function body
- * with
- * yypop_buffer_state();
- * yypush_buffer_state(new_buffer);
- */
- yyensure_buffer_stack ();
- if ( YY_CURRENT_BUFFER == new_buffer )
+#ifdef YY_USE_PROTOS
+void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
+#else
+void yy_switch_to_buffer( new_buffer )
+YY_BUFFER_STATE new_buffer;
+#endif
+ {
+ if ( yy_current_buffer == new_buffer )
return;
- if ( YY_CURRENT_BUFFER )
+ if ( yy_current_buffer )
{
/* Flush out information for old buffer. */
- *(yy_c_buf_p) = (yy_hold_char);
- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+ *yy_c_buf_p = yy_hold_char;
+ yy_current_buffer->yy_buf_pos = yy_c_buf_p;
+ yy_current_buffer->yy_n_chars = yy_n_chars;
}
- YY_CURRENT_BUFFER_LVALUE = new_buffer;
- yy_load_buffer_state( );
+ yy_current_buffer = new_buffer;
+ yy_load_buffer_state();
/* We don't actually know whether we did this switch during
* EOF (yywrap()) processing, but the only time this flag
* is looked at is after yywrap() is called, so it's safe
* to go ahead and always set it.
*/
- (yy_did_buffer_switch_on_eof) = 1;
-}
+ yy_did_buffer_switch_on_eof = 1;
+ }
-static void yy_load_buffer_state (void)
-{
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
- yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
- (yy_hold_char) = *(yy_c_buf_p);
-}
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- *
- * @return the allocated buffer state.
- */
- YY_BUFFER_STATE yy_create_buffer (FILE * file, int size )
-{
+#ifdef YY_USE_PROTOS
+void yy_load_buffer_state( void )
+#else
+void yy_load_buffer_state()
+#endif
+ {
+ yy_n_chars = yy_current_buffer->yy_n_chars;
+ yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
+ yyin = yy_current_buffer->yy_input_file;
+ yy_hold_char = *yy_c_buf_p;
+ }
+
+
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
+#else
+YY_BUFFER_STATE yy_create_buffer( file, size )
+FILE *file;
+int size;
+#endif
+ {
YY_BUFFER_STATE b;
-
- b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
+
+ b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@@ -1346,71 +1294,75 @@ static void yy_load_buffer_state (void)
/* yy_ch_buf has to be 2 characters longer than the size given because
* we need to put in 2 end-of-buffer characters.
*/
- b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 );
+ b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
if ( ! b->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
b->yy_is_our_buffer = 1;
- yy_init_buffer(b,file );
+ yy_init_buffer( b, file );
return b;
-}
+ }
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- *
- */
- void yy_delete_buffer (YY_BUFFER_STATE b )
-{
-
+
+#ifdef YY_USE_PROTOS
+void yy_delete_buffer( YY_BUFFER_STATE b )
+#else
+void yy_delete_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+ {
if ( ! b )
return;
- if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
- YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+ if ( b == yy_current_buffer )
+ yy_current_buffer = (YY_BUFFER_STATE) 0;
if ( b->yy_is_our_buffer )
- yyfree((void *) b->yy_ch_buf );
+ yy_flex_free( (void *) b->yy_ch_buf );
- yyfree((void *) b );
-}
+ yy_flex_free( (void *) b );
+ }
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
- static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file )
-{
- int oerrno = errno;
-
- yy_flush_buffer(b );
+
+#ifdef YY_USE_PROTOS
+void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
+#else
+void yy_init_buffer( b, file )
+YY_BUFFER_STATE b;
+FILE *file;
+#endif
+
+
+ {
+ yy_flush_buffer( b );
b->yy_input_file = file;
b->yy_fill_buffer = 1;
- /* If b is the current buffer, then yy_init_buffer was _probably_
- * called from yyrestart() or through yy_get_next_buffer.
- * In that case, we don't want to reset the lineno or column.
- */
- if (b != YY_CURRENT_BUFFER){
- b->yy_bs_lineno = 1;
- b->yy_bs_column = 0;
- }
+#if YY_ALWAYS_INTERACTIVE
+ b->yy_is_interactive = 1;
+#else
+#if YY_NEVER_INTERACTIVE
+ b->yy_is_interactive = 0;
+#else
+ b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+#endif
+#endif
+ }
- b->yy_is_interactive = 0;
-
- errno = oerrno;
-}
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- *
- */
- void yy_flush_buffer (YY_BUFFER_STATE b )
-{
- if ( ! b )
+#ifdef YY_USE_PROTOS
+void yy_flush_buffer( YY_BUFFER_STATE b )
+#else
+void yy_flush_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+
+ {
+ if ( ! b )
return;
b->yy_n_chars = 0;
@@ -1427,125 +1379,29 @@ static void yy_load_buffer_state (void)
b->yy_at_bol = 1;
b->yy_buffer_status = YY_BUFFER_NEW;
- if ( b == YY_CURRENT_BUFFER )
- yy_load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- * the current state. This function will allocate the stack
- * if necessary.
- * @param new_buffer The new state.
- *
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
- if (new_buffer == NULL)
- return;
-
- yyensure_buffer_stack();
-
- /* This block is copied from yy_switch_to_buffer. */
- if ( YY_CURRENT_BUFFER )
- {
- /* Flush out information for old buffer. */
- *(yy_c_buf_p) = (yy_hold_char);
- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
- }
-
- /* Only push if top exists. Otherwise, replace top. */
- if (YY_CURRENT_BUFFER)
- (yy_buffer_stack_top)++;
- YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
- /* copied from yy_switch_to_buffer. */
- yy_load_buffer_state( );
- (yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- * The next element becomes the new top.
- *
- */
-void yypop_buffer_state (void)
-{
- if (!YY_CURRENT_BUFFER)
- return;
-
- yy_delete_buffer(YY_CURRENT_BUFFER );
- YY_CURRENT_BUFFER_LVALUE = NULL;
- if ((yy_buffer_stack_top) > 0)
- --(yy_buffer_stack_top);
-
- if (YY_CURRENT_BUFFER) {
- yy_load_buffer_state( );
- (yy_did_buffer_switch_on_eof) = 1;
+ if ( b == yy_current_buffer )
+ yy_load_buffer_state();
}
-}
-
-/* Allocates the stack if it does not exist.
- * Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (void)
-{
- int num_to_alloc;
-
- if (!(yy_buffer_stack)) {
-
- /* First allocation is just for 2 elements, since we don't know if this
- * scanner will even need a stack. We use 2 instead of 1 to avoid an
- * immediate realloc on the next call.
- */
- num_to_alloc = 1;
- (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
- (num_to_alloc * sizeof(struct yy_buffer_state*)
- );
- if ( ! (yy_buffer_stack) )
- YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
- memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
- (yy_buffer_stack_max) = num_to_alloc;
- (yy_buffer_stack_top) = 0;
- return;
- }
-
- if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
- /* Increase the buffer to prepare for a possible push. */
- int grow_size = 8 /* arbitrary grow size */;
- num_to_alloc = (yy_buffer_stack_max) + grow_size;
- (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
- ((yy_buffer_stack),
- num_to_alloc * sizeof(struct yy_buffer_state*)
- );
- if ( ! (yy_buffer_stack) )
- YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
- /* zero only the new slots.*/
- memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
- (yy_buffer_stack_max) = num_to_alloc;
- }
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- *
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
-{
+#ifndef YY_NO_SCAN_BUFFER
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
+#else
+YY_BUFFER_STATE yy_scan_buffer( base, size )
+char *base;
+yy_size_t size;
+#endif
+ {
YY_BUFFER_STATE b;
-
+
if ( size < 2 ||
base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR )
/* They forgot to leave room for the EOB's. */
return 0;
- b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
+ b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
@@ -1559,51 +1415,56 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
b->yy_fill_buffer = 0;
b->yy_buffer_status = YY_BUFFER_NEW;
- yy_switch_to_buffer(b );
+ yy_switch_to_buffer( b );
return b;
-}
+ }
+#endif
-/** Setup the input buffer state to scan a string. The next call to yylex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- *
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- * yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
-{
-
- return yy_scan_bytes(yystr,strlen(yystr) );
-}
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- *
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len )
-{
+#ifndef YY_NO_SCAN_STRING
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
+#else
+YY_BUFFER_STATE yy_scan_string( yy_str )
+yyconst char *yy_str;
+#endif
+ {
+ int len;
+ for ( len = 0; yy_str[len]; ++len )
+ ;
+
+ return yy_scan_bytes( yy_str, len );
+ }
+#endif
+
+
+#ifndef YY_NO_SCAN_BYTES
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
+#else
+YY_BUFFER_STATE yy_scan_bytes( bytes, len )
+yyconst char *bytes;
+int len;
+#endif
+ {
YY_BUFFER_STATE b;
char *buf;
yy_size_t n;
int i;
-
+
/* Get memory for full buffer, including space for trailing EOB's. */
- n = _yybytes_len + 2;
- buf = (char *) yyalloc(n );
+ n = len + 2;
+ buf = (char *) yy_flex_alloc( n );
if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
- for ( i = 0; i < _yybytes_len; ++i )
- buf[i] = yybytes[i];
+ for ( i = 0; i < len; ++i )
+ buf[i] = bytes[i];
- buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+ buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
- b = yy_scan_buffer(buf,n );
+ b = yy_scan_buffer( buf, n );
if ( ! b )
YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
@@ -1613,196 +1474,148 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len )
b->yy_is_our_buffer = 1;
return b;
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
+ }
#endif
-static void yy_fatal_error (yyconst char* msg )
-{
- (void) fprintf( stderr, "%s\n", msg );
- exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-#undef yyless
-#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up yytext. */ \
- int yyless_macro_arg = (n); \
- YY_LESS_LINENO(yyless_macro_arg);\
- yytext[yyleng] = (yy_hold_char); \
- (yy_c_buf_p) = yytext + yyless_macro_arg; \
- (yy_hold_char) = *(yy_c_buf_p); \
- *(yy_c_buf_p) = '\0'; \
- yyleng = yyless_macro_arg; \
- } \
- while ( 0 )
+#ifndef YY_NO_PUSH_STATE
+#ifdef YY_USE_PROTOS
+static void yy_push_state( int new_state )
+#else
+static void yy_push_state( new_state )
+int new_state;
+#endif
+ {
+ if ( yy_start_stack_ptr >= yy_start_stack_depth )
+ {
+ yy_size_t new_size;
-/* Accessor methods (get/set functions) to struct members. */
+ yy_start_stack_depth += YY_START_STACK_INCR;
+ new_size = yy_start_stack_depth * sizeof( int );
-/** Get the current line number.
- *
- */
-int yyget_lineno (void)
-{
-
- return yylineno;
-}
+ if ( ! yy_start_stack )
+ yy_start_stack = (int *) yy_flex_alloc( new_size );
-/** Get the input stream.
- *
- */
-FILE *yyget_in (void)
-{
- return yyin;
-}
+ else
+ yy_start_stack = (int *) yy_flex_realloc(
+ (void *) yy_start_stack, new_size );
-/** Get the output stream.
- *
- */
-FILE *yyget_out (void)
-{
- return yyout;
-}
+ if ( ! yy_start_stack )
+ YY_FATAL_ERROR(
+ "out of memory expanding start-condition stack" );
+ }
-/** Get the length of the current token.
- *
- */
-int yyget_leng (void)
-{
- return yyleng;
-}
+ yy_start_stack[yy_start_stack_ptr++] = YY_START;
-/** Get the current token.
- *
- */
+ BEGIN(new_state);
+ }
+#endif
-char *yyget_text (void)
-{
- return yytext;
-}
-/** Set the current line number.
- * @param line_number
- *
- */
-void yyset_lineno (int line_number )
-{
-
- yylineno = line_number;
-}
+#ifndef YY_NO_POP_STATE
+static void yy_pop_state()
+ {
+ if ( --yy_start_stack_ptr < 0 )
+ YY_FATAL_ERROR( "start-condition stack underflow" );
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- *
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE * in_str )
-{
- yyin = in_str ;
-}
+ BEGIN(yy_start_stack[yy_start_stack_ptr]);
+ }
+#endif
-void yyset_out (FILE * out_str )
-{
- yyout = out_str ;
-}
-int yyget_debug (void)
-{
- return yy_flex_debug;
-}
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state()
+ {
+ return yy_start_stack[yy_start_stack_ptr - 1];
+ }
+#endif
-void yyset_debug (int bdebug )
-{
- yy_flex_debug = bdebug ;
-}
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
-static int yy_init_globals (void)
-{
- /* Initialization is the same as for the non-reentrant scanner.
- * This function is called from yylex_destroy(), so don't allocate here.
- */
-
- (yy_buffer_stack) = 0;
- (yy_buffer_stack_top) = 0;
- (yy_buffer_stack_max) = 0;
- (yy_c_buf_p) = (char *) 0;
- (yy_init) = 0;
- (yy_start) = 0;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
- yyin = stdin;
- yyout = stdout;
+#ifdef YY_USE_PROTOS
+static void yy_fatal_error( yyconst char msg[] )
#else
- yyin = (FILE *) 0;
- yyout = (FILE *) 0;
+static void yy_fatal_error( msg )
+char msg[];
#endif
+ {
+ (void) fprintf( stderr, "%s\n", msg );
+ exit( YY_EXIT_FAILURE );
+ }
- /* For future reference: Set errno on error, since we are called by
- * yylex_init()
- */
- return 0;
-}
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy (void)
-{
-
- /* Pop the buffer stack, destroying each element. */
- while(YY_CURRENT_BUFFER){
- yy_delete_buffer(YY_CURRENT_BUFFER );
- YY_CURRENT_BUFFER_LVALUE = NULL;
- yypop_buffer_state();
- }
- /* Destroy the stack itself. */
- yyfree((yy_buffer_stack) );
- (yy_buffer_stack) = NULL;
+/* Redefine yyless() so it works in section 3 code. */
- /* Reset the globals. This is important in a non-reentrant scanner so the next time
- * yylex() is called, initialization will occur. */
- yy_init_globals( );
+#undef yyless
+#define yyless(n) \
+ do \
+ { \
+ /* Undo effects of setting up yytext. */ \
+ yytext[yyleng] = yy_hold_char; \
+ yy_c_buf_p = yytext + n; \
+ yy_hold_char = *yy_c_buf_p; \
+ *yy_c_buf_p = '\0'; \
+ yyleng = n; \
+ } \
+ while ( 0 )
- return 0;
-}
-/*
- * Internal utility routines.
- */
+/* Internal utility routines. */
#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
+#ifdef YY_USE_PROTOS
+static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
+#else
+static void yy_flex_strncpy( s1, s2, n )
+char *s1;
+yyconst char *s2;
+int n;
+#endif
+ {
register int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
-}
+ }
#endif
#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
+#ifdef YY_USE_PROTOS
+static int yy_flex_strlen( yyconst char *s )
+#else
+static int yy_flex_strlen( s )
+yyconst char *s;
+#endif
+ {
register int n;
for ( n = 0; s[n]; ++n )
;
return n;
-}
+ }
#endif
-void *yyalloc (yy_size_t size )
-{
+
+#ifdef YY_USE_PROTOS
+static void *yy_flex_alloc( yy_size_t size )
+#else
+static void *yy_flex_alloc( size )
+yy_size_t size;
+#endif
+ {
return (void *) malloc( size );
-}
+ }
-void *yyrealloc (void * ptr, yy_size_t size )
-{
+#ifdef YY_USE_PROTOS
+static void *yy_flex_realloc( void *ptr, yy_size_t size )
+#else
+static void *yy_flex_realloc( ptr, size )
+void *ptr;
+yy_size_t size;
+#endif
+ {
/* The cast to (char *) in the following accommodates both
* implementations that use char* generic pointers, and those
* that use void* generic pointers. It works with the latter
@@ -1811,19 +1624,28 @@ void *yyrealloc (void * ptr, yy_size_t size )
* as though doing an assignment.
*/
return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr )
-{
- free( (char *) ptr ); /* see yyrealloc() for (char *) cast */
-}
+ }
-#define YYTABLES_NAME "yytables"
+#ifdef YY_USE_PROTOS
+static void yy_flex_free( void *ptr )
+#else
+static void yy_flex_free( ptr )
+void *ptr;
+#endif
+ {
+ free( ptr );
+ }
+#if YY_MAIN
+int main()
+ {
+ yylex();
+ return 0;
+ }
+#endif
#line 100 "pool_config.l"
-
int pool_init_config(void)
{
int res;
@@ -1864,7 +1686,7 @@ int pool_init_config(void)
pool_error("failed to allocate pool_config->cwother_wd");
return -1;
}
- memset(pool_config->other_wd,0,sizeof(WdDesc));
+ memset(pool_config->other_wd, 0, sizeof(WdDesc));
/* set hardcoded default values */
pool_config->listen_addresses = "localhost";
@@ -1958,8 +1780,8 @@ int pool_init_config(void)
* add for watchdog
*/
pool_config->use_watchdog = 0;
- pool_config->trusted_servers = NULL;
- pool_config->delegate_IP = NULL;
+ pool_config->trusted_servers = "";
+ pool_config->delegate_IP = "";
res = gethostname(localhostname,sizeof(localhostname));
if(res !=0 )
{
@@ -1968,6 +1790,7 @@ int pool_init_config(void)
pool_config->wd_hostname = localhostname;
pool_config->wd_port = 9000;
pool_config->other_wd->num_wd = 0;
+ pool_config->other_wd->num_udp_if = 0;
pool_config->wd_interval = 10;
pool_config->ping_path = "/bin";
pool_config->ifconfig_path = "/sbin";
@@ -1981,6 +1804,11 @@ int pool_init_config(void)
pool_config->wd_lifecheck_user = "nobody";
pool_config->wd_lifecheck_password = "";
+ pool_config->watchdog_mode = "udp";
+ pool_config->wd_udp_keepalive = 2;
+ pool_config->wd_udp_deadtime = 30;
+ pool_config->wd_udp_port = 9694;
+ pool_config->wd_udp_authkey = "";
pool_config->memory_cache_enabled = 0;
pool_config->memqcache_method = "shmem";
@@ -3578,17 +3406,6 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
}
pool_config->log_per_node_statement = v;
}
- else if (!strcmp(key, "log_statement") && CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context))
- {
- int v = eval_logical(yytext);
-
- if (v < 0)
- {
- pool_error("pool_config: invalid value %s for %s", yytext, key);
- return(-1);
- }
- pool_config->log_statement = v;
- }
else if (!strcmp(key, "lobj_lock_table") && CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context))
{
@@ -3672,7 +3489,7 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
{
WD_INFO(slot).wd_port = atoi(yytext);
WD_INFO(slot).status = WD_INIT;
- pool_config->other_wd->num_wd = slot+1;
+ pool_config->other_wd->num_wd = slot + 1;
}
}
else if (!strcmp(key, "use_watchdog") && CHECK_CONTEXT(INIT_CONFIG, context))
@@ -3687,6 +3504,7 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
}
pool_config->use_watchdog = v;
}
+
else if (!strcmp(key, "trusted_servers") && CHECK_CONTEXT(INIT_CONFIG, context))
{
char *str;
@@ -3974,6 +3792,140 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
pool_config->wd_lifecheck_password = str;
}
+ else if (!strcmp(key, "watchdog_mode") && CHECK_CONTEXT(INIT_CONFIG, context))
+ {
+ char *str;
+
+ if (token != POOL_STRING && token != POOL_UNQUOTED_STRING && token != POOL_KEY)
+ {
+ PARSE_ERROR();
+ fclose(fd);
+ return(-1);
+ }
+ str = extract_string(yytext, token);
+ if (str == NULL)
+ {
+ fclose(fd);
+ return(-1);
+ }
+
+ if (strcmp(str, MODE_UDP) && strcmp(str, MODE_QUERY))
+ {
+ pool_error("pool_config: %s must be either \"udp\" or \"query\"", key);
+ fclose(fd);
+ return(-1);
+ }
+ pool_config->watchdog_mode = str;
+ }
+ else if (!strcmp(key, "wd_udp_port") && CHECK_CONTEXT(INIT_CONFIG, context))
+ {
+ int v = atoi(yytext);
+
+ if (token != POOL_INTEGER || v <= 0)
+ {
+ pool_error("pool_config: %s must be higher than 1 numeric value", key);
+ fclose(fd);
+ return(-1);
+ }
+ pool_config->wd_udp_port = v;
+ }
+ else if (!strcmp(key, "wd_udp_keepalive") && CHECK_CONTEXT(INIT_CONFIG, context))
+ {
+ int v = atoi(yytext);
+
+ if (token != POOL_INTEGER || v <= 0)
+ {
+ pool_error("pool_config: %s must be higher than 1 numeric value", key);
+ fclose(fd);
+ return(-1);
+ }
+ pool_config->wd_udp_keepalive = v;
+ }
+ else if (!strcmp(key, "wd_udp_deadtime") && CHECK_CONTEXT(INIT_CONFIG, context))
+ {
+ int v = atoi(yytext);
+
+ if (token != POOL_INTEGER || v <= 0)
+ {
+ pool_error("pool_config: %s must be higher than 1 numeric value", key);
+ fclose(fd);
+ return(-1);
+ }
+ pool_config->wd_udp_deadtime = v;
+ }
+ else if (!strcmp(key, "wd_udp_authkey") &&
+ CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context))
+ {
+ char *str;
+
+ if (token != POOL_STRING && token != POOL_UNQUOTED_STRING && token != POOL_KEY)
+ {
+ PARSE_ERROR();
+ fclose(fd);
+ return(-1);
+ }
+ str = extract_string(yytext, token);
+ if (str == NULL)
+ {
+ fclose(fd);
+ return(-1);
+ }
+ pool_config->wd_udp_authkey = str;
+ }
+
+ else if (!strncmp(key, "udp_device", 10) &&
+ CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context) &&
+ mypid == getpid()) /* this parameter must be modified by parent pid */
+ {
+ int slot;
+ char *str;
+
+ slot = atoi(key + 10) ;
+ if (slot < 0 || slot >= WD_MAX_IF_NUM)
+ {
+ pool_error("pool_config: pgpool number %s for udp_device out of range", key);
+ fclose(fd);
+ return(-1);
+ }
+
+ str = extract_string(yytext, token);
+ if (str == NULL)
+ {
+ fclose(fd);
+ return(-1);
+ }
+ if (context == INIT_CONFIG || (context == RELOAD_CONFIG ))
+ {
+ strlcpy(WD_UDP_IF(slot).if_name, str, WD_MAX_IF_NAME_LEN);
+ pool_config->other_wd->num_udp_if = slot + 1;
+ }
+
+ }
+ else if (!strncmp(key, "udp_destination", 15) &&
+ CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context) &&
+ mypid == getpid()) /* this parameter must be modified by parent pid */
+ {
+ int slot;
+ char *str;
+
+ slot = atoi(key + 15) ;
+ if (slot < 0 || slot >= WD_MAX_IF_NUM)
+ {
+ pool_error("pool_config: pgpool number %s for udp_destination out of range", key);
+ fclose(fd);
+ return(-1);
+ }
+
+ str = extract_string(yytext, token);
+ if (str == NULL)
+ {
+ fclose(fd);
+ return(-1);
+ }
+ if (context == INIT_CONFIG || (context == RELOAD_CONFIG ))
+ strlcpy(WD_UDP_IF(slot).addr, str, WD_MAX_IF_NAME_LEN);
+ }
+
else if (!strcmp(key, "ssl") && CHECK_CONTEXT(INIT_CONFIG, context))
{
int v = eval_logical(yytext);
@@ -4199,18 +4151,6 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
}
pool_config->memqcache_total_size = v;
}
- else if (!strcmp(key, "memqcache_total_size") && CHECK_CONTEXT(INIT_CONFIG, context))
- {
- int v = atoi(yytext);
-
- if (token != POOL_INTEGER || v < 0)
- {
- pool_error("pool_config: %s must be equal or higher than 0 numeric value", key);
- fclose(fd);
- return(-1);
- }
- pool_config->memqcache_total_size = v;
- }
else if (!strcmp(key, "memqcache_max_num_cache") && CHECK_CONTEXT(INIT_CONFIG, context))
{
int v = atoi(yytext);
@@ -4356,7 +4296,7 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
if (log_destination_changed)
{
- // log_destination has changed, we need to open syslog or close it
+ /* log_destination has changed, we need to open syslog or close it */
if (!strcmp(pool_config->log_destination, "stderr"))
{
closelog();
@@ -4741,4 +4681,3 @@ char *pool_flag_to_str(unsigned short flag)
snprintf(buf, sizeof(buf), "DISALLOW_TO_FAILOVER");
return buf;
}
-
diff --git a/pool_config.h b/pool_config.h
index eb4a405bc..fb36dec7e 100644
--- a/pool_config.h
+++ b/pool_config.h
@@ -37,6 +37,9 @@
#define MODE_STREAMREP "stream" /* Streaming Replication */
#define MODE_SLONY "slony" /* Slony-I */
+#define MODE_UDP "udp"
+#define MODE_QUERY "query"
+
/*
* Regex support in white and black list function
*/
@@ -237,6 +240,12 @@ typedef struct {
char *wd_lifecheck_dbname; /* Database name connected for lifecheck */
char *wd_lifecheck_user; /* PostgreSQL user name for watchdog */
char *wd_lifecheck_password; /* password for watchdog user */
+
+ char *watchdog_mode;
+ int wd_udp_keepalive;
+ int wd_udp_deadtime;
+ int wd_udp_port;
+ char *wd_udp_authkey;
} POOL_CONFIG;
typedef enum {
diff --git a/pool_config.l b/pool_config.l
index 652568e62..aa8331855 100644
--- a/pool_config.l
+++ b/pool_config.l
@@ -139,7 +139,7 @@ int pool_init_config(void)
pool_error("failed to allocate pool_config->cwother_wd");
return -1;
}
- memset(pool_config->other_wd,0,sizeof(WdDesc));
+ memset(pool_config->other_wd, 0, sizeof(WdDesc));
/* set hardcoded default values */
pool_config->listen_addresses = "localhost";
@@ -233,8 +233,8 @@ int pool_init_config(void)
* add for watchdog
*/
pool_config->use_watchdog = 0;
- pool_config->trusted_servers = NULL;
- pool_config->delegate_IP = NULL;
+ pool_config->trusted_servers = "";
+ pool_config->delegate_IP = "";
res = gethostname(localhostname,sizeof(localhostname));
if(res !=0 )
{
@@ -243,6 +243,7 @@ int pool_init_config(void)
pool_config->wd_hostname = localhostname;
pool_config->wd_port = 9000;
pool_config->other_wd->num_wd = 0;
+ pool_config->other_wd->num_udp_if = 0;
pool_config->wd_interval = 10;
pool_config->ping_path = "/bin";
pool_config->ifconfig_path = "/sbin";
@@ -256,6 +257,11 @@ int pool_init_config(void)
pool_config->wd_lifecheck_user = "nobody";
pool_config->wd_lifecheck_password = "";
+ pool_config->watchdog_mode = "udp";
+ pool_config->wd_udp_keepalive = 2;
+ pool_config->wd_udp_deadtime = 30;
+ pool_config->wd_udp_port = 9694;
+ pool_config->wd_udp_authkey = "";
pool_config->memory_cache_enabled = 0;
pool_config->memqcache_method = "shmem";
@@ -1936,7 +1942,7 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
{
WD_INFO(slot).wd_port = atoi(yytext);
WD_INFO(slot).status = WD_INIT;
- pool_config->other_wd->num_wd = slot+1;
+ pool_config->other_wd->num_wd = slot + 1;
}
}
else if (!strcmp(key, "use_watchdog") && CHECK_CONTEXT(INIT_CONFIG, context))
@@ -2239,6 +2245,140 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
pool_config->wd_lifecheck_password = str;
}
+ else if (!strcmp(key, "watchdog_mode") && CHECK_CONTEXT(INIT_CONFIG, context))
+ {
+ char *str;
+
+ if (token != POOL_STRING && token != POOL_UNQUOTED_STRING && token != POOL_KEY)
+ {
+ PARSE_ERROR();
+ fclose(fd);
+ return(-1);
+ }
+ str = extract_string(yytext, token);
+ if (str == NULL)
+ {
+ fclose(fd);
+ return(-1);
+ }
+
+ if (strcmp(str, MODE_UDP) && strcmp(str, MODE_QUERY))
+ {
+ pool_error("pool_config: %s must be either \"udp\" or \"query\"", key);
+ fclose(fd);
+ return(-1);
+ }
+ pool_config->watchdog_mode = str;
+ }
+ else if (!strcmp(key, "wd_udp_port") && CHECK_CONTEXT(INIT_CONFIG, context))
+ {
+ int v = atoi(yytext);
+
+ if (token != POOL_INTEGER || v <= 0)
+ {
+ pool_error("pool_config: %s must be higher than 1 numeric value", key);
+ fclose(fd);
+ return(-1);
+ }
+ pool_config->wd_udp_port = v;
+ }
+ else if (!strcmp(key, "wd_udp_keepalive") && CHECK_CONTEXT(INIT_CONFIG, context))
+ {
+ int v = atoi(yytext);
+
+ if (token != POOL_INTEGER || v <= 0)
+ {
+ pool_error("pool_config: %s must be higher than 1 numeric value", key);
+ fclose(fd);
+ return(-1);
+ }
+ pool_config->wd_udp_keepalive = v;
+ }
+ else if (!strcmp(key, "wd_udp_deadtime") && CHECK_CONTEXT(INIT_CONFIG, context))
+ {
+ int v = atoi(yytext);
+
+ if (token != POOL_INTEGER || v <= 0)
+ {
+ pool_error("pool_config: %s must be higher than 1 numeric value", key);
+ fclose(fd);
+ return(-1);
+ }
+ pool_config->wd_udp_deadtime = v;
+ }
+ else if (!strcmp(key, "wd_udp_authkey") &&
+ CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context))
+ {
+ char *str;
+
+ if (token != POOL_STRING && token != POOL_UNQUOTED_STRING && token != POOL_KEY)
+ {
+ PARSE_ERROR();
+ fclose(fd);
+ return(-1);
+ }
+ str = extract_string(yytext, token);
+ if (str == NULL)
+ {
+ fclose(fd);
+ return(-1);
+ }
+ pool_config->wd_udp_authkey = str;
+ }
+
+ else if (!strncmp(key, "udp_device", 10) &&
+ CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context) &&
+ mypid == getpid()) /* this parameter must be modified by parent pid */
+ {
+ int slot;
+ char *str;
+
+ slot = atoi(key + 10) ;
+ if (slot < 0 || slot >= WD_MAX_IF_NUM)
+ {
+ pool_error("pool_config: pgpool number %s for udp_device out of range", key);
+ fclose(fd);
+ return(-1);
+ }
+
+ str = extract_string(yytext, token);
+ if (str == NULL)
+ {
+ fclose(fd);
+ return(-1);
+ }
+ if (context == INIT_CONFIG || (context == RELOAD_CONFIG ))
+ {
+ strlcpy(WD_UDP_IF(slot).if_name, str, WD_MAX_IF_NAME_LEN);
+ pool_config->other_wd->num_udp_if = slot + 1;
+ }
+
+ }
+ else if (!strncmp(key, "udp_destination", 15) &&
+ CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context) &&
+ mypid == getpid()) /* this parameter must be modified by parent pid */
+ {
+ int slot;
+ char *str;
+
+ slot = atoi(key + 15) ;
+ if (slot < 0 || slot >= WD_MAX_IF_NUM)
+ {
+ pool_error("pool_config: pgpool number %s for udp_destination out of range", key);
+ fclose(fd);
+ return(-1);
+ }
+
+ str = extract_string(yytext, token);
+ if (str == NULL)
+ {
+ fclose(fd);
+ return(-1);
+ }
+ if (context == INIT_CONFIG || (context == RELOAD_CONFIG ))
+ strlcpy(WD_UDP_IF(slot).addr, str, WD_MAX_IF_NAME_LEN);
+ }
+
else if (!strcmp(key, "ssl") && CHECK_CONTEXT(INIT_CONFIG, context))
{
int v = eval_logical(yytext);
@@ -2609,7 +2749,7 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
if (log_destination_changed)
{
- // log_destination has changed, we need to open syslog or close it
+ /* log_destination has changed, we need to open syslog or close it */
if (!strcmp(pool_config->log_destination, "stderr"))
{
closelog();
diff --git a/watchdog/Makefile.am b/watchdog/Makefile.am
index 707f1961f..432eb4ee4 100644
--- a/watchdog/Makefile.am
+++ b/watchdog/Makefile.am
@@ -10,6 +10,7 @@ lib_watchdog_a_SOURCES = \
wd_lifecheck.c \
wd_list.c \
wd_packet.c \
- wd_ping.c
+ wd_ping.c \
+ wd_udp.c
AM_CPPFLAGS = -D_GNU_SOURCE -I .. -I @PGSQL_INCLUDE_DIR@
diff --git a/watchdog/watchdog.c b/watchdog/watchdog.c
index e65d26182..1188d3562 100644
--- a/watchdog/watchdog.c
+++ b/watchdog/watchdog.c
@@ -43,6 +43,9 @@ unsigned char * WD_Node_List = NULL; /* node list */
pid_t wd_ppid = 0;
static pid_t child_pid;
+static pid_t reader_pid[WD_MAX_IF_NUM];
+static pid_t writer_pid[WD_MAX_IF_NUM];
+
pid_t wd_main(int fork_wait_time);
static void child_wait(int signo);
static void wd_exit(int exit_status);
@@ -64,6 +67,7 @@ static void
wd_exit(int exit_signo)
{
sigset_t mask;
+ int i;
sigemptyset(&mask);
sigaddset(&mask, SIGTERM);
@@ -75,6 +79,12 @@ wd_exit(int exit_signo)
wd_notice_server_down();
kill (child_pid, exit_signo);
+
+ for (i = 0; i < pool_config->other_wd->num_udp_if; i++)
+ {
+ kill (reader_pid[i], exit_signo);
+ kill (writer_pid[i], exit_signo);
+ }
child_wait(0);
exit(0);
@@ -84,12 +94,24 @@ static int
wd_check_config(void)
{
int status = WD_OK;
- if ((pool_config->other_wd->num_wd == 0) ||
- (pool_config->delegate_IP == NULL) ||
- (strlen(pool_config->delegate_IP) == 0))
+
+ if (pool_config->other_wd->num_wd == 0)
{
+ pool_error("wd_check_config: there is no other pgpools setting.");
status = WD_NG;
}
+ if (strlen(pool_config->delegate_IP) == 0)
+ {
+ pool_error("wd_check_config: delegate_IP is empty");
+ status = WD_NG;
+ }
+ if (strlen(pool_config->wd_udp_authkey) > MAX_PASSWORD_SIZE)
+ {
+ pool_error("wd_check_config: wd_udp_authkey length can't be larger than %d",
+ MAX_PASSWORD_SIZE);
+ status = WD_NG;
+ }
+
return status;
}
@@ -98,8 +120,8 @@ pid_t
wd_main(int fork_wait_time)
{
int status = WD_INIT;
- pid_t pgid = 0;
pid_t pid = 0;
+ int i;
if (!pool_config->use_watchdog)
{
@@ -131,7 +153,30 @@ wd_main(int fork_wait_time)
return child_pid;
}
- pgid = getpgid(0);
+
+ if (!strcmp(pool_config->watchdog_mode, "udp"))
+ {
+ for (i = 0; i < pool_config->other_wd->num_udp_if; i++)
+ {
+ /* reader */
+ reader_pid[i] = wd_reader(1, pool_config->other_wd->udp_if[i]);
+ if (reader_pid[i] < 0 )
+ {
+ pool_error("launch wd_reader failed");
+ return reader_pid[i];
+ }
+
+ /* writer */
+ writer_pid[i] = wd_writer(1, pool_config->other_wd->udp_if[i]);
+ if (writer_pid[i] < 0 )
+ {
+ pool_error("launch wd_writer failed");
+ return writer_pid[i];
+ }
+ }
+ }
+
+ /* fork lifecheck process*/
pid = fork();
if (pid != 0)
{
@@ -146,20 +191,23 @@ wd_main(int fork_wait_time)
init_ps_display("", "", "", "");
- signal(SIGCHLD, SIG_DFL);
- signal(SIGHUP, SIG_IGN);
+ signal(SIGTERM, wd_exit);
signal(SIGINT, wd_exit);
signal(SIGQUIT, wd_exit);
- signal(SIGTERM, wd_exit);
+ signal(SIGCHLD, SIG_DFL);
+ signal(SIGHUP, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
set_ps_display("lifecheck",false);
+
/* wait until ready to go */
while (WD_OK != is_wd_lifecheck_ready())
{
sleep(pool_config->wd_interval * 10);
}
+ pool_log("watchdog: lifecheck started");
+
/* watchdog loop */
for (;;)
{
diff --git a/watchdog/watchdog.h b/watchdog/watchdog.h
index 52f6bf892..a37608982 100644
--- a/watchdog/watchdog.h
+++ b/watchdog/watchdog.h
@@ -29,16 +29,31 @@
#include <sys/time.h>
#include "libpq-fe.h"
+#include "md5.h"
+
#define WD_MAX_HOST_NAMELEN (128)
#define WD_MAX_PATH_LEN (128)
#define MAX_WATCHDOG_NUM (128)
#define WD_SEND_TIMEOUT (1)
+#define WD_MAX_IF_NUM (256)
+#define WD_MAX_IF_NAME_LEN (16)
#define WD_INFO(wd_id) (pool_config->other_wd->wd_info[(wd_id)])
+#define WD_UDP_IF(if_id) (pool_config->other_wd->udp_if[(if_id)])
#define WD_NG (0)
#define WD_OK (1)
+#define WD_MAX_SALT (256)
+
+#define WD_TIME_INIT(tv) ((tv).tv_sec = (tv).tv_usec = 0)
+#define WD_TIME_ISSET(tv) ((tv).tv_sec || (tv).tv_usec)
+#define WD_TIME_BEFORE(a,b) (((a).tv_sec == (b).tv_sec) ? \
+ ((a).tv_usec < (b).tv_usec) : \
+ ((a).tv_sec < (b).tv_sec))
+#define WD_TIME_DIFF_SEC(a,b) (int)(((a).tv_sec - (b).tv_sec) + \
+ ((a).tv_usec - (b).tv_usec) / 1000000.0)
+
/*
* packet number of watchdog negotiation
*/
@@ -82,28 +97,38 @@ typedef struct {
char hostname[WD_MAX_HOST_NAMELEN]; /* host name */
int pgpool_port; /* pgpool port */
int wd_port; /* watchdog port */
- int life; /* life point */
+ int life; /* life point */
char delegate_ip[WD_MAX_HOST_NAMELEN]; /* delegate IP */
int delegate_ip_flag; /* delegate IP flag */
-}WdInfo;
+ struct timeval udp_send_time; /*send time */
+ struct timeval udp_last_recv_time; /* recv time */
+} WdInfo;
typedef struct {
int node_id_set[MAX_NUM_BACKENDS]; /* node sets */
int node_num; /* node number */
-}WdNodeInfo;
+} WdNodeInfo;
typedef union {
WdInfo wd_info;
WdNodeInfo wd_node_info;
} WD_PACKET_BODY;
+typedef struct {
+ char addr[WD_MAX_HOST_NAMELEN];
+ char if_name[WD_MAX_IF_NAME_LEN];
+} WdUdpIf;
+
typedef struct {
int num_wd; /* number of watchdogs */
WdInfo wd_info[MAX_WATCHDOG_NUM];
+
+ int num_udp_if; /* number of interface devices */
+ WdUdpIf udp_if[WD_MAX_IF_NUM];
} WdDesc;
/*
- * negotiation paket
+ * negotiation packet
*/
typedef struct {
WD_PACKET_NO packet_no; /* packet number */
@@ -119,12 +144,22 @@ typedef struct {
WdPacket * packet; /* packet data */
} WdPacketThreadArg;
+/*
+ * UDP packet
+ */
+typedef struct {
+ char from[WD_MAX_HOST_NAMELEN];
+ struct timeval send_time;
+ WD_STATUS status;
+ char hash[(MD5_PASSWD_LEN+1)*2];
+} WdUdpPacket;
+
/*
* thread argument for lifecheck of pgpool
*/
typedef struct {
PGconn * conn; /* PGconn */
- int retry; /* retry times */
+ int retry; /* retry times (not used?)*/
} WdPgpoolThreadArg;
extern WdInfo * WD_List;
diff --git a/watchdog/wd_child.c b/watchdog/wd_child.c
index e6a148653..f46c4c3af 100644
--- a/watchdog/wd_child.c
+++ b/watchdog/wd_child.c
@@ -68,6 +68,9 @@ wd_child(int fork_wait_time)
signal(SIGUSR2, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
signal(SIGALRM, SIG_IGN);
+ //TODO
+ // reload
+ // wakeup, failover??
init_ps_display("", "", "", "");
diff --git a/watchdog/wd_ext.h b/watchdog/wd_ext.h
index eaa8a308a..2b4d987e5 100644
--- a/watchdog/wd_ext.h
+++ b/watchdog/wd_ext.h
@@ -65,7 +65,7 @@ extern int wd_promote_backend(int node_id);
extern int wd_set_node_mask (WD_PACKET_NO packet_no, int *node_id_set, int count);
/* wd_ping.c */
extern int wd_is_upper_ok(char * server_list);
-extern int wd_is_unnsed_ip(char * ip);
+extern int wd_is_unused_ip(char * ip);
/* wd_if.c */
extern int wd_IP_up(void);
@@ -77,6 +77,14 @@ extern int is_wd_lifecheck_ready(void);
extern int wd_lifecheck(void);
extern int wd_ping_pgpool(WdInfo * pgpool);
+///hogehoge
+extern int wd_create_udp_send_socket(WdUdpIf udp_if);
+extern int wd_create_udp_recv_socket(WdUdpIf udp_if);
+extern int wd_udp_write(int sock, WdUdpPacket * pkt, int len, const char * destination);
+extern int wd_udp_read(int sock, WdUdpPacket * pkt);
+extern pid_t wd_reader(int fork_wait_time, WdUdpIf udp_if);
+extern pid_t wd_writer(int fork_wait_time, WdUdpIf udp_if);
+
/* main.c */
extern int myargc;
extern char **myargv;
diff --git a/watchdog/wd_if.c b/watchdog/wd_if.c
index e698379f6..ef9d6a549 100644
--- a/watchdog/wd_if.c
+++ b/watchdog/wd_if.c
@@ -35,6 +35,7 @@
#include "pool.h"
#include "pool_config.h"
#include "watchdog.h"
+#include "wd_ext.h"
int wd_IP_up(void);
int wd_IP_down(void);
diff --git a/watchdog/wd_init.c b/watchdog/wd_init.c
index 5bfc2aed9..96346c09e 100644
--- a/watchdog/wd_init.c
+++ b/watchdog/wd_init.c
@@ -38,6 +38,7 @@ int
wd_init(void)
{
struct timeval tv;
+ WdInfo * p;
/* set startup time */
gettimeofday(&tv, NULL);
@@ -53,6 +54,7 @@ wd_init(void)
}
memset(WD_List, 0, sizeof(WdInfo) * MAX_WATCHDOG_NUM);
}
+
/* allocate node list */
if (WD_Node_List == NULL)
{
@@ -64,15 +66,28 @@ wd_init(void)
}
memset(WD_Node_List, 0, sizeof(unsigned char) * MAX_NUM_BACKENDS);
}
+
/* set myself to watchdog list */
- wd_set_wd_list(pool_config->wd_hostname, pool_config->port, pool_config->wd_port, pool_config->delegate_IP, &tv, WD_NORMAL);
+ wd_set_wd_list(pool_config->wd_hostname, pool_config->port,
+ pool_config->wd_port, pool_config->delegate_IP,
+ &tv, WD_NORMAL);
+
/* set other pgpools to watchdog list */
wd_add_wd_list(pool_config->other_wd);
+ /* reset time value */
+ p = WD_List;
+ while (p->status != WD_END)
+ {
+ WD_TIME_INIT(p->udp_send_time);
+ WD_TIME_INIT(p->udp_last_recv_time);
+
+ p++;
+ }
+
/* check upper connection */
- if ((pool_config->trusted_servers != NULL) &&
- (strlen(pool_config->trusted_servers) > 0) &&
- (wd_is_upper_ok(pool_config->trusted_servers) != WD_OK))
+ if (strlen(pool_config->trusted_servers) &&
+ wd_is_upper_ok(pool_config->trusted_servers) != WD_OK)
{
pool_error("wd_init: failed to connect trusted server");
return WD_NG;
@@ -90,7 +105,7 @@ wd_init(void)
{
if (!wd_is_unused_ip(pool_config->delegate_IP))
{
- pool_error("wd_init: delegate_IP already exists");
+ pool_error("wd_init: delegate_IP %s already exists", pool_config->delegate_IP);
return WD_NG;
}
diff --git a/watchdog/wd_lifecheck.c b/watchdog/wd_lifecheck.c
index 99817e29f..5de18e72a 100644
--- a/watchdog/wd_lifecheck.c
+++ b/watchdog/wd_lifecheck.c
@@ -40,75 +40,87 @@
int is_wd_lifecheck_ready(void);
int wd_lifecheck(void);
int wd_ping_pgpool(WdInfo * pgpool);
-static void * ping_pgpool(void * arg);
+static void * thread_ping_pgpool(void * arg);
static PGconn * create_conn(char * hostname, int port);
static int pgpool_down(WdInfo * pool);
+static void check_pgpool_status(void);
+static void check_pgpool_status_by_query(void);
+static void check_pgpool_status_by_udp(void);
+static int ping_pgpool(PGconn * conn);
+static int is_parent_alive(void);
+
int
is_wd_lifecheck_ready(void)
{
- PGconn * conn = NULL;
- PGresult * res = (PGresult *)NULL;
- int status;
int rtn = WD_OK;
WdInfo * p = WD_List;
+ int i = 0;
+
while (p->status != WD_END)
{
- conn = create_conn(p->hostname, p->pgpool_port);
- if (conn != NULL)
+ /* query mode */
+ if (!strcmp(pool_config->watchdog_mode, "query"))
{
- res = PQexec(conn, pool_config->wd_lifecheck_query );
-
- status = PQresultStatus(res);
- if (res != NULL)
+ if (wd_ping_pgpool(p) == WD_NG)
+ {
+ pool_debug("is_wd_lifecheck_ready: pgpool %d (%s:%d) has not started yet",
+ i, p->hostname, p->pgpool_port);
+ rtn = WD_NG;
+ }
+ }
+ /* udp mode */
+ else if (!strcmp(pool_config->watchdog_mode, "udp"))
+ {
+ if (p == WD_List)
{
- PQclear(res);
+ p++;
+ i++;
+ continue;
}
- if ((status == PGRES_NONFATAL_ERROR )||
- (status == PGRES_FATAL_ERROR ))
+
+ if (!WD_TIME_ISSET(p->udp_last_recv_time) ||
+ !WD_TIME_ISSET(p->udp_send_time))
{
+ pool_debug("is_wd_lifecheck_ready: pgpool %d (%s:%d) has not sent the heartbeat signal yet",
+ i, p->hostname, p->pgpool_port);
rtn = WD_NG;
}
- PQfinish(conn);
}
+ /* otherwise */
else
{
- rtn = WD_NG;
+ pool_error("is_wd_lifecheck_ready: unkown watchdog mode %s",
+ pool_config->watchdog_mode);
+ return WD_NG;
}
+
p ++;
+ i ++;
}
- if (rtn == WD_OK)
- {
- pool_log("watchdog: lifecheck started");
- }
return rtn;
}
+/*
+ * Check if pgpool is living
+ */
int
wd_lifecheck(void)
{
- WdInfo * p = WD_List;
- pthread_attr_t attr;
- int rc;
- int i,cnt;
struct timeval tv;
- pthread_t thread[MAX_WATCHDOG_NUM];
- WdPgpoolThreadArg thread_arg[MAX_WATCHDOG_NUM];
-
/* set startup time */
gettimeofday(&tv, NULL);
/* check upper connection */
- if ((pool_config->trusted_servers != NULL) &&
- (strlen(pool_config->trusted_servers ) > 0) &&
- (wd_is_upper_ok(pool_config->trusted_servers) != WD_OK))
+ if (strlen(pool_config->trusted_servers) &&
+ wd_is_upper_ok(pool_config->trusted_servers) != WD_OK)
{
pool_error("wd_lifecheck: failed to connect to any trusted servers");
/* This server connection may be downed */
- if (p->status == WD_MASTER)
+ if (WD_List->status == WD_MASTER)
{
wd_IP_down();
}
@@ -123,30 +135,136 @@ wd_lifecheck(void)
return WD_OK;
}
+ /* check pgpool status */
+ check_pgpool_status();
+
+ /* I'm in down.... */
+ if (WD_List->status == WD_DOWN)
+ {
+ pool_error("wd_lifecheck: watchdog status is DOWN. You need to restart this for recovery.");
+ }
+
+ return WD_OK;
+}
+
+/*
+ * check pgpool status and modify WDList
+ */
+static void
+check_pgpool_status()
+{
+ /* query mode */
+ if (!strcmp(pool_config->watchdog_mode, "query"))
+ {
+ check_pgpool_status_by_query();
+ }
+ /* udp heartbeat mode */
+ else if (!strcmp(pool_config->watchdog_mode, "udp"))
+ {
+ check_pgpool_status_by_udp();
+ }
+}
+
+static void
+check_pgpool_status_by_udp(void)
+{
+ int cnt;
+ WdInfo * p = WD_List;
+ int interval;
+ struct timeval tv;
+
+ gettimeofday(&tv, NULL);
+
+ cnt = 0;
+ while (p->status != WD_END)
+ {
+ pool_debug("check_pgpool_status_by_udp: checking pgpool %d (%s:%d)",
+ cnt, p->hostname, p->pgpool_port);
+
+ if (p == WD_List)
+ {
+ if (is_parent_alive() == WD_NG && WD_List->status != WD_DOWN)
+ {
+ pool_debug("check_pgpool_status_by_udp: NG; the main pgpool process does't exist.");
+ pool_log("check_pgpool_status_by_udp: lifecheck failed. pgpool %d (%s:%d) seems not to be working",
+ cnt, p->hostname, p->pgpool_port);
+ wd_set_myself(&tv, WD_DOWN);
+ wd_notice_server_down();
+ }
+ else
+ {
+ pool_debug("check_pgpool_status_by_udp: OK");
+ }
+ }
+ else
+ {
+ interval = WD_TIME_DIFF_SEC(tv, p->udp_last_recv_time);
+
+ if (interval > pool_config->wd_udp_deadtime)
+ {
+ pool_debug("check_pgpool_status_by_udp: NG; the latest heartbeat received %d seconds ago", interval);
+ pool_log("check_pgpool_status_by_udp: lifecheck failed. pgpool %d (%s:%d) seems not to be working",
+ cnt, p->hostname, p->pgpool_port);
+ pgpool_down(p);
+ }
+ else
+ {
+ pool_debug("check_pgpool_status_by_udp: OK; the latest heartbeat received %d secconds ago", interval);
+ }
+ }
+
+ p++;
+ cnt++;
+ if (cnt >= MAX_WATCHDOG_NUM)
+ {
+ pool_error("check_pgpool_status_by_udp: pgpool num is out of range(%d)",cnt);
+ break;
+ }
+ }
+}
+
+static void
+check_pgpool_status_by_query(void)
+{
+ WdInfo * p = WD_List;
+ struct timeval tv;
+ pthread_attr_t attr;
+ pthread_t thread[MAX_WATCHDOG_NUM];
+ WdPgpoolThreadArg thread_arg[MAX_WATCHDOG_NUM];
+ int rc;
+ int i,cnt;
+
+ /* set startup time */
+ gettimeofday(&tv, NULL);
+
/* thread init */
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+
/* send packet to all watchdogs */
cnt = 0;
while (p->status != WD_END)
{
thread_arg[cnt].conn = create_conn(p->hostname, p->pgpool_port);
- rc = pthread_create(&thread[cnt], &attr, ping_pgpool, (void*)&thread_arg[cnt]);
+ rc = pthread_create(&thread[cnt], &attr, thread_ping_pgpool, (void*)&thread_arg[cnt]);
p ++;
cnt ++;
if (cnt >= MAX_WATCHDOG_NUM)
{
- pool_error("wd_lifecheck: pgpool num is out of range(%d)",cnt);
+ pool_error("check_pgpool_status_by_query: pgpool num is out of range(%d)",cnt);
break;
}
}
pthread_attr_destroy(&attr);
+
+ /* check results */
p = WD_List;
for (i = 0; i < cnt; )
{
int result;
- pool_debug("wd_lifecheck: checking pgpool %d (%s:%d)", i, p->hostname, p->pgpool_port);
+ pool_debug("check_pgpool_status_by_qury: checking pgpool %d (%s:%d)",
+ i, p->hostname, p->pgpool_port);
rc = pthread_join(thread[i], (void **)&result);
if ((rc != 0) && (errno == EINTR))
@@ -154,15 +272,17 @@ wd_lifecheck(void)
usleep(100);
continue;
}
+
if (result == WD_OK)
{
- pool_debug("wd_lifecheck: OK, status: %d", p->status);
+ pool_debug("check_pgpool_status_by_query: OK; status: %d", p->status);
+ /* life point init */
p->life = pool_config->wd_life_point;
}
else
{
- pool_debug("wd_lifecheck: NG, status: %d life:%d", p->status, p->life);
+ pool_debug("check_pgpool_status_by_query: NG; status: %d life:%d", p->status, p->life);
if (p->life > 0)
{
@@ -170,7 +290,7 @@ wd_lifecheck(void)
}
if (p->life <= 0)
{
- pool_log("wd_lifecheck: lifecheck failed %d times. pgpool %d (%s:%d) seems not to be working",
+ pool_log("check_pgpool_status_by_query: lifecheck failed %d times. pgpool %d (%s:%d) seems not to be working",
pool_config->wd_life_point, i, p->hostname, p->pgpool_port);
if ((i == 0) &&
@@ -188,42 +308,29 @@ wd_lifecheck(void)
i++;
p++;
}
-
- if (WD_List->status == WD_DOWN)
- {
- pool_error("wd_lifecheck: watchdog status is DOWN. You need to restart this for recovery.");
- }
-
- return WD_OK;
}
+/*
+ * Thread function to send lifecheck query to pgpool
+ * Used in wd_lifecheck.
+ */
static void *
-ping_pgpool(void * arg)
+thread_ping_pgpool(void * arg)
{
+ uintptr_t rtn;
WdPgpoolThreadArg * thread_arg;
PGconn * conn;
- uintptr_t rtn = (uintptr_t)WD_NG;
- int status = PGRES_FATAL_ERROR;
- PGresult * res = (PGresult *)NULL;
+
thread_arg = (WdPgpoolThreadArg *)arg;
conn = thread_arg->conn;
+ rtn = (uintptr_t)ping_pgpool(conn);
- res = PQexec(conn, pool_config->wd_lifecheck_query );
-
- status = PQresultStatus(res);
- if (res != NULL)
- {
- PQclear(res);
- }
- if ((status != PGRES_NONFATAL_ERROR ) &&
- (status != PGRES_FATAL_ERROR ))
- {
- rtn = WD_OK;
- }
- PQfinish(conn);
pthread_exit((void *)rtn);
}
+/*
+ * Create connection to pgpool
+ */
static PGconn *
create_conn(char * hostname, int port)
{
@@ -284,15 +391,33 @@ pgpool_down(WdInfo * pool)
return rtn;
}
+/*
+ * Check if pgpool can accept the lifecheck query.
+ */
int
wd_ping_pgpool(WdInfo * pgpool)
{
- int rtn = WD_NG;
+ int rtn;
PGconn * conn;
+
+ conn = create_conn(pgpool->hostname, pgpool->pgpool_port);
+ rtn = ping_pgpool(conn);
+
+ return rtn;
+}
+
+static int
+ping_pgpool(PGconn * conn)
+{
+ int rtn = WD_NG;
int status = PGRES_FATAL_ERROR;
PGresult * res = (PGresult *)NULL;
- conn = create_conn(pgpool->hostname, pgpool->pgpool_port);
+ if (!conn)
+ {
+ return WD_NG;
+ }
+
res = PQexec(conn, pool_config->wd_lifecheck_query );
status = PQresultStatus(res);
@@ -300,6 +425,7 @@ wd_ping_pgpool(WdInfo * pgpool)
{
PQclear(res);
}
+
if ((status != PGRES_NONFATAL_ERROR ) &&
(status != PGRES_FATAL_ERROR ))
{
@@ -309,3 +435,12 @@ wd_ping_pgpool(WdInfo * pgpool)
return rtn;
}
+
+static int
+is_parent_alive()
+{
+ if (mypid == getppid())
+ return WD_OK;
+ else
+ return WD_NG;
+}
diff --git a/watchdog/wd_list.c b/watchdog/wd_list.c
index 7da0bbf25..30e763772 100644
--- a/watchdog/wd_list.c
+++ b/watchdog/wd_list.c
@@ -39,6 +39,7 @@ int wd_am_I_oldest(void);
int wd_set_myself(struct timeval * tv, int status);
WdInfo * wd_is_alive_master(void);
+/* add or modify watchdog information list */
int
wd_set_wd_list(char * hostname, int pgpool_port, int wd_port, char * delegate_ip, struct timeval * tv, int status)
{
@@ -60,38 +61,49 @@ wd_set_wd_list(char * hostname, int pgpool_port, int wd_port, char * delegate_ip
for ( i = 0 ; i < MAX_WATCHDOG_NUM ; i ++)
{
p = (WD_List+i);
+
if( p->status != WD_END)
{
+ /* if exists already, modify this. */
if ((!strncmp(p->hostname, hostname, sizeof(p->hostname))) &&
(p->pgpool_port == pgpool_port) &&
(p->wd_port == wd_port))
{
+ p->status = status;
+
if (tv != NULL)
{
- memcpy(&(p->tv),tv,sizeof(struct timeval));
+ memcpy(&(p->tv), tv, sizeof(struct timeval));
}
- p->status = status;
+
return i;
}
}
+
+ /* add as a new watchdog */
else
{
- strlcpy(p->hostname, hostname, sizeof(p->hostname));
+ p->status = status;
p->pgpool_port = pgpool_port;
p->wd_port = wd_port;
+
+ strlcpy(p->hostname, hostname, sizeof(p->hostname));
strlcpy(p->delegate_ip, delegate_ip, sizeof(p->delegate_ip));
+
if (tv != NULL)
{
- memcpy(&(p->tv),tv,sizeof(struct timeval));
+ memcpy(&(p->tv), tv, sizeof(struct timeval));
}
- p->status = status;
+
return i;
}
}
+
pool_error("wd_set_wd_list: Can not add new watchdog information cause the WD_List is full.");
return -1;
}
+/* add watchdog information to list using config description */
int
wd_add_wd_list(WdDesc * other_wd)
{
@@ -103,20 +115,24 @@ wd_add_wd_list(WdDesc * other_wd)
pool_error("wd_add_wd_list: memory allocate error");
return -1;
}
+
for ( i = 0 ; i < other_wd->num_wd ; i ++)
{
p = &(other_wd->wd_info[i]);
strlcpy(p->delegate_ip, pool_config->delegate_IP, sizeof(p->delegate_ip));
wd_set_wd_info(p);
}
+
return i;
}
+/* set watchdog informaion to list */
int
wd_set_wd_info(WdInfo * info)
{
int rtn;
- rtn = wd_set_wd_list(info->hostname, info->pgpool_port, info->wd_port, info->delegate_ip, &(info->tv), info->status);
+ rtn = wd_set_wd_list(info->hostname, info->pgpool_port, info->wd_port,
+ info->delegate_ip, &(info->tv), info->status);
return rtn;
}
diff --git a/watchdog/wd_packet.c b/watchdog/wd_packet.c
index 80fa0f087..75adc664a 100644
--- a/watchdog/wd_packet.c
+++ b/watchdog/wd_packet.c
@@ -684,20 +684,25 @@ hton_wd_packet(WdPacket * to, WdPacket * from)
{
WdInfo * to_info = NULL;
WdInfo * from_info = NULL;
+
if ((to == NULL) || (from == NULL))
{
return WD_NG;
}
+
to_info = &(to->wd_body.wd_info);
from_info = &(from->wd_body.wd_info);
+
to->packet_no = htonl(from->packet_no);
to_info->status = htonl(from_info->status);
to_info->tv.tv_sec = htonl(from_info->tv.tv_sec);
to_info->tv.tv_usec = htonl(from_info->tv.tv_usec);
to_info->pgpool_port = htonl(from_info->pgpool_port);
to_info->wd_port = htonl(from_info->wd_port);
- memcpy(to_info->hostname,from_info->hostname,sizeof(to_info->hostname));
- memcpy(to_info->delegate_ip,from_info->delegate_ip,sizeof(to_info->delegate_ip));
+
+ memcpy(to_info->hostname, from_info->hostname, sizeof(to_info->hostname));
+ memcpy(to_info->delegate_ip, from_info->delegate_ip, sizeof(to_info->delegate_ip));
+
return WD_OK;
}
@@ -706,20 +711,25 @@ ntoh_wd_packet(WdPacket * to, WdPacket * from)
{
WdInfo * to_info = NULL;
WdInfo * from_info = NULL;
+
if ((to == NULL) || (from == NULL))
{
return WD_NG;
}
+
to_info = &(to->wd_body.wd_info);
from_info = &(from->wd_body.wd_info);
+
to->packet_no = ntohl(from->packet_no);
to_info->status = ntohl(from_info->status);
to_info->tv.tv_sec = ntohl(from_info->tv.tv_sec);
to_info->tv.tv_usec = ntohl(from_info->tv.tv_usec);
to_info->pgpool_port = ntohl(from_info->pgpool_port);
to_info->wd_port = ntohl(from_info->wd_port);
- memcpy(to_info->hostname,from_info->hostname,sizeof(to_info->hostname));
- memcpy(to_info->delegate_ip,from_info->delegate_ip,sizeof(to_info->delegate_ip));
+
+ memcpy(to_info->hostname, from_info->hostname, sizeof(to_info->hostname));
+ memcpy(to_info->delegate_ip, from_info->delegate_ip, sizeof(to_info->delegate_ip));
+
return WD_OK;
}
@@ -757,7 +767,7 @@ ntoh_wd_node_packet(WdPacket * to, WdPacket * from)
}
to_info = &(to->wd_body.wd_node_info);
from_info = &(from->wd_body.wd_node_info);
- to->packet_no = htonl(from->packet_no);
+ to->packet_no = ntohl(from->packet_no);
to_info->node_num = ntohl(from_info->node_num);
for (i = 0 ; i < to_info->node_num ; i ++)
{
@@ -776,7 +786,9 @@ wd_escalation(void)
/* interface up as delegate IP */
wd_IP_up();
/* set master status to the wd list */
- wd_set_wd_list(pool_config->wd_hostname, pool_config->port, pool_config->wd_port, pool_config->delegate_IP, NULL, WD_MASTER);
+ wd_set_wd_list(pool_config->wd_hostname, pool_config->port,
+ pool_config->wd_port, pool_config->delegate_IP,
+ NULL, WD_MASTER);
/* send declare packet */
rtn = wd_declare();
diff --git a/watchdog/wd_udp.c b/watchdog/wd_udp.c
new file mode 100644
index 000000000..a2c198282
--- /dev/null
+++ b/watchdog/wd_udp.c
@@ -0,0 +1,527 @@
+/*
+ * $Header$
+ *
+ * Handles watchdog connection, and protocol communication with pgpool-II
+ *
+ * pgpool: a language independent connection pool server for PostgreSQL
+ * written by Tatsuo Ishii
+ *
+ * Copyright (c) 2003-2013 PgPool Global Development Group
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby
+ * granted, provided that the above copyright notice appear in all
+ * copies and that both that copyright notice and this permission
+ * notice appear in supporting documentation, and that the name of the
+ * author not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. The author makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ */
+
+#include <pthread.h>
+#include <stdio.h>
+#include <errno.h>
+#include <ctype.h>
+#include <time.h>
+#include <string.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netinet/ip.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#if defined(SO_BINDTODEVICE)
+#include <net/if.h>
+#endif
+
+#include "pool.h"
+#include "pool_config.h"
+#include "md5.h"
+#include "watchdog.h"
+#include "wd_ext.h"
+
+#define MAX_BIND_TRIES 5
+
+static RETSIGTYPE writer_exit(int sig);
+static RETSIGTYPE reader_exit(int sig);
+static int hton_wd_udp_packet(WdUdpPacket * to, WdUdpPacket * from);
+static int ntoh_wd_udp_packet(WdUdpPacket * to, WdUdpPacket * from);
+static void calc_hash(WdUdpPacket pkt, char *buf);
+
+int
+wd_create_udp_send_socket(WdUdpIf udp_if)
+{
+ int sock;
+ int tos;
+
+ /* create socket */
+ if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+ {
+ /* socket create failed */
+ pool_error("wd_create_udp_send_socket: Failed to create socket. reason: %s", strerror(errno));
+ return -1;
+ }
+
+ /* set socket option */
+ tos = IPTOS_LOWDELAY;
+ if (setsockopt(sock, IPPROTO_IP, IP_TOS, (char *) &tos, sizeof(tos)) == -1 )
+ {
+ pool_error("wd_create_udp_send_socket: setsockopt(IP_TOS) failed. reason: %s", strerror(errno));
+ close(sock);
+ return -1;
+ }
+
+#if defined(SO_BINDTODEVICE)
+ {
+ struct ifreq i;
+ strlcpy(i.ifr_name, udp_if.if_name, sizeof(i.ifr_name));
+
+ if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, &i, sizeof(i)) == -1)
+ {
+ pool_error("wd_create_udp_send_socket: setsockopt(SO_BINDTODEVICE) failed. reason: %s",
+ strerror(errno));
+ close(sock);
+ return -1;
+ }
+ pool_log("wd_create_udp_send_socket: bind send socket to device: %s", i.ifr_name);
+ }
+#endif
+#if defined(SO_REUSEPORT)
+ {
+ int one = 1;
+ if (setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)) == -1)
+ {
+ pool_error("wd_create_udp_send_socket: setsockopt(SO_REUSEPORT) failed. reason: %s",
+ strerror(errno));
+ close(sock);
+ return -1;
+ }
+ pool_log("wd_create_udp_send_socket: set SO_REUSEPORT");
+ }
+#endif
+
+ if (fcntl(sock, F_SETFD, FD_CLOEXEC) < 0) {
+ pool_error("wd_create_udp_send_socket: setting close-on-exec flag failed. reason: %s", strerror(errno));
+ close(sock);
+ return -1;
+ }
+
+ return sock;
+}
+
+int
+wd_create_udp_recv_socket(WdUdpIf udp_if)
+{
+ struct sockaddr_in addr;
+ int sock;
+ const int one = 1;
+ int bind_tries;
+ int bind_is_done;
+
+ memset(&(addr), 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_port = htons(pool_config->wd_udp_port);
+ addr.sin_addr.s_addr = INADDR_ANY;
+
+ /* create socket */
+ if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+ {
+ /* socket create failed */
+ pool_error("wd_create_udp_recv_socket: Failed to create socket. reason: %s", strerror(errno));
+ return -1;
+ }
+
+ if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &one, sizeof(one)) == -1 )
+ {
+ pool_error("wd_create_udp_recv_socket: setsockopt(SO_REUSEADDR) failed. reason: %s", strerror(errno));
+ close(sock);
+ return -1;
+ }
+
+#if defined(SO_BINDTODEVICE)
+ {
+ struct ifreq i;
+ strlcpy(i.ifr_name, udp_if.if_name, sizeof(i.ifr_name));
+
+ if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, &i, sizeof(i)) == -1)
+ {
+ pool_error("wd_create_udp_recv_socket: setsockopt(SO_BINDTODEVICE) failed. reason: %s",
+ strerror(errno));
+ close(sock);
+ return -1;
+ }
+ pool_log("wd_create_udp_recv_socket: bind send socket to device: %s", i.ifr_name);
+ }
+#endif
+
+#if defined(SO_REUSEPORT)
+ {
+ if (setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)) == -1)
+ {
+ pool_error("wd_create_udp_recv_socket: setsockopt(SO_REUSEPORT) failed. reason: %s",
+ strerror(errno));
+ close(sock);
+ return -1;
+ }
+ pool_log("wd_create_udp_recv_socket: set SO_REUSEPORT");
+ }
+#endif
+
+ bind_is_done = 0;
+ for (bind_tries = 0; !bind_is_done && bind_tries < MAX_BIND_TRIES; bind_tries++)
+ {
+ if(bind(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr)) < 0)
+ {
+ pool_log("wd_crate_udp_recv_socket: bind failed. reason: %s ... retrying", strerror(errno));
+ sleep(1);
+ }
+ else
+ {
+ bind_is_done = 1;
+ }
+ }
+
+ /* bind failed finally */
+ if (!bind_is_done)
+ {
+ pool_error("wd_crate_udp_recv_socket: unable to bind socket. reason: %s", strerror(errno));
+ close(sock);
+ return -1;
+ }
+
+ if (fcntl(sock, F_SETFD, FD_CLOEXEC) < 0) {
+ pool_error("wd_create_udp_recv_socket: setting close-on-exec flag failed. reason: %s", strerror(errno));
+ close(sock);
+ return -1;
+ }
+
+ return sock;
+}
+
+int
+wd_udp_write(int sock, WdUdpPacket * pkt, int len, const char * host)
+{
+ int rtn;
+ struct sockaddr_in addr;
+ struct hostent *hp;
+ WdUdpPacket buf;
+
+ hp = gethostbyname(host);
+ if ((hp == NULL) || (hp->h_addrtype != AF_INET))
+ {
+ pool_error("wd_udp_write: gethostbyname() failed: %s host: %s",
+ hstrerror(h_errno), host);
+ return -1;
+ }
+ memmove((char *) &(addr.sin_addr), (char *) hp->h_addr, hp->h_length);
+
+ addr.sin_family = AF_INET;
+ addr.sin_port = htons(pool_config->wd_udp_port);
+
+ hton_wd_udp_packet(&buf, pkt);
+
+ if ((rtn = sendto(sock, &buf, sizeof(WdUdpPacket), 0,
+ (struct sockaddr *)&addr, sizeof(addr))) != len)
+ {
+ pool_error("wd_udp_write: failed to sent packet to %s", host);
+ return WD_NG;
+ }
+ pool_debug("wd_udp_write: send %d byte paeckt", rtn);
+
+ return WD_OK;
+}
+
+int
+wd_udp_read(int sock, WdUdpPacket * pkt)
+{
+ int rtn;
+ struct sockaddr_in senderinfo;
+ socklen_t addrlen;
+ WdUdpPacket buf;
+
+ addrlen = sizeof(senderinfo);
+
+ rtn = recvfrom(sock, &buf, sizeof(WdUdpPacket), 0,
+ (struct sockaddr *)&senderinfo, &addrlen);
+ if (rtn < 0)
+ {
+ pool_error("wd_udp_read: failed to receive packet");
+ return WD_NG;
+ }
+ else if (rtn == 0)
+ {
+ pool_error("wd_udp_read: received zero bytes");
+ return WD_NG;
+ }
+ else
+ {
+ pool_debug("wd_udp_read: received %d byte paeckt", rtn);
+ }
+
+ ntoh_wd_udp_packet(pkt, &buf);
+
+ return WD_OK;
+}
+
+pid_t wd_reader(int fork_wait_time, WdUdpIf udp_if)
+{
+ int sock;
+ pid_t pid = 0;
+ WdUdpPacket pkt;
+ struct timeval tv;
+ char from[WD_MAX_HOST_NAMELEN];
+ char buf[(MD5_PASSWD_LEN+1)*2];
+
+ WdInfo * p;
+
+ pid = fork();
+ if (pid != 0)
+ {
+ return pid;
+ }
+
+ if (fork_wait_time > 0)
+ {
+ sleep(fork_wait_time);
+ }
+
+ myargv = save_ps_display_args(myargc, myargv);
+
+ signal(SIGTERM, reader_exit);
+ signal(SIGINT, reader_exit);
+ signal(SIGQUIT, reader_exit);
+ signal(SIGCHLD, SIG_IGN);
+ signal(SIGHUP, SIG_IGN);
+ signal(SIGUSR1, SIG_IGN);
+ signal(SIGUSR2, SIG_IGN);
+ signal(SIGPIPE, SIG_IGN);
+ signal(SIGALRM, SIG_IGN);
+
+ init_ps_display("", "", "", "");
+
+ if ( (sock = wd_create_udp_recv_socket(udp_if)) < 0)
+ {
+ pool_error("wd_reader: socket create failed");
+ reader_exit(SIGTERM);
+ }
+
+ set_ps_display("udp reader", false);
+
+ for(;;)
+ {
+ if (wd_udp_read(sock, &pkt) == WD_OK)
+ {
+ /* auhtentication */
+ if (strlen(pool_config->wd_udp_authkey))
+ {
+ /* calculate hash from packet */
+ calc_hash(pkt, buf);
+
+ if (strcmp(pkt.hash, buf))
+ {
+ pool_log("wd_reader: authentication failed");
+ continue;
+ }
+ }
+
+ /* get current time */
+ gettimeofday(&tv, NULL);
+
+ /* who send this packet? */
+ strlcpy(from, pkt.from, sizeof(from));
+
+ p = WD_List;
+ while (p->status != WD_END)
+ {
+ if (!strcmp(p->hostname, from))
+ {
+ /* this is the first packet or the latest packet */
+ if (!WD_TIME_ISSET(p->udp_send_time) ||
+ WD_TIME_BEFORE(p->udp_send_time, pkt.send_time))
+ {
+ pool_debug("wd_reader: received heartbeat signal from %s", from);
+ p->udp_send_time = pkt.send_time;
+ p->udp_last_recv_time = tv;
+ }
+ break;
+ }
+ p++;
+ }
+ }
+ }
+
+ return pid;
+}
+
+pid_t wd_writer(int fork_wait_time, WdUdpIf udp_if)
+{
+ int sock;
+ pid_t pid = 0;
+ WdUdpPacket pkt;
+ WdInfo * p = WD_List;
+
+ pid = fork();
+ if (pid != 0)
+ {
+ return pid;
+ }
+
+ if (fork_wait_time > 0)
+ {
+ sleep(fork_wait_time);
+ }
+
+ myargv = save_ps_display_args(myargc, myargv);
+
+ signal(SIGTERM, writer_exit);
+ signal(SIGINT, writer_exit);
+ signal(SIGQUIT, writer_exit);
+ signal(SIGCHLD, SIG_IGN);
+ signal(SIGHUP, SIG_IGN);
+ signal(SIGUSR1, SIG_IGN);
+ signal(SIGUSR2, SIG_IGN);
+ signal(SIGPIPE, SIG_IGN);
+ signal(SIGALRM, SIG_IGN);
+
+ init_ps_display("", "", "", "");
+
+
+ if ( (sock = wd_create_udp_send_socket(udp_if)) < 0)
+ {
+ pool_error("wd_writer: socket create failed");
+ writer_exit(SIGTERM);
+ }
+
+ set_ps_display("udp writer", false);
+
+ for(;;)
+ {
+ gettimeofday(&pkt.send_time, NULL);
+ strlcpy(pkt.from, pool_config->wd_hostname, sizeof(pkt.from));
+
+ pkt.status = p->status;
+
+ if (strlen(pool_config->wd_udp_authkey))
+ {
+ /* calculate hash from packet */
+ calc_hash(pkt, pkt.hash);
+ }
+
+ wd_udp_write(sock, &pkt, sizeof(pkt), udp_if.addr);
+ pool_debug("wd_wirete: send heartbeat signal to %s", udp_if.addr);
+ sleep(pool_config->wd_udp_keepalive);
+ }
+
+ return pid;
+}
+
+static RETSIGTYPE
+writer_exit(int sig)
+{
+ switch (sig)
+ {
+ case SIGTERM: /* smart shutdown */
+ case SIGINT: /* fast shutdown */
+ case SIGQUIT: /* immediate shutdown */
+ pool_debug("writer child receives shutdown request signal %d", sig);
+ break;
+ default:
+ pool_error("writer child receives unknown signal %d", sig);
+ }
+
+ exit(0);
+}
+
+static RETSIGTYPE
+reader_exit(int sig)
+{
+ switch (sig)
+ {
+ case SIGTERM: /* smart shutdown */
+ case SIGINT: /* fast shutdown */
+ case SIGQUIT: /* immediate shutdown */
+ pool_debug("reader child receives shutdown request signal %d", sig);
+ break;
+ default:
+ pool_error("reader child receives unknown signal %d", sig);
+ }
+
+ exit(0);
+}
+
+static int
+hton_wd_udp_packet(WdUdpPacket * to, WdUdpPacket * from)
+{
+ if ((to == NULL) || (from == NULL))
+ {
+ return WD_NG;
+ }
+
+ to->status = htonl(from->status);
+ to->send_time.tv_sec = htonl(from->send_time.tv_sec);
+ to->send_time.tv_usec = htonl(from->send_time.tv_usec);
+ memcpy(to->from, from->from, sizeof(to->from));
+ memcpy(to->hash, from->hash, sizeof(to->hash));
+
+ return WD_OK;
+}
+
+static int
+ntoh_wd_udp_packet(WdUdpPacket * to, WdUdpPacket * from)
+{
+ if ((to == NULL) || (from == NULL))
+ {
+ return WD_NG;
+ }
+
+ to->status = ntohl(from->status);
+ to->send_time.tv_sec = ntohl(from->send_time.tv_sec);
+ to->send_time.tv_usec = ntohl(from->send_time.tv_usec);
+ memcpy(to->from, from->from, sizeof(to->from));
+ memcpy(to->hash, from->hash, sizeof(to->hash));
+
+ return WD_OK;
+}
+
+/* calculate hash for authentiction using packet contents */
+static void
+calc_hash(WdUdpPacket pkt, char *buf)
+{
+ char pass[(MAX_PASSWORD_SIZE + 1) / 2];
+ char username[(MAX_PASSWORD_SIZE + 1) / 2];
+ char salt[WD_MAX_SALT];
+ size_t pass_len;
+ size_t username_len;
+ size_t salt_len;
+ size_t authkey_len;
+
+ /* use first half of authkey as username, last half as password */
+ authkey_len = strlen(pool_config->wd_udp_authkey);
+
+ username_len = authkey_len / 2;
+ pass_len = authkey_len - username_len;
+ snprintf(username, username_len + 1, pool_config->wd_udp_authkey);
+ snprintf(pass, pass_len + 1, pool_config->wd_udp_authkey + username_len);
+
+ /* convert pakcet to string and use this as salt */
+ salt_len = snprintf(salt, sizeof(salt), "status=%d tv_sec=%ld tv_usec=%ld from=%s",
+ pkt.status, pkt.send_time.tv_sec, pkt.send_time.tv_usec, pkt.from);
+
+ /* calculate hash using md5 encrypt */
+ pool_md5_encrypt(pass, username, strlen(username), buf + MD5_PASSWD_LEN + 1);
+ buf[(MD5_PASSWD_LEN+1)*2-1] = '\0';
+
+ pool_md5_encrypt(buf+MD5_PASSWD_LEN+1, salt, salt_len, buf);
+ buf[MD5_PASSWD_LEN] = '\0';
+}
[parent: f5df0a30f70a]