pgpool2.git / summary / log / commit / refs
commit 433b5079816941e7c80ff9d20297ff7db307de35
Author: Nozomi Anzai <anzai@sraoss.co.jp>
Date: Fri Jan 27 04:38:13 2012 +0000
Add the parameters of white_memqcache_table_list, black_memqcache_table_list
that check if the SELECTed tables are to be cached or not.
pgpool.conf.sample | 9 +
pool_config.c | 1544 ++++++++++++++++++++++------------------------
pool_config.h | 11 +-
pool_config.l | 123 +++-
pool_memqcache.c | 70 ++-
pool_memqcache.h | 5 +-
pool_process_reporting.c | 26 +
pool_proto_modules.c | 77 ++-
pool_select_walker.c | 118 ++--
pool_select_walker.h | 20 +-
10 files changed, 1097 insertions(+), 906 deletions(-)
diff --git a/pgpool.conf.sample b/pgpool.conf.sample
index a95fbeb24..d777a09d7 100644
--- a/pgpool.conf.sample
+++ b/pgpool.conf.sample
@@ -473,3 +473,12 @@ memqcache_cache_block_size=1048576
# Temporary work directory to record table oids
memqcache_oiddir = '/var/log/pgpool/oiddir'
+
+white_memqcache_table_list = ''
+ # Comma separated list of table names to memcache
+ # that don't write to database
+ # Regexp are accepted
+black_memqcache_table_list = ''
+ # Comma separated list of table names not to memcache
+ # that don't write to database
+ # Regexp are accepted
diff --git a/pool_config.c b/pool_config.c
index c6fc4f6fb..1e83da887 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. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <unistd.h>
-/* 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)
-#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)
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
#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-*- */
/*
*
@@ -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 (void );
+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
+#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;
- }
-}
-
-/* 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 ( b == yy_current_buffer )
+ yy_load_buffer_state();
}
- 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;
@@ -1952,6 +1774,13 @@ int pool_init_config(void)
pool_config->memqcache_maxcache = 512;
pool_config->memqcache_cache_block_size = 8192;
pool_config->memqcache_oiddir = "/var/log/pgpool/oiddir";
+ pool_config->white_memqcache_table_list = NULL;
+ pool_config->num_white_memqcache_table_list = 0;
+ pool_config->black_memqcache_table_list = NULL;
+ pool_config->num_black_memqcache_table_list = 0;
+ pool_config->lists_memqcache_table_patterns = NULL;
+ pool_config->memqcache_table_pattc = 0;
+ pool_config->current_memqcache_table_pattern_size = 0;
res = gethostname(localhostname,sizeof(localhostname));
if(res !=0 )
@@ -1981,11 +1810,13 @@ int add_regex_pattern(char *type, char *s)
/* Add extended regex search */
regex_flags |= REG_EXTENDED;
/* Fill the pattern type */
- if (strcmp(type, "black_function_list") == 0)
+ if (strcmp(type, "black_function_list") == 0 ||
+ strcmp(type, "black_memqcache_table_list") == 0)
{
currItem.type = BLACKLIST;
}
- else if (strcmp(type, "white_function_list") == 0)
+ else if (strcmp(type, "white_function_list") == 0 ||
+ strcmp(type, "white_memqcache_table_list") == 0)
{
currItem.type = WHITELIST;
}
@@ -2023,14 +1854,21 @@ int add_regex_pattern(char *type, char *s)
{
pool_error("add_to_patterns: invalid regex pattern: %s", currItem.pattern);
}
- else
- {
- if (growPatternArray(currItem) < 0)
- {
- pool_error("add_to_patterns: unable to allocate new pattern");
- return 0;
- }
- }
+ else if ((strcmp(type, "white_function_list") == 0 ||
+ strcmp(type, "black_function_list") == 0) &&
+ growFunctionPatternArray(currItem) < 0)
+ {
+ pool_error("add_to_patterns: unable to allocate new pattern");
+ return 0;
+ }
+ else if ((strcmp(type, "white_memqcache_table_list") == 0 ||
+ strcmp(type, "black_memqcache_table_list") == 0) &&
+ growMemqcacheTablePatternArray(currItem) < 0)
+ {
+ pool_error("add_to_patterns: unable to allocate new pattern");
+ return 0;
+ }
+
return 1;
}
@@ -2039,13 +1877,14 @@ int add_regex_pattern(char *type, char *s)
* The array start with PATTERN_ARR_SIZE storage place, if required
* it will grow of PATTERN_ARR_SIZE more each time.
*/
-int growPatternArray (RegPattern item)
+int growFunctionPatternArray(RegPattern item)
{
void *_tmp = NULL;
if (pool_config->pattc == pool_config->current_pattern_size)
{
pool_config->current_pattern_size += PATTERN_ARR_SIZE;
- _tmp = realloc(pool_config->lists_patterns, (pool_config->current_pattern_size * sizeof(RegPattern)));
+ _tmp = realloc(pool_config->lists_patterns,
+ (pool_config->current_pattern_size * sizeof(RegPattern)));
if (!_tmp)
{
return(-1);
@@ -2059,6 +1898,27 @@ int growPatternArray (RegPattern item)
return(pool_config->pattc);
}
+int growMemqcacheTablePatternArray(RegPattern item)
+{
+ void *_tmp = NULL;
+ if (pool_config->memqcache_table_pattc == pool_config->current_memqcache_table_pattern_size)
+ {
+ pool_config->current_memqcache_table_pattern_size += PATTERN_ARR_SIZE;
+ _tmp = realloc(pool_config->lists_memqcache_table_patterns,
+ (pool_config->current_memqcache_table_pattern_size * sizeof(RegPattern)));
+ if (!_tmp)
+ {
+ return(-1);
+ }
+
+ pool_config->lists_memqcache_table_patterns = (RegPattern*)_tmp;
+ }
+ pool_config->lists_memqcache_table_patterns[pool_config->memqcache_table_pattc] = item;
+ pool_config->memqcache_table_pattc++;
+
+ return(pool_config->memqcache_table_pattc);
+}
+
int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
{
FILE *fd;
@@ -3795,6 +3655,67 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
}
pool_config->memqcache_oiddir = str;
}
+ else if (!strcmp(key, "white_memqcache_table_list") &&
+ 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->white_memqcache_table_list =
+ extract_string_tokens(str, ",", &pool_config->num_white_memqcache_table_list);
+
+ if (pool_config->white_memqcache_table_list == NULL)
+ {
+ fclose(fd);
+ return(-1);
+ }
+ for (i=0;i<pool_config->num_white_memqcache_table_list;i++)
+ {
+ add_regex_pattern("white_memqcache_table_list", pool_config->white_memqcache_table_list[i]);
+ }
+ }
+
+ else if (!strcmp(key, "black_memqcache_table_list") &&
+ 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->black_memqcache_table_list =
+ extract_string_tokens(str, ",", &pool_config->num_black_memqcache_table_list);
+
+ if (pool_config->black_memqcache_table_list == NULL)
+ {
+ fclose(fd);
+ return(-1);
+ }
+ for (i=0;i<pool_config->num_black_memqcache_table_list;i++)
+ {
+ add_regex_pattern("black_memqcache_table_list", pool_config->black_memqcache_table_list[i]);
+ }
+ }
}
fclose(fd);
@@ -4186,4 +4107,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 4f7e005fc..a118bfd51 100644
--- a/pool_config.h
+++ b/pool_config.h
@@ -171,6 +171,8 @@ typedef struct {
int num_reset_queries; /* number of queries in reset_query_list */
int num_white_function_list; /* number of functions in white_function_list */
int num_black_function_list; /* number of functions in black_function_list */
+ int num_white_memqcache_table_list; /* number of functions in white_memqcache_table_list */
+ int num_black_memqcache_table_list; /* number of functions in black_memqcache_table_list */
int logsyslog; /* flag used to start logging to syslog */
/* ssl configuration */
@@ -197,6 +199,12 @@ typedef struct {
int memqcache_maxcache; /* Maximum SELECT result size in bytes. */
int memqcache_cache_block_size; /* Cache block size in bytes. 8192 by default */
char *memqcache_oiddir; /* Tempory work directory to record table oids */
+ char **white_memqcache_table_list; /* list of tables to memqcache */
+ char **black_memqcache_table_list; /* list of tables not to memqcache */
+
+ RegPattern *lists_memqcache_table_patterns; /* Precompiled regex patterns for black/white lists */
+ int memqcache_table_pattc; /* number of regexp pattern */
+ int current_memqcache_table_pattern_size; /* size of the regex pattern array */
} POOL_CONFIG;
typedef enum {
@@ -216,6 +224,7 @@ extern int set_syslog_facility (char *);
/* methods used for regexp support */
extern int add_regex_pattern(char *type, char *s);
-extern int growPatternArray (RegPattern item);
+extern int growFunctionPatternArray(RegPattern item);
+extern int growMemqcacheTablePatternArray(RegPattern item);
#endif /* POOL_CONFIG_H */
diff --git a/pool_config.l b/pool_config.l
index ade40e231..aaf3c301d 100644
--- a/pool_config.l
+++ b/pool_config.l
@@ -227,6 +227,13 @@ int pool_init_config(void)
pool_config->memqcache_maxcache = 512;
pool_config->memqcache_cache_block_size = 8192;
pool_config->memqcache_oiddir = "/var/log/pgpool/oiddir";
+ pool_config->white_memqcache_table_list = NULL;
+ pool_config->num_white_memqcache_table_list = 0;
+ pool_config->black_memqcache_table_list = NULL;
+ pool_config->num_black_memqcache_table_list = 0;
+ pool_config->lists_memqcache_table_patterns = NULL;
+ pool_config->memqcache_table_pattc = 0;
+ pool_config->current_memqcache_table_pattern_size = 0;
res = gethostname(localhostname,sizeof(localhostname));
if(res !=0 )
@@ -256,11 +263,13 @@ int add_regex_pattern(char *type, char *s)
/* Add extended regex search */
regex_flags |= REG_EXTENDED;
/* Fill the pattern type */
- if (strcmp(type, "black_function_list") == 0)
+ if (strcmp(type, "black_function_list") == 0 ||
+ strcmp(type, "black_memqcache_table_list") == 0)
{
currItem.type = BLACKLIST;
}
- else if (strcmp(type, "white_function_list") == 0)
+ else if (strcmp(type, "white_function_list") == 0 ||
+ strcmp(type, "white_memqcache_table_list") == 0)
{
currItem.type = WHITELIST;
}
@@ -298,14 +307,21 @@ int add_regex_pattern(char *type, char *s)
{
pool_error("add_to_patterns: invalid regex pattern: %s", currItem.pattern);
}
- else
- {
- if (growPatternArray(currItem) < 0)
- {
- pool_error("add_to_patterns: unable to allocate new pattern");
- return 0;
- }
- }
+ else if ((strcmp(type, "white_function_list") == 0 ||
+ strcmp(type, "black_function_list") == 0) &&
+ growFunctionPatternArray(currItem) < 0)
+ {
+ pool_error("add_to_patterns: unable to allocate new pattern");
+ return 0;
+ }
+ else if ((strcmp(type, "white_memqcache_table_list") == 0 ||
+ strcmp(type, "black_memqcache_table_list") == 0) &&
+ growMemqcacheTablePatternArray(currItem) < 0)
+ {
+ pool_error("add_to_patterns: unable to allocate new pattern");
+ return 0;
+ }
+
return 1;
}
@@ -314,13 +330,14 @@ int add_regex_pattern(char *type, char *s)
* The array start with PATTERN_ARR_SIZE storage place, if required
* it will grow of PATTERN_ARR_SIZE more each time.
*/
-int growPatternArray (RegPattern item)
+int growFunctionPatternArray(RegPattern item)
{
void *_tmp = NULL;
if (pool_config->pattc == pool_config->current_pattern_size)
{
pool_config->current_pattern_size += PATTERN_ARR_SIZE;
- _tmp = realloc(pool_config->lists_patterns, (pool_config->current_pattern_size * sizeof(RegPattern)));
+ _tmp = realloc(pool_config->lists_patterns,
+ (pool_config->current_pattern_size * sizeof(RegPattern)));
if (!_tmp)
{
return(-1);
@@ -334,6 +351,27 @@ int growPatternArray (RegPattern item)
return(pool_config->pattc);
}
+int growMemqcacheTablePatternArray(RegPattern item)
+{
+ void *_tmp = NULL;
+ if (pool_config->memqcache_table_pattc == pool_config->current_memqcache_table_pattern_size)
+ {
+ pool_config->current_memqcache_table_pattern_size += PATTERN_ARR_SIZE;
+ _tmp = realloc(pool_config->lists_memqcache_table_patterns,
+ (pool_config->current_memqcache_table_pattern_size * sizeof(RegPattern)));
+ if (!_tmp)
+ {
+ return(-1);
+ }
+
+ pool_config->lists_memqcache_table_patterns = (RegPattern*)_tmp;
+ }
+ pool_config->lists_memqcache_table_patterns[pool_config->memqcache_table_pattc] = item;
+ pool_config->memqcache_table_pattc++;
+
+ return(pool_config->memqcache_table_pattc);
+}
+
int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
{
FILE *fd;
@@ -2070,6 +2108,67 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
}
pool_config->memqcache_oiddir = str;
}
+ else if (!strcmp(key, "white_memqcache_table_list") &&
+ 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->white_memqcache_table_list =
+ extract_string_tokens(str, ",", &pool_config->num_white_memqcache_table_list);
+
+ if (pool_config->white_memqcache_table_list == NULL)
+ {
+ fclose(fd);
+ return(-1);
+ }
+ for (i=0;i<pool_config->num_white_memqcache_table_list;i++)
+ {
+ add_regex_pattern("white_memqcache_table_list", pool_config->white_memqcache_table_list[i]);
+ }
+ }
+
+ else if (!strcmp(key, "black_memqcache_table_list") &&
+ 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->black_memqcache_table_list =
+ extract_string_tokens(str, ",", &pool_config->num_black_memqcache_table_list);
+
+ if (pool_config->black_memqcache_table_list == NULL)
+ {
+ fclose(fd);
+ return(-1);
+ }
+ for (i=0;i<pool_config->num_black_memqcache_table_list;i++)
+ {
+ add_regex_pattern("black_memqcache_table_list", pool_config->black_memqcache_table_list[i]);
+ }
+ }
}
fclose(fd);
diff --git a/pool_memqcache.c b/pool_memqcache.c
index 3ad66843b..4776f523d 100644
--- a/pool_memqcache.c
+++ b/pool_memqcache.c
@@ -97,7 +97,9 @@ static void pool_update_fsmm(POOL_CACHE_BLOCKID blockid, size_t free_space);
static POOL_CACHE_BLOCKID pool_get_block(size_t free_space);
static POOL_CACHE_ITEM_HEADER *pool_cache_item_header(POOL_CACHEID *cacheid);
static int pool_init_cache_block(POOL_CACHE_BLOCKID blockid);
+#if NOT_USED
static void pool_wipe_out_cache_block(POOL_CACHE_BLOCKID blockid);
+#endif
static int pool_delete_item_shmem_cache(POOL_CACHEID *cacheid);
static char *block_address(int blockid);
static POOL_CACHE_ITEM_POINTER *item_pointer(char *block, int i);
@@ -639,16 +641,13 @@ bool pool_is_likely_select(char *query)
/*
* Return true if SELECT can be cached.
+ * (before called this function, already checked if the query is SELECT)
*/
bool pool_is_allow_to_cache(Node *node, char *query)
{
SelectStmt *stmt;
-
- if (!pool_is_likely_select(query))
- return false;
-
- if (!IsA(node, SelectStmt))
- return false;
+ int i = 0;
+ int num_oids;
stmt = (SelectStmt *)node;
@@ -664,9 +663,60 @@ bool pool_is_allow_to_cache(Node *node, char *query)
pool_has_temp_table(node))
return false;
+ /* Cache any tables in the case that both of list are empty */
+ if (pool_config->num_white_memqcache_table_list == 0 &&
+ pool_config->num_black_memqcache_table_list == 0)
+ return true;
+
+ /* Extract oids in from clause of SELECT, and check if SELECT to them could be cached. */
+ SelectContext ctx;
+ num_oids = pool_extract_table_oids_from_select_stmt(node, &ctx);
+ if (num_oids == 0)
+ return false;
+
+ for (i = 0; i < num_oids; i++)
+ {
+ pool_debug("pool_is_allow_to_cache: check table_names[%d] = %s", i, ctx.table_names[i]);
+ if (pool_is_table_to_cache(ctx.table_names[i]) == false)
+ {
+ pool_debug("pool_is_allow_to_cache: false");
+ return false;
+ }
+ }
+
+ pool_debug("pool_is_allow_to_cache: true");
return true;
}
+/*
+ * Return true If the SELECTed table is in white list or is not in black list,
+ * and table is to be cached.
+ */
+bool pool_is_table_to_cache(const char *table_name)
+{
+ // Cache in case of the table in white list
+ if (pool_config->num_white_memqcache_table_list > 0)
+ {
+ if (pattern_compare((char *)table_name, WHITELIST, "white_memqcache_table_list") == 1)
+ return true;
+ else
+ return false;
+ }
+
+ // No cache in case of the table in black list
+ else if (pool_config->num_black_memqcache_table_list > 0)
+ {
+ if (pattern_compare((char *)table_name, BLACKLIST, "black_memqcache_table_list") == 1)
+ return false;
+ else
+ return true;
+ }
+
+ // No cache otherwise
+ pool_error("pool_is_table_to_cache: unknown case");
+ return false;
+}
+
/*
* Extract table oid from INSERT/UPDATE/DELETE/TRUNCATE/
* DROP TABLE/ALTER TABLE/COPY FROM statement.
@@ -1974,6 +2024,7 @@ static int pool_init_cache_block(POOL_CACHE_BLOCKID blockid)
return 0;
}
+#if NOT_USED
/*
* Delete all items in the block.
*/
@@ -2005,6 +2056,7 @@ static void pool_wipe_out_cache_block(POOL_CACHE_BLOCKID blockid)
pool_init_cache_block(blockid);
pool_update_fsmm(blockid, POOL_MAX_FREE_SPACE);
}
+#endif
/*
* Aquire lock: XXX giant lock
@@ -2481,7 +2533,9 @@ void pool_handle_query_cache(POOL_CONNECTION_POOL *backend, char *query, Node *n
/* Ok to cache SELECT result? */
if (pool_is_cache_safe())
{
- num_oids = pool_extract_table_oids_from_select_stmt(node, &oids);
+ SelectContext ctx;
+ num_oids = pool_extract_table_oids_from_select_stmt(node, &ctx);
+ oids = ctx.table_oids;;
pool_debug("num_oids: %d oid: %d", num_oids, *oids);
if (state == 'I') /* Not inside a transaction? */
@@ -2849,7 +2903,9 @@ POOL_CACHEID *pool_hash_search(POOL_QUERY_HASH *key)
char md5[POOL_MD5_HASHKEYLEN+1];
memcpy(md5, key->query_hash, POOL_MD5_HASHKEYLEN);
md5[POOL_MD5_HASHKEYLEN] = '\0';
+#if 0
pool_log("pool_hash_search: hash_key:%d md5:%s", hash_key, md5);
+#endif
}
element = hash_header->elements[hash_key].element;
diff --git a/pool_memqcache.h b/pool_memqcache.h
index 509a80e50..968e52a8a 100644
--- a/pool_memqcache.h
+++ b/pool_memqcache.h
@@ -6,7 +6,7 @@
* pgpool: a language independent connection pool server for PostgreSQL
* written by Tatsuo Ishii
*
- * Copyright (c) 2003-2011 PgPool Global Development Group
+ * Copyright (c) 2003-2012 PgPool Global Development Group
*
* Permission to use, copy, modify, and distribute this software and
* its documentation for any purpose and without fee is hereby
@@ -68,7 +68,7 @@ typedef struct {
#define POOL_ITEM_USED 0x0001 /* is this item used? */
#define POOL_ITEM_HAS_NEXT 0x0002 /* is this item has "next" item? */
#define POOL_ITEM_DELETED 0x0004 /* is this item deleted? */
-
+
typedef struct {
POOL_QUERY_HASH query_hash; /* md5 hashed query signature */
POOL_CACHEID next; /* next cache item if any */
@@ -209,6 +209,7 @@ extern POOL_STATUS pool_fetch_from_memory_cache(POOL_CONNECTION *frontend,
char *contents, bool *foundp);
extern bool pool_is_likely_select(char *query);
+extern bool pool_is_table_to_cache(const char *table_name);
extern bool pool_is_allow_to_cache(Node *node, char *query);
extern int pool_extract_table_oids(Node *node, int **oidsp);
extern void pool_add_dml_table_oid(int oid);
diff --git a/pool_process_reporting.c b/pool_process_reporting.c
index 182b72dd8..3d9ec356e 100644
--- a/pool_process_reporting.c
+++ b/pool_process_reporting.c
@@ -609,6 +609,32 @@ POOL_REPORT_CONFIG* get_config(int *nrows)
strncpy(status[i].desc, "Number of SELECTs hitting query cache", POOLCONFIG_MAXDESCLEN);
i++;
+ strncpy(status[i].name, "white_memqcache_table_list", POOLCONFIG_MAXNAMELEN);
+ *(status[i].value) = '\0';
+ for (j=0;j<pool_config->num_white_memqcache_table_list;j++)
+ {
+ len = POOLCONFIG_MAXVALLEN - strlen(status[i].value);
+ strncat(status[i].value, pool_config->white_memqcache_table_list[j], len);
+ len = POOLCONFIG_MAXVALLEN - strlen(status[i].value);
+ if (j != pool_config->num_white_memqcache_table_list - 1)
+ strncat(status[i].value, ",", len);
+ }
+ strncpy(status[i].desc, "tables to memqcache", POOLCONFIG_MAXDESCLEN);
+ i++;
+
+ strncpy(status[i].name, "black_memqcache_table_list", POOLCONFIG_MAXNAMELEN);
+ *(status[i].value) = '\0';
+ for (j=0;j<pool_config->num_black_memqcache_table_list;j++)
+ {
+ len = POOLCONFIG_MAXVALLEN - strlen(status[i].value);
+ strncat(status[i].value, pool_config->black_memqcache_table_list[j], len);
+ len = POOLCONFIG_MAXVALLEN - strlen(status[i].value);
+ if (j != pool_config->num_black_memqcache_table_list - 1)
+ strncat(status[i].value, ",", len);
+ }
+ strncpy(status[i].desc, "tables not to memqcache", POOLCONFIG_MAXDESCLEN);
+ i++;
+
for (j = 0; j < NUM_BACKENDS; j++)
{
if (BACKEND_INFO(j).backend_port == 0)
diff --git a/pool_proto_modules.c b/pool_proto_modules.c
index 23f353255..603a3f050 100644
--- a/pool_proto_modules.c
+++ b/pool_proto_modules.c
@@ -5,7 +5,7 @@
* pgpool: a language independent connection pool server for PostgreSQL
* written by Tatsuo Ishii
*
- * Copyright (c) 2003-2011 PgPool Global Development Group
+ * Copyright (c) 2003-2012 PgPool Global Development Group
*
* Permission to use, copy, modify, and distribute this software and
* its documentation for any purpose and without fee is hereby
@@ -114,6 +114,7 @@ POOL_STATUS SimpleQuery(POOL_CONNECTION *frontend,
POOL_STATUS status;
char *string;
int lock_kind;
+ bool is_likely_select = false;
POOL_SESSION_CONTEXT *session_context;
POOL_QUERY_CONTEXT *query_context;
@@ -154,11 +155,13 @@ POOL_STATUS SimpleQuery(POOL_CONNECTION *frontend,
/*
* Fetch memory cache if possible
*/
- if (pool_config->memory_cache_enabled && pool_is_likely_select(contents))
+ is_likely_select = pool_is_likely_select(contents);
+ if (pool_config->memory_cache_enabled && is_likely_select)
{
bool foundp;
- status = pool_fetch_from_memory_cache(frontend,backend, contents, &foundp);
+ /* If the query is SELECT from table to cache, try to fetch cached result. */
+ status = pool_fetch_from_memory_cache(frontend, backend, contents, &foundp);
if (status != POOL_CONTINUE)
return status;
@@ -265,60 +268,77 @@ POOL_STATUS SimpleQuery(POOL_CONNECTION *frontend,
check_copy_from_stdin(node);
/* status reporting? */
- if ((IsA(node, VariableShowStmt) && strncasecmp(sq_config, contents, strlen(sq_config)) == 0)
- || (IsA(node, VariableShowStmt) && strncasecmp(sq_pools, contents, strlen(sq_pools)) == 0)
- || (IsA(node, VariableShowStmt) && strncasecmp(sq_processes, contents, strlen(sq_processes)) == 0)
- || (IsA(node, VariableShowStmt) && strncasecmp(sq_nodes, contents, strlen(sq_nodes)) == 0)
- || (IsA(node, VariableShowStmt) && strncasecmp(sq_version, contents, strlen(sq_version)) == 0))
+ if (IsA(node, VariableShowStmt))
{
- StartupPacket *sp;
- char psbuf[1024];
+ bool is_valid_show_command = false;
if (strncasecmp(sq_config, contents, strlen(sq_config)) == 0)
{
+ is_valid_show_command = true;
pool_debug("config reporting");
config_reporting(frontend, backend);
}
else if (strncasecmp(sq_pools, contents, strlen(sq_pools)) == 0)
{
+ is_valid_show_command = true;
pool_debug("pools reporting");
pools_reporting(frontend, backend);
}
else if (strncasecmp(sq_processes, contents, strlen(sq_processes)) == 0)
{
+ is_valid_show_command = true;
pool_debug("processes reporting");
processes_reporting(frontend, backend);
}
else if (strncasecmp(sq_nodes, contents, strlen(sq_nodes)) == 0)
{
+ is_valid_show_command = true;
pool_debug("nodes reporting");
nodes_reporting(frontend, backend);
}
else if (strncasecmp(sq_version, contents, strlen(sq_version)) == 0)
{
+ is_valid_show_command = true;
pool_debug("version reporting");
version_reporting(frontend, backend);
}
- /* show ps status */
- sp = MASTER_CONNECTION(backend)->sp;
- snprintf(psbuf, sizeof(psbuf), "%s %s %s idle",
- sp->user, sp->database, remote_ps_data);
- set_ps_display(psbuf, false);
+ if (is_valid_show_command)
+ {
+ StartupPacket *sp;
+ char psbuf[1024];
- pool_query_context_destroy(query_context);
- pool_set_skip_reading_from_backends();
- return POOL_CONTINUE;
+ /* show ps status */
+ sp = MASTER_CONNECTION(backend)->sp;
+ snprintf(psbuf, sizeof(psbuf), "%s %s %s idle",
+ sp->user, sp->database, remote_ps_data);
+ set_ps_display(psbuf, false);
+
+ pool_query_context_destroy(query_context);
+ pool_set_skip_reading_from_backends();
+ return POOL_CONTINUE;
+ }
}
+ /*
+ * If the table is to be cached, set is_cache_safe TRUE and register table oids.
+ */
if (pool_config->memory_cache_enabled)
{
+ bool is_select_query = false;
int num_oids;
int *oids;
int i;
- /* Check if the SELECT can be cached */
- if (pool_is_allow_to_cache(query_context->parse_tree,
+ /* Check if the query is actually SELECT */
+ if (is_likely_select && IsA(node, SelectStmt))
+ {
+ is_select_query = true;
+ }
+
+ /* Switch the flag of is_cache_safe in session_context */
+ if (is_select_query &&
+ pool_is_allow_to_cache(query_context->parse_tree,
query_context->original_query))
{
pool_set_cache_safe();
@@ -328,15 +348,18 @@ POOL_STATUS SimpleQuery(POOL_CONNECTION *frontend,
pool_unset_cache_safe();
}
- /* Extract table oid if the query is DML */
- num_oids = pool_extract_table_oids(node, &oids);
-
- if (num_oids > 0)
+ /* If table is to be cached and the query is DML, save the table oid */
+ if (!is_select_query)
{
- /* Save to oid buffer */
- for (i=0;i<num_oids;i++)
+ num_oids = pool_extract_table_oids(node, &oids);
+
+ if (num_oids > 0)
{
- pool_add_dml_table_oid(oids[i]);
+ /* Save to oid buffer */
+ for (i=0;i<num_oids;i++)
+ {
+ pool_add_dml_table_oid(oids[i]);
+ }
}
}
}
diff --git a/pool_select_walker.c b/pool_select_walker.c
index b06e4d058..e80eda46b 100644
--- a/pool_select_walker.c
+++ b/pool_select_walker.c
@@ -5,7 +5,7 @@
* pgpool: a language independent connection pool server for PostgreSQL
* written by Tatsuo Ishii
*
- * Copyright (c) 2003-2011 PgPool Global Development Group
+ * Copyright (c) 2003-2012 PgPool Global Development Group
*
* Permission to use, copy, modify, and distribute this software and
* its documentation for any purpose and without fee is hereby
@@ -31,19 +31,6 @@
#include "pool_session_context.h"
#include "pool_timestamp.h"
-#define POOL_MAX_SELECT_OIDS 128
-
-typedef struct {
- bool has_system_catalog; /* True if system catalog table is used */
- bool has_temp_table; /* True if temporary table is used */
- bool has_unlogged_table; /* True if unlogged table is used */
- bool has_function_call; /* True if write function call is used */
- bool has_non_immutable_function_call; /* True if non immutable functions are used */
- bool has_insertinto_or_locking_clause; /* True if it has SELECT INTO or FOR SHARE/UPDATE */
- int num_oids; /* number of oids */
- int *table_oids; /* table oids */
-} SelectContext;
-
static bool function_call_walker(Node *node, void *context);
static bool system_catalog_walker(Node *node, void *context);
static bool is_system_catalog(char *table_name);
@@ -52,10 +39,10 @@ static bool unlogged_table_walker(Node *node, void *context);
static bool is_temp_table(char *table_name);
static bool is_unlogged_table(char *table_name);
static bool insertinto_or_locking_clause_walker(Node *node, void *context);
-static int pattern_compare(char *str, const int type);
static bool is_immutable_function(char *fname);
static bool select_table_walker(Node *node, void *context);
static bool non_immutable_function_call_walker(Node *node, void *context);
+static char *strip_quote(char *str);
/*
* Return true if this SELECT has function calls *and* supposed to
@@ -157,29 +144,54 @@ bool pool_has_insertinto_or_locking_clause(Node *node)
* Return -1 if the given search type doesn't exist.
* Search type supported are: WHITELIST and BLACKLIST
*/
-static int pattern_compare(char *str, const int type)
+int pattern_compare(char *str, const int type, const char *param_name)
{
int i = 0;
- /* pass througth all regex pattern unless pattern is found */
- for (i = 0; i < pool_config->pattc; i++) {
- if ( (pool_config->lists_patterns[i].type == type) && (regexec(&pool_config->lists_patterns[i].regexv, str, 0, 0, 0) == 0) ) {
+ RegPattern *lists_patterns;
+ int *pattc;
+
+ if (strcmp(param_name, "white_function_list") == 0 ||
+ strcmp(param_name, "black_function_list") == 0)
+ {
+ lists_patterns = pool_config->lists_patterns;
+ pattc = &pool_config->pattc;
+
+ } else if (strcmp(param_name, "white_memqcache_table_list") == 0 ||
+ strcmp(param_name, "black_memqcache_table_list") == 0)
+ {
+ lists_patterns = pool_config->lists_memqcache_table_patterns;
+ pattc = &pool_config->memqcache_table_pattc;
+
+ } else {
+ pool_error("pattern_compare: unknown paramname %s", param_name);
+ return -1;
+ }
+
+ for (i = 0; i < *pattc; i++) {
+ if (lists_patterns[i].type != type)
+ continue;
+
+ if (regexec(&lists_patterns[i].regexv, str, 0, 0, 0) == 0)
+ {
switch(type) {
/* return 1 if string matches whitelist pattern */
case WHITELIST:
- if (pool_config->debug_level > 0)
- pool_debug("pattern_compare: white_function_list (%s) matched: %s", pool_config->lists_patterns[i].pattern, str);
+ pool_debug("pattern_compare: %s (%s) matched: %s",
+ param_name, lists_patterns[i].pattern, str);
return 1;
/* return 1 if string matches blacklist pattern */
case BLACKLIST:
- if (pool_config->debug_level > 0)
- pool_debug("pattern_compare: black_function_list (%s) matched: %s", pool_config->lists_patterns[i].pattern, str);
+ pool_debug("pattern_compare: %s (%s) matched: %s",
+ param_name, lists_patterns[i].pattern, str);
return 1;
default:
- pool_error("pattern_compare: unknown pattern match type: %s", str);
+ pool_error("pattern_compare: %s unknown pattern match type: %s", param_name, str);
return -1;
}
}
+ pool_debug("pattern_compare: %s (%s) not matched: %s",
+ param_name, lists_patterns[i].pattern, str);
}
/* return 0 otherwise */
@@ -222,7 +234,7 @@ static bool function_call_walker(Node *node, void *context)
if (pool_config->num_white_function_list > 0)
{
/* Search function in the white list regex patterns */
- if (pattern_compare(fname, WHITELIST) == 1) {
+ if (pattern_compare(fname, WHITELIST, "white_function_list") == 1) {
/* If the function is found in the white list, we can ignore it */
return raw_expression_tree_walker(node, function_call_walker, context);
}
@@ -240,7 +252,7 @@ static bool function_call_walker(Node *node, void *context)
if (pool_config->num_black_function_list > 0)
{
/* Search function in the black list regex patterns */
- if (pattern_compare(fname, BLACKLIST) == 1) {
+ if (pattern_compare(fname, BLACKLIST, "black_function_list") == 1) {
/* Found. */
ctx->has_function_call = true;
return false;
@@ -803,22 +815,15 @@ int pool_table_name_to_oid(char *table_name)
* Oids are returned as an int array. The contents of oid array are
* discarded by next call to this function.
*/
-int pool_extract_table_oids_from_select_stmt(Node *node, int **oids)
+int pool_extract_table_oids_from_select_stmt(Node *node, SelectContext *ctx)
{
- static int myoids[POOL_MAX_SELECT_OIDS];
- SelectContext ctx;
-
if (!IsA(node, SelectStmt))
return 0;
- ctx.num_oids = 0;
- ctx.table_oids = myoids;
-
- raw_expression_tree_walker(node, select_table_walker, &ctx);
+ ctx->num_oids = 0;
+ raw_expression_tree_walker(node, select_table_walker, ctx);
- *oids = myoids;
-
- return ctx.num_oids;
+ return ctx->num_oids;
}
/*
@@ -828,6 +833,7 @@ static bool
select_table_walker(Node *node, void *context)
{
SelectContext *ctx = (SelectContext *) context;
+ int num_oids;
if (node == NULL)
return false;
@@ -839,23 +845,49 @@ select_table_walker(Node *node, void *context)
int oid;
table = nodeToString(rgv);
-
- pool_debug("select_table_walker: table name: %s", table);
-
oid = pool_table_name_to_oid(table);
+
if (oid)
{
- if (ctx->num_oids >= POOL_MAX_SELECT_OIDS)
+ if (POOL_MAX_SELECT_OIDS <= ctx->num_oids)
{
- pool_error("select_table_walker: number of oids exceeds");
+ pool_debug("select_table_walker: number of oids exceeds");
return false;
}
- ctx->table_oids[ctx->num_oids++] = oid;
+
+ num_oids = ctx->num_oids++;
+
+ ctx->table_oids[num_oids] = oid;
+ strcpy(ctx->table_names[num_oids], strip_quote(table));
+
+ pool_debug("select_table_walker: ctx->table_names[%d] = %s",
+ num_oids, ctx->table_names[num_oids]);
}
}
+
return raw_expression_tree_walker(node, select_table_walker, context);
}
+static char *strip_quote(char *str)
+{
+ char *after;
+ int i = 0;
+
+ after = malloc(sizeof(char) * strlen(str) + 1);
+
+ do {
+ if (*str != '"')
+ {
+ after[i] = *str;
+ i++;
+ }
+ str++;
+ } while (*str != '\0');
+
+ after[i] = '\0';
+
+ return after;
+}
/*
* makeRangeVarFromNameList
diff --git a/pool_select_walker.h b/pool_select_walker.h
index 962c7dc76..1384f68f9 100644
--- a/pool_select_walker.h
+++ b/pool_select_walker.h
@@ -6,7 +6,7 @@
* pgpool: a language independent connection pool server for PostgreSQL
* written by Tatsuo Ishii
*
- * Copyright (c) 2003-2010 PgPool Global Development Group
+ * Copyright (c) 2003-2012 PgPool Global Development Group
*
* Permission to use, copy, modify, and distribute this software and
* its documentation for any purpose and without fee is hereby
@@ -31,6 +31,21 @@
#include "parser/primnodes.h"
#include "parser/makefuncs.h"
+#define POOL_MAX_SELECT_OIDS 128
+#define POOL_NAMEDATALEN 64 /* from NAMEDATALEN of PostgreSQL */
+
+typedef struct {
+ bool has_system_catalog; /* True if system catalog table is used */
+ bool has_temp_table; /* True if temporary table is used */
+ bool has_unlogged_table; /* True if unlogged table is used */
+ bool has_function_call; /* True if write function call is used */
+ bool has_non_immutable_function_call; /* True if non immutable functions are used */
+ bool has_insertinto_or_locking_clause; /* True if it has SELECT INTO or FOR SHARE/UPDATE */
+ int num_oids; /* number of oids */
+ int table_oids[POOL_MAX_SELECT_OIDS]; /* table oids */
+ char table_names[POOL_MAX_SELECT_OIDS][POOL_NAMEDATALEN]; /* table names */
+} SelectContext;
+
extern bool pool_has_function_call(Node *node);
extern bool pool_has_non_immutable_function_call(Node *node);
extern bool pool_has_system_catalog(Node *node);
@@ -40,7 +55,8 @@ extern bool pool_has_insertinto_or_locking_clause(Node *node);
extern bool pool_has_pgpool_regclass(void);
extern bool raw_expression_tree_walker(Node *node, bool (*walker) (), void *context);
extern int pool_table_name_to_oid(char *table_name);
-extern int pool_extract_table_oids_from_select_stmt(Node *node, int **oids);
+extern int pool_extract_table_oids_from_select_stmt(Node *node, SelectContext *ctx);
extern RangeVar *makeRangeVarFromNameList(List *names);
+extern int pattern_compare(char *str, const int type, const char *param_name);
#endif /* POOL_SELECT_WALKER_H */
[parent: 57440a9dff6b]