From 6e9731947eace4be83d553a242a44b36b3adcf22 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Tue, 12 Apr 2011 20:52:16 -0700 Subject: [PATCH] Merge in updates to all docs/etc. --- docs/libmemcached_configuration.rst | 12 + docs/man/hashkit_clone.3 | 2 +- docs/man/hashkit_crc32.3 | 2 +- docs/man/hashkit_create.3 | 2 +- docs/man/hashkit_fnv1_32.3 | 2 +- docs/man/hashkit_fnv1_64.3 | 2 +- docs/man/hashkit_fnv1a_32.3 | 2 +- docs/man/hashkit_fnv1a_64.3 | 2 +- docs/man/hashkit_free.3 | 2 +- docs/man/hashkit_functions.3 | 2 +- docs/man/hashkit_hsieh.3 | 2 +- docs/man/hashkit_is_allocated.3 | 2 +- docs/man/hashkit_jenkins.3 | 2 +- docs/man/hashkit_md5.3 | 2 +- docs/man/hashkit_murmur.3 | 2 +- docs/man/hashkit_value.3 | 2 +- docs/man/libhashkit.3 | 2 +- docs/man/libmemcached.3 | 2 +- docs/man/libmemcached_check_configuration.3 | 15 +- docs/man/libmemcached_configuration.3 | 15 +- docs/man/libmemcached_examples.3 | 2 +- docs/man/libmemcachedutil.3 | 2 +- docs/man/memaslap.1 | 2 +- docs/man/memcached_add.3 | 2 +- docs/man/memcached_add_by_key.3 | 2 +- docs/man/memcached_analyze.3 | 2 +- docs/man/memcached_append.3 | 2 +- docs/man/memcached_append_by_key.3 | 2 +- docs/man/memcached_auto.3 | 2 +- docs/man/memcached_behavior.3 | 2 +- docs/man/memcached_behavior_get.3 | 2 +- docs/man/memcached_behavior_set.3 | 2 +- docs/man/memcached_callback.3 | 2 +- docs/man/memcached_callback_get.3 | 2 +- docs/man/memcached_callback_set.3 | 2 +- docs/man/memcached_cas.3 | 2 +- docs/man/memcached_cas_by_key.3 | 2 +- docs/man/memcached_clone.3 | 2 +- docs/man/memcached_create.3 | 2 +- docs/man/memcached_create_with_options.3 | 15 +- docs/man/memcached_decrement.3 | 2 +- docs/man/memcached_decrement_with_initial.3 | 2 +- docs/man/memcached_delete.3 | 2 +- docs/man/memcached_delete_by_key.3 | 2 +- docs/man/memcached_destroy_sasl_auth_data.3 | 2 +- docs/man/memcached_dump.3 | 2 +- docs/man/memcached_fetch.3 | 2 +- docs/man/memcached_fetch_execute.3 | 2 +- docs/man/memcached_fetch_result.3 | 2 +- docs/man/memcached_flush.3 | 2 +- docs/man/memcached_flush_buffers.3 | 2 +- docs/man/memcached_free.3 | 2 +- docs/man/memcached_generate_hash.3 | 2 +- docs/man/memcached_generate_hash_value.3 | 2 +- docs/man/memcached_get.3 | 2 +- docs/man/memcached_get_by_key.3 | 2 +- docs/man/memcached_get_memory_allocators.3 | 2 +- docs/man/memcached_get_sasl_callbacks.3 | 2 +- docs/man/memcached_get_user_data.3 | 2 +- docs/man/memcached_increment.3 | 2 +- docs/man/memcached_increment_with_initial.3 | 2 +- docs/man/memcached_lib_version.3 | 2 +- docs/man/memcached_memory_allocators.3 | 2 +- docs/man/memcached_mget.3 | 2 +- docs/man/memcached_mget_by_key.3 | 2 +- docs/man/memcached_mget_execute.3 | 2 +- docs/man/memcached_mget_execute_by_key.3 | 2 +- docs/man/memcached_pool.3 | 2 +- docs/man/memcached_pool_behavior_get.3 | 2 +- docs/man/memcached_pool_behavior_set.3 | 2 +- docs/man/memcached_pool_create.3 | 2 +- docs/man/memcached_pool_destroy.3 | 2 +- docs/man/memcached_pool_pop.3 | 2 +- docs/man/memcached_pool_push.3 | 2 +- docs/man/memcached_pool_st.3 | 2 +- docs/man/memcached_prepend.3 | 2 +- docs/man/memcached_prepend_by_key.3 | 2 +- docs/man/memcached_quit.3 | 2 +- docs/man/memcached_replace.3 | 2 +- docs/man/memcached_replace_by_key.3 | 2 +- docs/man/memcached_result_cas.3 | 2 +- docs/man/memcached_result_create.3 | 2 +- docs/man/memcached_result_flags.3 | 2 +- docs/man/memcached_result_free.3 | 2 +- docs/man/memcached_result_key_length.3 | 2 +- docs/man/memcached_result_key_value.3 | 2 +- docs/man/memcached_result_length.3 | 2 +- docs/man/memcached_result_st.3 | 2 +- docs/man/memcached_result_value.3 | 2 +- docs/man/memcached_sasl.3 | 2 +- docs/man/memcached_sasl_set_auth_data.3 | 2 +- docs/man/memcached_server_add.3 | 2 +- docs/man/memcached_server_add_unix_socket.3 | 2 +- docs/man/memcached_server_count.3 | 2 +- docs/man/memcached_server_cursor.3 | 2 +- docs/man/memcached_server_list.3 | 2 +- docs/man/memcached_server_list_append.3 | 2 +- docs/man/memcached_server_list_count.3 | 2 +- docs/man/memcached_server_list_free.3 | 2 +- docs/man/memcached_server_push.3 | 2 +- docs/man/memcached_server_st.3 | 2 +- docs/man/memcached_servers.3 | 2 +- docs/man/memcached_servers_parse.3 | 2 +- docs/man/memcached_servers_reset.3 | 2 +- docs/man/memcached_set.3 | 2 +- docs/man/memcached_set_by_key.3 | 2 +- docs/man/memcached_set_memory_allocators.3 | 2 +- .../memcached_set_memory_allocators_context.3 | 2 +- docs/man/memcached_set_sasl_callbacks.3 | 2 +- docs/man/memcached_set_user_data.3 | 2 +- docs/man/memcached_stat.3 | 2 +- docs/man/memcached_stat_execute.3 | 2 +- docs/man/memcached_stat_get_keys.3 | 2 +- docs/man/memcached_stat_get_value.3 | 2 +- docs/man/memcached_stat_servername.3 | 2 +- docs/man/memcached_stats.3 | 2 +- docs/man/memcached_strerror.3 | 2 +- docs/man/memcached_user_data.3 | 2 +- docs/man/memcached_verbosity.3 | 2 +- docs/man/memcached_version.3 | 2 +- docs/man/memcapable.1 | 2 +- docs/man/memcat.1 | 2 +- docs/man/memcp.1 | 2 +- docs/man/memdump.1 | 2 +- docs/man/memerror.1 | 2 +- docs/man/memflush.1 | 2 +- docs/man/memrm.1 | 2 +- docs/man/memslap.1 | 2 +- docs/man/memstat.1 | 2 +- docs/memcached_create.rst | 1 + docs/memcached_pool.rst | 2 + libmemcached/memcached.c | 8 +- libmemcached/options.cc | 9 +- libmemcached/options/parser.cc | 487 +++--- libmemcached/options/parser.h | 48 +- libmemcached/options/parser.yy | 12 + libmemcached/options/scanner.cc | 1547 +++++++---------- libmemcached/options/scanner.h | 2 +- libmemcached/options/scanner.l | 38 +- libmemcached/util/pool.c | 48 +- tests/parser.cc | 44 +- tests/pool.cc | 11 +- 142 files changed, 1202 insertions(+), 1362 deletions(-) diff --git a/docs/libmemcached_configuration.rst b/docs/libmemcached_configuration.rst index 01e6b711..05b2af8e 100644 --- a/docs/libmemcached_configuration.rst +++ b/docs/libmemcached_configuration.rst @@ -97,6 +97,18 @@ requests that know the namespace can access these values. This is accomplished by prepending the namespace value to all keys. +********************** +Mecached Pool Options: +********************** + +.. describe:: --POOL-MIN + +Initial size of pool. + +.. describe:: --POOL-MAX + +Maximize size of the pool. + ************ I/O Options: ************ diff --git a/docs/man/hashkit_clone.3 b/docs/man/hashkit_clone.3 index 6671cfc9..d77911a1 100644 --- a/docs/man/hashkit_clone.3 +++ b/docs/man/hashkit_clone.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_CLONE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_CLONE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_clone \- libhashkit Documentation . diff --git a/docs/man/hashkit_crc32.3 b/docs/man/hashkit_crc32.3 index 386bad87..15bb9e47 100644 --- a/docs/man/hashkit_crc32.3 +++ b/docs/man/hashkit_crc32.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_CRC32" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_CRC32" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_crc32 \- libhashkit Documentation . diff --git a/docs/man/hashkit_create.3 b/docs/man/hashkit_create.3 index 380e0c26..4a2758ed 100644 --- a/docs/man/hashkit_create.3 +++ b/docs/man/hashkit_create.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_CREATE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_CREATE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_create \- libhashkit Documentation . diff --git a/docs/man/hashkit_fnv1_32.3 b/docs/man/hashkit_fnv1_32.3 index 1caaa421..f99c3d01 100644 --- a/docs/man/hashkit_fnv1_32.3 +++ b/docs/man/hashkit_fnv1_32.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FNV1_32" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_FNV1_32" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_fnv1_32 \- libhashkit Documentation . diff --git a/docs/man/hashkit_fnv1_64.3 b/docs/man/hashkit_fnv1_64.3 index 1f8c7f89..eb620bc9 100644 --- a/docs/man/hashkit_fnv1_64.3 +++ b/docs/man/hashkit_fnv1_64.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FNV1_64" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_FNV1_64" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_fnv1_64 \- libhashkit Documentation . diff --git a/docs/man/hashkit_fnv1a_32.3 b/docs/man/hashkit_fnv1a_32.3 index b95c2577..5d3edb9c 100644 --- a/docs/man/hashkit_fnv1a_32.3 +++ b/docs/man/hashkit_fnv1a_32.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FNV1A_32" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_FNV1A_32" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_fnv1a_32 \- libhashkit Documentation . diff --git a/docs/man/hashkit_fnv1a_64.3 b/docs/man/hashkit_fnv1a_64.3 index ce121c6d..2d7067a9 100644 --- a/docs/man/hashkit_fnv1a_64.3 +++ b/docs/man/hashkit_fnv1a_64.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FNV1A_64" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_FNV1A_64" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_fnv1a_64 \- libhashkit Documentation . diff --git a/docs/man/hashkit_free.3 b/docs/man/hashkit_free.3 index 326b1861..e7f6af0e 100644 --- a/docs/man/hashkit_free.3 +++ b/docs/man/hashkit_free.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FREE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_FREE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_free \- libhashkit Documentation . diff --git a/docs/man/hashkit_functions.3 b/docs/man/hashkit_functions.3 index df444640..b28c1dd0 100644 --- a/docs/man/hashkit_functions.3 +++ b/docs/man/hashkit_functions.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FUNCTIONS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_FUNCTIONS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_functions \- libhashkit Documentation . diff --git a/docs/man/hashkit_hsieh.3 b/docs/man/hashkit_hsieh.3 index 6bcf2e5b..d48486f5 100644 --- a/docs/man/hashkit_hsieh.3 +++ b/docs/man/hashkit_hsieh.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_HSIEH" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_HSIEH" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_hsieh \- libhashkit Documentation . diff --git a/docs/man/hashkit_is_allocated.3 b/docs/man/hashkit_is_allocated.3 index d5b01363..e1c9af93 100644 --- a/docs/man/hashkit_is_allocated.3 +++ b/docs/man/hashkit_is_allocated.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_IS_ALLOCATED" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_IS_ALLOCATED" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_is_allocated \- libhashkit Documentation . diff --git a/docs/man/hashkit_jenkins.3 b/docs/man/hashkit_jenkins.3 index 099227e0..8c713b10 100644 --- a/docs/man/hashkit_jenkins.3 +++ b/docs/man/hashkit_jenkins.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_JENKINS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_JENKINS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_jenkins \- libhashkit Documentation . diff --git a/docs/man/hashkit_md5.3 b/docs/man/hashkit_md5.3 index 327779a0..b908c89e 100644 --- a/docs/man/hashkit_md5.3 +++ b/docs/man/hashkit_md5.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_MD5" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_MD5" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_md5 \- libhashkit Documentation . diff --git a/docs/man/hashkit_murmur.3 b/docs/man/hashkit_murmur.3 index 062c4efe..e7859164 100644 --- a/docs/man/hashkit_murmur.3 +++ b/docs/man/hashkit_murmur.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_MURMUR" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_MURMUR" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_murmur \- libhashkit Documentation . diff --git a/docs/man/hashkit_value.3 b/docs/man/hashkit_value.3 index e600b26e..4c4ff5ef 100644 --- a/docs/man/hashkit_value.3 +++ b/docs/man/hashkit_value.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_VALUE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "HASHKIT_VALUE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME hashkit_value \- libhashkit Documentation . diff --git a/docs/man/libhashkit.3 b/docs/man/libhashkit.3 index abe42647..ce0ba444 100644 --- a/docs/man/libhashkit.3 +++ b/docs/man/libhashkit.3 @@ -1,4 +1,4 @@ -.TH "LIBHASHKIT" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "LIBHASHKIT" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME libhashkit \- libhashkit Documentation . diff --git a/docs/man/libmemcached.3 b/docs/man/libmemcached.3 index 96f6f4e2..27781e66 100644 --- a/docs/man/libmemcached.3 +++ b/docs/man/libmemcached.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHED" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "LIBMEMCACHED" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME libmemcached \- Introducing the C Client Library for memcached . diff --git a/docs/man/libmemcached_check_configuration.3 b/docs/man/libmemcached_check_configuration.3 index ab989775..e2f3f256 100644 --- a/docs/man/libmemcached_check_configuration.3 +++ b/docs/man/libmemcached_check_configuration.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME libmemcached_check_configuration \- libmemcached Documentation . @@ -152,6 +152,19 @@ See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP A namespace is a container that provides context for keys, only other requests that know the namespace can access these values. This is accomplished by prepending the namespace value to all keys. +.SS Mecached Pool Options: +.INDENT 0.0 +.TP +.B \-\-POOL\-MIN +.UNINDENT +.sp +Initial size of pool. +.INDENT 0.0 +.TP +.B \-\-POOL\-MAX +.UNINDENT +.sp +Maximize size of the pool. .SS I/O Options: .INDENT 0.0 .TP diff --git a/docs/man/libmemcached_configuration.3 b/docs/man/libmemcached_configuration.3 index 6b0951c1..ebc4f4b5 100644 --- a/docs/man/libmemcached_configuration.3 +++ b/docs/man/libmemcached_configuration.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHED_CONFIGURATION" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "LIBMEMCACHED_CONFIGURATION" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME libmemcached_configuration \- libmemcached Documentation . @@ -152,6 +152,19 @@ See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP A namespace is a container that provides context for keys, only other requests that know the namespace can access these values. This is accomplished by prepending the namespace value to all keys. +.SS Mecached Pool Options: +.INDENT 0.0 +.TP +.B \-\-POOL\-MIN +.UNINDENT +.sp +Initial size of pool. +.INDENT 0.0 +.TP +.B \-\-POOL\-MAX +.UNINDENT +.sp +Maximize size of the pool. .SS I/O Options: .INDENT 0.0 .TP diff --git a/docs/man/libmemcached_examples.3 b/docs/man/libmemcached_examples.3 index 528fc016..d0d6f805 100644 --- a/docs/man/libmemcached_examples.3 +++ b/docs/man/libmemcached_examples.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHED_EXAMPLES" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "LIBMEMCACHED_EXAMPLES" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME libmemcached_examples \- libmemcached Documentation . diff --git a/docs/man/libmemcachedutil.3 b/docs/man/libmemcachedutil.3 index 5e0067e9..94a95b71 100644 --- a/docs/man/libmemcachedutil.3 +++ b/docs/man/libmemcachedutil.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHEDUTIL" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "LIBMEMCACHEDUTIL" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME libmemcachedutil \- libmemcached Documentation . diff --git a/docs/man/memaslap.1 b/docs/man/memaslap.1 index 75072d54..a02e1adc 100644 --- a/docs/man/memaslap.1 +++ b/docs/man/memaslap.1 @@ -1,4 +1,4 @@ -.TH "MEMASLAP" "1" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMASLAP" "1" "April 12, 2011" "0.47" "libmemcached" .SH NAME memaslap \- libmemcached Documentation . diff --git a/docs/man/memcached_add.3 b/docs/man/memcached_add.3 index 3bb6739c..35756b11 100644 --- a/docs/man/memcached_add.3 +++ b/docs/man/memcached_add.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_ADD" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_ADD" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_add \- Storing and Replacing Data . diff --git a/docs/man/memcached_add_by_key.3 b/docs/man/memcached_add_by_key.3 index 67fa2342..03fd7a4a 100644 --- a/docs/man/memcached_add_by_key.3 +++ b/docs/man/memcached_add_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_ADD_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_ADD_BY_KEY" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_add_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_analyze.3 b/docs/man/memcached_analyze.3 index ff0cf13a..16a328ad 100644 --- a/docs/man/memcached_analyze.3 +++ b/docs/man/memcached_analyze.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_ANALYZE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_ANALYZE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_analyze \- libmemcached Documentation . diff --git a/docs/man/memcached_append.3 b/docs/man/memcached_append.3 index 97027004..d1711df4 100644 --- a/docs/man/memcached_append.3 +++ b/docs/man/memcached_append.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_APPEND" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_APPEND" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_append \- Storing and Replacing Data . diff --git a/docs/man/memcached_append_by_key.3 b/docs/man/memcached_append_by_key.3 index 42bf275d..f3116b08 100644 --- a/docs/man/memcached_append_by_key.3 +++ b/docs/man/memcached_append_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_APPEND_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_APPEND_BY_KEY" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_append_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_auto.3 b/docs/man/memcached_auto.3 index f63a1ae2..d8bf8dc5 100644 --- a/docs/man/memcached_auto.3 +++ b/docs/man/memcached_auto.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_AUTO" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_AUTO" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_auto \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_behavior.3 b/docs/man/memcached_behavior.3 index 451eff49..d8b90dd1 100644 --- a/docs/man/memcached_behavior.3 +++ b/docs/man/memcached_behavior.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_BEHAVIOR" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_BEHAVIOR" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_behavior \- libmemcached Documentation . diff --git a/docs/man/memcached_behavior_get.3 b/docs/man/memcached_behavior_get.3 index ef61f543..f79ce887 100644 --- a/docs/man/memcached_behavior_get.3 +++ b/docs/man/memcached_behavior_get.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_BEHAVIOR_GET" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_BEHAVIOR_GET" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_behavior_get \- libmemcached Documentation . diff --git a/docs/man/memcached_behavior_set.3 b/docs/man/memcached_behavior_set.3 index 68ae142b..739f208d 100644 --- a/docs/man/memcached_behavior_set.3 +++ b/docs/man/memcached_behavior_set.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_BEHAVIOR_SET" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_BEHAVIOR_SET" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_behavior_set \- libmemcached Documentation . diff --git a/docs/man/memcached_callback.3 b/docs/man/memcached_callback.3 index a6933305..33414dd0 100644 --- a/docs/man/memcached_callback.3 +++ b/docs/man/memcached_callback.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CALLBACK" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CALLBACK" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_callback \- libmemcached Documentation . diff --git a/docs/man/memcached_callback_get.3 b/docs/man/memcached_callback_get.3 index 31847458..8ec0bb54 100644 --- a/docs/man/memcached_callback_get.3 +++ b/docs/man/memcached_callback_get.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CALLBACK_GET" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CALLBACK_GET" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_callback_get \- libmemcached Documentation . diff --git a/docs/man/memcached_callback_set.3 b/docs/man/memcached_callback_set.3 index 7bcb087e..1d02cba6 100644 --- a/docs/man/memcached_callback_set.3 +++ b/docs/man/memcached_callback_set.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CALLBACK_SET" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CALLBACK_SET" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_callback_set \- libmemcached Documentation . diff --git a/docs/man/memcached_cas.3 b/docs/man/memcached_cas.3 index 953aac18..1e5b6023 100644 --- a/docs/man/memcached_cas.3 +++ b/docs/man/memcached_cas.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CAS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CAS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_cas \- Storing and Replacing Data . diff --git a/docs/man/memcached_cas_by_key.3 b/docs/man/memcached_cas_by_key.3 index 49d603bb..41a373fd 100644 --- a/docs/man/memcached_cas_by_key.3 +++ b/docs/man/memcached_cas_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CAS_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CAS_BY_KEY" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_cas_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_clone.3 b/docs/man/memcached_clone.3 index c32ef376..d713ad1b 100644 --- a/docs/man/memcached_clone.3 +++ b/docs/man/memcached_clone.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CLONE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CLONE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_clone \- libmemcached Documentation . diff --git a/docs/man/memcached_create.3 b/docs/man/memcached_create.3 index f7bc7895..5e82385b 100644 --- a/docs/man/memcached_create.3 +++ b/docs/man/memcached_create.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CREATE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CREATE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_create \- libmemcached Documentation . diff --git a/docs/man/memcached_create_with_options.3 b/docs/man/memcached_create_with_options.3 index 97c46410..cdbbd5d9 100644 --- a/docs/man/memcached_create_with_options.3 +++ b/docs/man/memcached_create_with_options.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CREATE_WITH_OPTIONS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CREATE_WITH_OPTIONS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_create_with_options \- libmemcached Documentation . @@ -152,6 +152,19 @@ See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP A namespace is a container that provides context for keys, only other requests that know the namespace can access these values. This is accomplished by prepending the namespace value to all keys. +.SS Mecached Pool Options: +.INDENT 0.0 +.TP +.B \-\-POOL\-MIN +.UNINDENT +.sp +Initial size of pool. +.INDENT 0.0 +.TP +.B \-\-POOL\-MAX +.UNINDENT +.sp +Maximize size of the pool. .SS I/O Options: .INDENT 0.0 .TP diff --git a/docs/man/memcached_decrement.3 b/docs/man/memcached_decrement.3 index bf5b9797..cde22eeb 100644 --- a/docs/man/memcached_decrement.3 +++ b/docs/man/memcached_decrement.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DECREMENT" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_DECREMENT" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_decrement \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_decrement_with_initial.3 b/docs/man/memcached_decrement_with_initial.3 index 8fad70a9..97c523d2 100644 --- a/docs/man/memcached_decrement_with_initial.3 +++ b/docs/man/memcached_decrement_with_initial.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_decrement_with_initial \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_delete.3 b/docs/man/memcached_delete.3 index b846b86e..56c0cc38 100644 --- a/docs/man/memcached_delete.3 +++ b/docs/man/memcached_delete.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DELETE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_DELETE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_delete \- libmemcached Documentation . diff --git a/docs/man/memcached_delete_by_key.3 b/docs/man/memcached_delete_by_key.3 index 7d476979..3d397804 100644 --- a/docs/man/memcached_delete_by_key.3 +++ b/docs/man/memcached_delete_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DELETE_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_DELETE_BY_KEY" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_delete_by_key \- libmemcached Documentation . diff --git a/docs/man/memcached_destroy_sasl_auth_data.3 b/docs/man/memcached_destroy_sasl_auth_data.3 index 44f53868..f0382c3e 100644 --- a/docs/man/memcached_destroy_sasl_auth_data.3 +++ b/docs/man/memcached_destroy_sasl_auth_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_destroy_sasl_auth_data \- libmemcached Documentation . diff --git a/docs/man/memcached_dump.3 b/docs/man/memcached_dump.3 index ee44cbc5..5f076301 100644 --- a/docs/man/memcached_dump.3 +++ b/docs/man/memcached_dump.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DUMP" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_DUMP" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_dump \- libmemcached Documentation . diff --git a/docs/man/memcached_fetch.3 b/docs/man/memcached_fetch.3 index b1b34c3d..bf856fb0 100644 --- a/docs/man/memcached_fetch.3 +++ b/docs/man/memcached_fetch.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FETCH" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_FETCH" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_fetch \- Retrieving data from the server . diff --git a/docs/man/memcached_fetch_execute.3 b/docs/man/memcached_fetch_execute.3 index 2c716fec..8b421e59 100644 --- a/docs/man/memcached_fetch_execute.3 +++ b/docs/man/memcached_fetch_execute.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FETCH_EXECUTE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_FETCH_EXECUTE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_fetch_execute \- Retrieving data from the server . diff --git a/docs/man/memcached_fetch_result.3 b/docs/man/memcached_fetch_result.3 index f5afaccb..83c8b077 100644 --- a/docs/man/memcached_fetch_result.3 +++ b/docs/man/memcached_fetch_result.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FETCH_RESULT" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_FETCH_RESULT" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_fetch_result \- Retrieving data from the server . diff --git a/docs/man/memcached_flush.3 b/docs/man/memcached_flush.3 index 7db06fa0..a7ae6bdf 100644 --- a/docs/man/memcached_flush.3 +++ b/docs/man/memcached_flush.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FLUSH" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_FLUSH" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_flush \- libmemcached Documentation . diff --git a/docs/man/memcached_flush_buffers.3 b/docs/man/memcached_flush_buffers.3 index 6e2fc657..860c54fe 100644 --- a/docs/man/memcached_flush_buffers.3 +++ b/docs/man/memcached_flush_buffers.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FLUSH_BUFFERS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_FLUSH_BUFFERS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_flush_buffers \- libmemcached Documentation . diff --git a/docs/man/memcached_free.3 b/docs/man/memcached_free.3 index d2b3cb0a..25c6c29d 100644 --- a/docs/man/memcached_free.3 +++ b/docs/man/memcached_free.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FREE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_FREE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_free \- libmemcached Documentation . diff --git a/docs/man/memcached_generate_hash.3 b/docs/man/memcached_generate_hash.3 index e96898e5..24a4fb33 100644 --- a/docs/man/memcached_generate_hash.3 +++ b/docs/man/memcached_generate_hash.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GENERATE_HASH" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GENERATE_HASH" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_generate_hash \- Generating hash values directly . diff --git a/docs/man/memcached_generate_hash_value.3 b/docs/man/memcached_generate_hash_value.3 index 6298273b..dce95724 100644 --- a/docs/man/memcached_generate_hash_value.3 +++ b/docs/man/memcached_generate_hash_value.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_generate_hash_value \- Generating hash values directly . diff --git a/docs/man/memcached_get.3 b/docs/man/memcached_get.3 index 519d56f2..2c53d9ce 100644 --- a/docs/man/memcached_get.3 +++ b/docs/man/memcached_get.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GET" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_get \- Retrieving data from the server . diff --git a/docs/man/memcached_get_by_key.3 b/docs/man/memcached_get_by_key.3 index 39bd8709..b7824471 100644 --- a/docs/man/memcached_get_by_key.3 +++ b/docs/man/memcached_get_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GET_BY_KEY" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_get_by_key \- Retrieving data from the server . diff --git a/docs/man/memcached_get_memory_allocators.3 b/docs/man/memcached_get_memory_allocators.3 index 7125fb3c..98d892ad 100644 --- a/docs/man/memcached_get_memory_allocators.3 +++ b/docs/man/memcached_get_memory_allocators.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_get_memory_allocators \- libmemcached Documentation . diff --git a/docs/man/memcached_get_sasl_callbacks.3 b/docs/man/memcached_get_sasl_callbacks.3 index e72d4c90..7d159397 100644 --- a/docs/man/memcached_get_sasl_callbacks.3 +++ b/docs/man/memcached_get_sasl_callbacks.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_get_sasl_callbacks \- libmemcached Documentation . diff --git a/docs/man/memcached_get_user_data.3 b/docs/man/memcached_get_user_data.3 index 20a1e61e..1583ddf7 100644 --- a/docs/man/memcached_get_user_data.3 +++ b/docs/man/memcached_get_user_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET_USER_DATA" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GET_USER_DATA" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_get_user_data \- libmemcached Documentation . diff --git a/docs/man/memcached_increment.3 b/docs/man/memcached_increment.3 index 7e488991..1da1748c 100644 --- a/docs/man/memcached_increment.3 +++ b/docs/man/memcached_increment.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_INCREMENT" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_INCREMENT" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_increment \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_increment_with_initial.3 b/docs/man/memcached_increment_with_initial.3 index 45a306dd..1323f3e2 100644 --- a/docs/man/memcached_increment_with_initial.3 +++ b/docs/man/memcached_increment_with_initial.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_increment_with_initial \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_lib_version.3 b/docs/man/memcached_lib_version.3 index 91458c10..291ed6f4 100644 --- a/docs/man/memcached_lib_version.3 +++ b/docs/man/memcached_lib_version.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_LIB_VERSION" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_LIB_VERSION" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_lib_version \- libmemcached Documentation . diff --git a/docs/man/memcached_memory_allocators.3 b/docs/man/memcached_memory_allocators.3 index 1f50a825..9f0fda57 100644 --- a/docs/man/memcached_memory_allocators.3 +++ b/docs/man/memcached_memory_allocators.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MEMORY_ALLOCATORS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_MEMORY_ALLOCATORS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_memory_allocators \- libmemcached Documentation . diff --git a/docs/man/memcached_mget.3 b/docs/man/memcached_mget.3 index ea841db3..982df6da 100644 --- a/docs/man/memcached_mget.3 +++ b/docs/man/memcached_mget.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MGET" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_MGET" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_mget \- Retrieving data from the server . diff --git a/docs/man/memcached_mget_by_key.3 b/docs/man/memcached_mget_by_key.3 index 3f4616e5..131ec38b 100644 --- a/docs/man/memcached_mget_by_key.3 +++ b/docs/man/memcached_mget_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MGET_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_MGET_BY_KEY" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_mget_by_key \- Retrieving data from the server . diff --git a/docs/man/memcached_mget_execute.3 b/docs/man/memcached_mget_execute.3 index 9eb34f5a..f2e0dcd4 100644 --- a/docs/man/memcached_mget_execute.3 +++ b/docs/man/memcached_mget_execute.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MGET_EXECUTE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_MGET_EXECUTE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_mget_execute \- Retrieving data from the server . diff --git a/docs/man/memcached_mget_execute_by_key.3 b/docs/man/memcached_mget_execute_by_key.3 index 0aca15f5..3e3c5ee7 100644 --- a/docs/man/memcached_mget_execute_by_key.3 +++ b/docs/man/memcached_mget_execute_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_mget_execute_by_key \- Retrieving data from the server . diff --git a/docs/man/memcached_pool.3 b/docs/man/memcached_pool.3 index c264dde2..29a45721 100644 --- a/docs/man/memcached_pool.3 +++ b/docs/man/memcached_pool.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_pool \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_behavior_get.3 b/docs/man/memcached_pool_behavior_get.3 index b6c46925..7abf8add 100644 --- a/docs/man/memcached_pool_behavior_get.3 +++ b/docs/man/memcached_pool_behavior_get.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_behavior_get \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_behavior_set.3 b/docs/man/memcached_pool_behavior_set.3 index 1defee21..b9e3d669 100644 --- a/docs/man/memcached_pool_behavior_set.3 +++ b/docs/man/memcached_pool_behavior_set.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_behavior_set \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_create.3 b/docs/man/memcached_pool_create.3 index 25499e53..9da7400d 100644 --- a/docs/man/memcached_pool_create.3 +++ b/docs/man/memcached_pool_create.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_CREATE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_CREATE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_create \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_destroy.3 b/docs/man/memcached_pool_destroy.3 index ee918d36..aee382d4 100644 --- a/docs/man/memcached_pool_destroy.3 +++ b/docs/man/memcached_pool_destroy.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_DESTROY" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_DESTROY" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_destroy \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_pop.3 b/docs/man/memcached_pool_pop.3 index beda67b1..1d7f72d9 100644 --- a/docs/man/memcached_pool_pop.3 +++ b/docs/man/memcached_pool_pop.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_POP" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_POP" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_pop \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_push.3 b/docs/man/memcached_pool_push.3 index 6c3100c4..85353e15 100644 --- a/docs/man/memcached_pool_push.3 +++ b/docs/man/memcached_pool_push.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_PUSH" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_PUSH" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_push \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_st.3 b/docs/man/memcached_pool_st.3 index a2e54798..5cf0ea63 100644 --- a/docs/man/memcached_pool_st.3 +++ b/docs/man/memcached_pool_st.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_ST" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_ST" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_st \- libmemcached Documentation . diff --git a/docs/man/memcached_prepend.3 b/docs/man/memcached_prepend.3 index ffe7f082..485252ac 100644 --- a/docs/man/memcached_prepend.3 +++ b/docs/man/memcached_prepend.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_PREPEND" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_PREPEND" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_prepend \- Storing and Replacing Data . diff --git a/docs/man/memcached_prepend_by_key.3 b/docs/man/memcached_prepend_by_key.3 index c56596d3..11c6ef41 100644 --- a/docs/man/memcached_prepend_by_key.3 +++ b/docs/man/memcached_prepend_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_PREPEND_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_PREPEND_BY_KEY" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_prepend_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_quit.3 b/docs/man/memcached_quit.3 index 63f12144..847ebe98 100644 --- a/docs/man/memcached_quit.3 +++ b/docs/man/memcached_quit.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_QUIT" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_QUIT" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_quit \- libmemcached Documentation . diff --git a/docs/man/memcached_replace.3 b/docs/man/memcached_replace.3 index 698813b6..033eb368 100644 --- a/docs/man/memcached_replace.3 +++ b/docs/man/memcached_replace.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_REPLACE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_REPLACE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_replace \- Storing and Replacing Data . diff --git a/docs/man/memcached_replace_by_key.3 b/docs/man/memcached_replace_by_key.3 index c28e9598..efe82fc0 100644 --- a/docs/man/memcached_replace_by_key.3 +++ b/docs/man/memcached_replace_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_REPLACE_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_REPLACE_BY_KEY" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_replace_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_result_cas.3 b/docs/man/memcached_result_cas.3 index 61d7ed76..103621eb 100644 --- a/docs/man/memcached_result_cas.3 +++ b/docs/man/memcached_result_cas.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_CAS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_CAS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_result_cas \- Working with result sets . diff --git a/docs/man/memcached_result_create.3 b/docs/man/memcached_result_create.3 index 4c82d841..b78b789d 100644 --- a/docs/man/memcached_result_create.3 +++ b/docs/man/memcached_result_create.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_CREATE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_CREATE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_result_create \- Working with result sets . diff --git a/docs/man/memcached_result_flags.3 b/docs/man/memcached_result_flags.3 index e7daba43..33c0a803 100644 --- a/docs/man/memcached_result_flags.3 +++ b/docs/man/memcached_result_flags.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_FLAGS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_FLAGS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_result_flags \- Working with result sets . diff --git a/docs/man/memcached_result_free.3 b/docs/man/memcached_result_free.3 index 671c5d05..01b5e59c 100644 --- a/docs/man/memcached_result_free.3 +++ b/docs/man/memcached_result_free.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_FREE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_FREE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_result_free \- Working with result sets . diff --git a/docs/man/memcached_result_key_length.3 b/docs/man/memcached_result_key_length.3 index c530e7d6..050e7a5d 100644 --- a/docs/man/memcached_result_key_length.3 +++ b/docs/man/memcached_result_key_length.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_KEY_LENGTH" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_KEY_LENGTH" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_result_key_length \- Working with result sets . diff --git a/docs/man/memcached_result_key_value.3 b/docs/man/memcached_result_key_value.3 index 1aae4220..cf0021aa 100644 --- a/docs/man/memcached_result_key_value.3 +++ b/docs/man/memcached_result_key_value.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_KEY_VALUE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_KEY_VALUE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_result_key_value \- Working with result sets . diff --git a/docs/man/memcached_result_length.3 b/docs/man/memcached_result_length.3 index 91769270..f07d3058 100644 --- a/docs/man/memcached_result_length.3 +++ b/docs/man/memcached_result_length.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_LENGTH" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_LENGTH" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_result_length \- Working with result sets . diff --git a/docs/man/memcached_result_st.3 b/docs/man/memcached_result_st.3 index 98734d20..d761af4a 100644 --- a/docs/man/memcached_result_st.3 +++ b/docs/man/memcached_result_st.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_ST" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_ST" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_result_st \- Working with result sets . diff --git a/docs/man/memcached_result_value.3 b/docs/man/memcached_result_value.3 index 4ca4789f..16522862 100644 --- a/docs/man/memcached_result_value.3 +++ b/docs/man/memcached_result_value.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_VALUE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_VALUE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_result_value \- Working with result sets . diff --git a/docs/man/memcached_sasl.3 b/docs/man/memcached_sasl.3 index 946b0dfb..37680add 100644 --- a/docs/man/memcached_sasl.3 +++ b/docs/man/memcached_sasl.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SASL" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SASL" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_sasl \- libmemcached Documentation . diff --git a/docs/man/memcached_sasl_set_auth_data.3 b/docs/man/memcached_sasl_set_auth_data.3 index 62209401..421bfcf9 100644 --- a/docs/man/memcached_sasl_set_auth_data.3 +++ b/docs/man/memcached_sasl_set_auth_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_sasl_set_auth_data \- libmemcached Documentation . diff --git a/docs/man/memcached_server_add.3 b/docs/man/memcached_server_add.3 index f1efa983..ce130f94 100644 --- a/docs/man/memcached_server_add.3 +++ b/docs/man/memcached_server_add.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_ADD" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_ADD" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_server_add \- libmemcached Documentation . diff --git a/docs/man/memcached_server_add_unix_socket.3 b/docs/man/memcached_server_add_unix_socket.3 index dedc0201..1efab87c 100644 --- a/docs/man/memcached_server_add_unix_socket.3 +++ b/docs/man/memcached_server_add_unix_socket.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_ADD_UNIX_SOCKET" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_ADD_UNIX_SOCKET" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_server_add_unix_socket \- libmemcached Documentation . diff --git a/docs/man/memcached_server_count.3 b/docs/man/memcached_server_count.3 index cece389e..41376b26 100644 --- a/docs/man/memcached_server_count.3 +++ b/docs/man/memcached_server_count.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_COUNT" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_COUNT" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_server_count \- libmemcached Documentation . diff --git a/docs/man/memcached_server_cursor.3 b/docs/man/memcached_server_cursor.3 index d5d67b5a..5759cc14 100644 --- a/docs/man/memcached_server_cursor.3 +++ b/docs/man/memcached_server_cursor.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_CURSOR" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_CURSOR" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_server_cursor \- libmemcached Documentation . diff --git a/docs/man/memcached_server_list.3 b/docs/man/memcached_server_list.3 index ef1627fd..ccd5f115 100644 --- a/docs/man/memcached_server_list.3 +++ b/docs/man/memcached_server_list.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_LIST" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_LIST" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_server_list \- libmemcached Documentation . diff --git a/docs/man/memcached_server_list_append.3 b/docs/man/memcached_server_list_append.3 index 9f284353..cf2b8660 100644 --- a/docs/man/memcached_server_list_append.3 +++ b/docs/man/memcached_server_list_append.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_server_list_append \- libmemcached Documentation . diff --git a/docs/man/memcached_server_list_count.3 b/docs/man/memcached_server_list_count.3 index 9c0e65ce..b0f7e943 100644 --- a/docs/man/memcached_server_list_count.3 +++ b/docs/man/memcached_server_list_count.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_server_list_count \- libmemcached Documentation . diff --git a/docs/man/memcached_server_list_free.3 b/docs/man/memcached_server_list_free.3 index 0f2b62bb..28ece895 100644 --- a/docs/man/memcached_server_list_free.3 +++ b/docs/man/memcached_server_list_free.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_LIST_FREE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_LIST_FREE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_server_list_free \- libmemcached Documentation . diff --git a/docs/man/memcached_server_push.3 b/docs/man/memcached_server_push.3 index 71e7eed1..478bbd60 100644 --- a/docs/man/memcached_server_push.3 +++ b/docs/man/memcached_server_push.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_PUSH" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_PUSH" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_server_push \- libmemcached Documentation . diff --git a/docs/man/memcached_server_st.3 b/docs/man/memcached_server_st.3 index d5cc4262..83e3b830 100644 --- a/docs/man/memcached_server_st.3 +++ b/docs/man/memcached_server_st.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_ST" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_ST" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_server_st \- libmemcached Documentation . diff --git a/docs/man/memcached_servers.3 b/docs/man/memcached_servers.3 index 840d6879..110d23ce 100644 --- a/docs/man/memcached_servers.3 +++ b/docs/man/memcached_servers.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVERS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVERS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_servers \- libmemcached Documentation . diff --git a/docs/man/memcached_servers_parse.3 b/docs/man/memcached_servers_parse.3 index 4663b857..ae0e3dff 100644 --- a/docs/man/memcached_servers_parse.3 +++ b/docs/man/memcached_servers_parse.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVERS_PARSE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVERS_PARSE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_servers_parse \- libmemcached Documentation . diff --git a/docs/man/memcached_servers_reset.3 b/docs/man/memcached_servers_reset.3 index 43c89653..2ce0cc8c 100644 --- a/docs/man/memcached_servers_reset.3 +++ b/docs/man/memcached_servers_reset.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVERS_RESET" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVERS_RESET" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_servers_reset \- libmemcached Documentation . diff --git a/docs/man/memcached_set.3 b/docs/man/memcached_set.3 index 63c4ea4c..c7326a31 100644 --- a/docs/man/memcached_set.3 +++ b/docs/man/memcached_set.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SET" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_set \- Storing and Replacing Data . diff --git a/docs/man/memcached_set_by_key.3 b/docs/man/memcached_set_by_key.3 index e81ea0f1..21a95d7b 100644 --- a/docs/man/memcached_set_by_key.3 +++ b/docs/man/memcached_set_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SET_BY_KEY" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_set_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_set_memory_allocators.3 b/docs/man/memcached_set_memory_allocators.3 index 8635453f..1e7cbd08 100644 --- a/docs/man/memcached_set_memory_allocators.3 +++ b/docs/man/memcached_set_memory_allocators.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_set_memory_allocators \- libmemcached Documentation . diff --git a/docs/man/memcached_set_memory_allocators_context.3 b/docs/man/memcached_set_memory_allocators_context.3 index 523c0810..95c42ea4 100644 --- a/docs/man/memcached_set_memory_allocators_context.3 +++ b/docs/man/memcached_set_memory_allocators_context.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_MEMORY_ALLOCATORS_CONTEXT" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SET_MEMORY_ALLOCATORS_CONTEXT" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_set_memory_allocators_context \- libmemcached Documentation . diff --git a/docs/man/memcached_set_sasl_callbacks.3 b/docs/man/memcached_set_sasl_callbacks.3 index d44839fa..235963e2 100644 --- a/docs/man/memcached_set_sasl_callbacks.3 +++ b/docs/man/memcached_set_sasl_callbacks.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_set_sasl_callbacks \- libmemcached Documentation . diff --git a/docs/man/memcached_set_user_data.3 b/docs/man/memcached_set_user_data.3 index 033b58d2..b69adc4a 100644 --- a/docs/man/memcached_set_user_data.3 +++ b/docs/man/memcached_set_user_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_USER_DATA" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SET_USER_DATA" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_set_user_data \- libmemcached Documentation . diff --git a/docs/man/memcached_stat.3 b/docs/man/memcached_stat.3 index 4531dc9d..820aa2cc 100644 --- a/docs/man/memcached_stat.3 +++ b/docs/man/memcached_stat.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STAT" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_stat \- libmemcached Documentation . diff --git a/docs/man/memcached_stat_execute.3 b/docs/man/memcached_stat_execute.3 index 5d252484..cfbdf1e9 100644 --- a/docs/man/memcached_stat_execute.3 +++ b/docs/man/memcached_stat_execute.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT_EXECUTE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STAT_EXECUTE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_stat_execute \- libmemcached Documentation . diff --git a/docs/man/memcached_stat_get_keys.3 b/docs/man/memcached_stat_get_keys.3 index f7e32ce1..6a45f199 100644 --- a/docs/man/memcached_stat_get_keys.3 +++ b/docs/man/memcached_stat_get_keys.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT_GET_KEYS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STAT_GET_KEYS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_stat_get_keys \- libmemcached Documentation . diff --git a/docs/man/memcached_stat_get_value.3 b/docs/man/memcached_stat_get_value.3 index 95a76a07..a823b16c 100644 --- a/docs/man/memcached_stat_get_value.3 +++ b/docs/man/memcached_stat_get_value.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT_GET_VALUE" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STAT_GET_VALUE" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_stat_get_value \- libmemcached Documentation . diff --git a/docs/man/memcached_stat_servername.3 b/docs/man/memcached_stat_servername.3 index 84ac2a31..cf8f394c 100644 --- a/docs/man/memcached_stat_servername.3 +++ b/docs/man/memcached_stat_servername.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT_SERVERNAME" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STAT_SERVERNAME" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_stat_servername \- libmemcached Documentation . diff --git a/docs/man/memcached_stats.3 b/docs/man/memcached_stats.3 index 91a13274..c4d68218 100644 --- a/docs/man/memcached_stats.3 +++ b/docs/man/memcached_stats.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STATS" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STATS" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_stats \- libmemcached Documentation . diff --git a/docs/man/memcached_strerror.3 b/docs/man/memcached_strerror.3 index 57b8b113..c4d320f9 100644 --- a/docs/man/memcached_strerror.3 +++ b/docs/man/memcached_strerror.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STRERROR" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STRERROR" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_strerror \- libmemcached Documentation . diff --git a/docs/man/memcached_user_data.3 b/docs/man/memcached_user_data.3 index 9819cd66..44c03ef4 100644 --- a/docs/man/memcached_user_data.3 +++ b/docs/man/memcached_user_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_USER_DATA" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_USER_DATA" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_user_data \- libmemcached Documentation . diff --git a/docs/man/memcached_verbosity.3 b/docs/man/memcached_verbosity.3 index 1a926e6b..d1379357 100644 --- a/docs/man/memcached_verbosity.3 +++ b/docs/man/memcached_verbosity.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_VERBOSITY" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_VERBOSITY" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_verbosity \- libmemcached Documentation . diff --git a/docs/man/memcached_version.3 b/docs/man/memcached_version.3 index 0da54643..fe232e01 100644 --- a/docs/man/memcached_version.3 +++ b/docs/man/memcached_version.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_VERSION" "3" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_VERSION" "3" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcached_version \- libmemcached Documentation . diff --git a/docs/man/memcapable.1 b/docs/man/memcapable.1 index e49422e3..b15e498e 100644 --- a/docs/man/memcapable.1 +++ b/docs/man/memcapable.1 @@ -1,4 +1,4 @@ -.TH "MEMCAPABLE" "1" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCAPABLE" "1" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcapable \- libmemcached Documentation . diff --git a/docs/man/memcat.1 b/docs/man/memcat.1 index 229aac6f..400664b5 100644 --- a/docs/man/memcat.1 +++ b/docs/man/memcat.1 @@ -1,4 +1,4 @@ -.TH "MEMCAT" "1" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCAT" "1" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcat \- libmemcached Documentation . diff --git a/docs/man/memcp.1 b/docs/man/memcp.1 index e32a8198..30b1b02c 100644 --- a/docs/man/memcp.1 +++ b/docs/man/memcp.1 @@ -1,4 +1,4 @@ -.TH "MEMCP" "1" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMCP" "1" "April 12, 2011" "0.47" "libmemcached" .SH NAME memcp \- libmemcached Documentation . diff --git a/docs/man/memdump.1 b/docs/man/memdump.1 index 88e8f65c..2438b80e 100644 --- a/docs/man/memdump.1 +++ b/docs/man/memdump.1 @@ -1,4 +1,4 @@ -.TH "MEMDUMP" "1" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMDUMP" "1" "April 12, 2011" "0.47" "libmemcached" .SH NAME memdump \- libmemcached Documentation . diff --git a/docs/man/memerror.1 b/docs/man/memerror.1 index 531e2d8d..9a73f547 100644 --- a/docs/man/memerror.1 +++ b/docs/man/memerror.1 @@ -1,4 +1,4 @@ -.TH "MEMERROR" "1" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMERROR" "1" "April 12, 2011" "0.47" "libmemcached" .SH NAME memerror \- libmemcached Documentation . diff --git a/docs/man/memflush.1 b/docs/man/memflush.1 index 85c881d7..0e6d9415 100644 --- a/docs/man/memflush.1 +++ b/docs/man/memflush.1 @@ -1,4 +1,4 @@ -.TH "MEMFLUSH" "1" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMFLUSH" "1" "April 12, 2011" "0.47" "libmemcached" .SH NAME memflush \- libmemcached Documentation . diff --git a/docs/man/memrm.1 b/docs/man/memrm.1 index 839cd8e9..c590f522 100644 --- a/docs/man/memrm.1 +++ b/docs/man/memrm.1 @@ -1,4 +1,4 @@ -.TH "MEMRM" "1" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMRM" "1" "April 12, 2011" "0.47" "libmemcached" .SH NAME memrm \- libmemcached Documentation . diff --git a/docs/man/memslap.1 b/docs/man/memslap.1 index 83e911dc..2678bbdb 100644 --- a/docs/man/memslap.1 +++ b/docs/man/memslap.1 @@ -1,4 +1,4 @@ -.TH "MEMSLAP" "1" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMSLAP" "1" "April 12, 2011" "0.47" "libmemcached" .SH NAME memslap \- libmemcached Documentation . diff --git a/docs/man/memstat.1 b/docs/man/memstat.1 index e4fdd7ac..729e7db3 100644 --- a/docs/man/memstat.1 +++ b/docs/man/memstat.1 @@ -1,4 +1,4 @@ -.TH "MEMSTAT" "1" "April 11, 2011" "0.47" "libmemcached" +.TH "MEMSTAT" "1" "April 12, 2011" "0.47" "libmemcached" .SH NAME memstat \- libmemcached Documentation . diff --git a/docs/memcached_create.rst b/docs/memcached_create.rst index ce692855..18212b6e 100644 --- a/docs/memcached_create.rst +++ b/docs/memcached_create.rst @@ -5,6 +5,7 @@ Creating and destroying a memcached_st Create a memcached_st structure +.. index:: object: memcached_st -------- SYNOPSIS diff --git a/docs/memcached_pool.rst b/docs/memcached_pool.rst index 603419f5..8d8abdd4 100644 --- a/docs/memcached_pool.rst +++ b/docs/memcached_pool.rst @@ -2,6 +2,8 @@ Working with memcached pools ============================ +.. index:: object: memcached_pool_st + -------- SYNOPSIS -------- diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c index 3c327d7b..a1999d62 100644 --- a/libmemcached/memcached.c +++ b/libmemcached/memcached.c @@ -212,8 +212,13 @@ memcached_st *memcached_create(memcached_st *ptr) memcached_st *memcached_create_with_options(const char *string, size_t length) { - memcached_st *self= memcached_create(NULL); + if (! length || ! string) + { + errno= EINVAL; + return NULL; + } + memcached_st *self= memcached_create(NULL); if (! self) { errno= ENOMEM; @@ -227,7 +232,6 @@ memcached_st *memcached_create_with_options(const char *string, size_t length) { rc= memcached_parse_configure_file(self, memcached_parse_filename(self), memcached_parse_filename_length(self)); } - if (rc != MEMCACHED_SUCCESS) { diff --git a/libmemcached/options.cc b/libmemcached/options.cc index b404652e..55299559 100644 --- a/libmemcached/options.cc +++ b/libmemcached/options.cc @@ -35,9 +35,7 @@ * */ -#include "libmemcached/common.h" - -#include +#include #include @@ -90,6 +88,9 @@ memcached_return_t libmemcached_check_configuration(const char *option_string, s { memcached_st memc, *memc_ptr; + if (error_buffer_size) + error_buffer[0]= 0; + if (! (memc_ptr= memcached_create(&memc))) return MEMCACHED_MEMORY_ALLOCATION_FAILURE; @@ -119,7 +120,9 @@ memcached_return_t memcached_parse_configuration(memcached_st *self, char const { WATCHPOINT_ASSERT(self); if (! self) + { return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, NULL); + } memcached_return_t rc; Context context(option_string, length, self, rc); diff --git a/libmemcached/options/parser.cc b/libmemcached/options/parser.cc index dfa99f7a..91dfcd29 100644 --- a/libmemcached/options/parser.cc +++ b/libmemcached/options/parser.cc @@ -174,29 +174,31 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error) _TCP_KEEPIDLE = 298, _TCP_NODELAY = 299, NAMESPACE = 300, - MD5 = 301, - CRC = 302, - FNV1_64 = 303, - FNV1A_64 = 304, - FNV1_32 = 305, - FNV1A_32 = 306, - HSIEH = 307, - MURMUR = 308, - JENKINS = 309, - CONSISTENT = 310, - MODULA = 311, - RANDOM = 312, - TRUE = 313, - FALSE = 314, - FLOAT = 315, - NUMBER = 316, - PORT = 317, - WEIGHT_START = 318, - IPADDRESS = 319, - HOSTNAME = 320, - STRING = 321, - QUOTED_STRING = 322, - FILE_PATH = 323 + POOL_MIN = 301, + POOL_MAX = 302, + MD5 = 303, + CRC = 304, + FNV1_64 = 305, + FNV1A_64 = 306, + FNV1_32 = 307, + FNV1A_32 = 308, + HSIEH = 309, + MURMUR = 310, + JENKINS = 311, + CONSISTENT = 312, + MODULA = 313, + RANDOM = 314, + TRUE = 315, + FALSE = 316, + FLOAT = 317, + NUMBER = 318, + PORT = 319, + WEIGHT_START = 320, + IPADDRESS = 321, + HOSTNAME = 322, + STRING = 323, + QUOTED_STRING = 324, + FILE_PATH = 325 }; #endif @@ -213,7 +215,7 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error) /* Line 264 of yacc.c */ -#line 217 "libmemcached/options/parser.cc" +#line 219 "libmemcached/options/parser.cc" #ifdef short # undef short @@ -426,22 +428,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 65 +#define YYFINAL 69 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 71 +#define YYLAST 73 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 72 +#define YYNTOKENS 74 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 12 /* YYNRULES -- Number of rules. */ -#define YYNRULES 64 +#define YYNRULES 66 /* YYNRULES -- Number of states. */ -#define YYNSTATES 78 +#define YYNSTATES 82 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 323 +#define YYMAXUTOK 325 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -452,10 +454,10 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 71, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 60, 2, 2, 2, 2, 2, + 2, 2, 73, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 62, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 61, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 63, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -480,8 +482,8 @@ static const yytype_uint8 yytranslate[] = 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 62, 63, 64, 65, 66, - 67, 68, 69, 70 + 55, 56, 57, 58, 59, 60, 61, 64, 65, 66, + 67, 68, 69, 70, 71, 72 }; #if YYDEBUG @@ -490,44 +492,45 @@ static const yytype_uint8 yytranslate[] = static const yytype_uint8 yyprhs[] = { 0, 0, 3, 5, 9, 11, 13, 15, 17, 19, - 21, 23, 27, 32, 37, 40, 42, 45, 48, 53, - 56, 59, 61, 63, 65, 67, 69, 71, 73, 75, - 77, 79, 81, 83, 85, 87, 89, 91, 93, 95, - 97, 99, 101, 103, 105, 107, 109, 111, 112, 114, - 115, 117, 119, 121, 123, 125, 127, 129, 131, 133, - 135, 137, 139, 141, 143 + 21, 23, 27, 32, 37, 40, 43, 46, 48, 51, + 54, 59, 62, 65, 67, 69, 71, 73, 75, 77, + 79, 81, 83, 85, 87, 89, 91, 93, 95, 97, + 99, 101, 103, 105, 107, 109, 111, 113, 115, 117, + 118, 120, 121, 123, 125, 127, 129, 131, 133, 135, + 137, 139, 141, 143, 145, 147, 149 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 73, 0, -1, 74, -1, 73, 71, 74, -1, 75, + 75, 0, -1, 76, -1, 75, 73, 76, -1, 77, -1, 3, -1, 10, -1, 4, -1, 5, -1, 6, - -1, 7, -1, 8, 71, 82, -1, 11, 67, 79, - 80, -1, 11, 66, 79, 80, -1, 9, 82, -1, - 76, -1, 45, 82, -1, 19, 83, -1, 19, 83, - 60, 81, -1, 20, 81, -1, 77, 63, -1, 78, - -1, 39, -1, 32, -1, 18, -1, 24, -1, 22, - -1, 23, -1, 28, -1, 29, -1, 31, -1, 33, - -1, 34, -1, 35, -1, 36, -1, 16, -1, 17, - -1, 21, -1, 27, -1, 30, -1, 37, -1, 38, - -1, 44, -1, 42, -1, 43, -1, 40, -1, 41, - -1, -1, 64, -1, -1, 65, -1, 46, -1, 47, - -1, 48, -1, 49, -1, 50, -1, 51, -1, 52, - -1, 53, -1, 54, -1, 68, -1, 69, -1, 55, - -1, 56, -1, 57, -1 + -1, 7, -1, 8, 73, 84, -1, 11, 69, 81, + 82, -1, 11, 68, 81, 82, -1, 9, 84, -1, + 46, 65, -1, 47, 65, -1, 78, -1, 45, 84, + -1, 19, 85, -1, 19, 85, 62, 83, -1, 20, + 83, -1, 79, 65, -1, 80, -1, 39, -1, 32, + -1, 18, -1, 24, -1, 22, -1, 23, -1, 28, + -1, 29, -1, 31, -1, 33, -1, 34, -1, 35, + -1, 36, -1, 16, -1, 17, -1, 21, -1, 27, + -1, 30, -1, 37, -1, 38, -1, 44, -1, 42, + -1, 43, -1, 40, -1, 41, -1, -1, 66, -1, + -1, 67, -1, 48, -1, 49, -1, 50, -1, 51, + -1, 52, -1, 53, -1, 54, -1, 55, -1, 56, + -1, 70, -1, 71, -1, 57, -1, 58, -1, 59, + -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 153, 153, 154, 158, 160, 162, 164, 169, 174, - 178, 182, 193, 201, 209, 213, 217, 224, 231, 242, - 249, 256, 263, 269, 273, 277, 281, 285, 289, 293, - 297, 301, 305, 309, 313, 320, 324, 328, 332, 336, - 340, 344, 348, 352, 356, 360, 364, 371, 372, 377, - 378, 383, 387, 391, 395, 399, 403, 407, 411, 415, - 422, 426, 434, 438, 442 + 0, 157, 157, 158, 162, 164, 166, 168, 173, 178, + 182, 186, 197, 205, 213, 217, 221, 225, 229, 236, + 243, 254, 261, 268, 275, 281, 285, 289, 293, 297, + 301, 305, 309, 313, 317, 321, 325, 332, 336, 340, + 344, 348, 352, 356, 360, 364, 368, 372, 376, 383, + 384, 389, 390, 395, 399, 403, 407, 411, 415, 419, + 423, 427, 434, 438, 446, 450, 454 }; #endif @@ -546,13 +549,14 @@ static const char *const yytname[] = "RCV_TIMEOUT", "REMOVE_FAILED_SERVERS", "RETRY_TIMEOUT", "SND_TIMEOUT", "SOCKET_RECV_SIZE", "SOCKET_SEND_SIZE", "SORT_HOSTS", "SUPPORT_CAS", "USER_DATA", "USE_UDP", "VERIFY_KEY", "_TCP_KEEPALIVE", "_TCP_KEEPIDLE", - "_TCP_NODELAY", "NAMESPACE", "MD5", "CRC", "FNV1_64", "FNV1A_64", - "FNV1_32", "FNV1A_32", "HSIEH", "MURMUR", "JENKINS", "CONSISTENT", - "MODULA", "RANDOM", "TRUE", "FALSE", "','", "'='", "FLOAT", "NUMBER", - "PORT", "WEIGHT_START", "IPADDRESS", "HOSTNAME", "STRING", - "QUOTED_STRING", "FILE_PATH", "' '", "$accept", "begin", "statement", - "expression", "behaviors", "behavior_number", "behavior_boolean", - "optional_port", "optional_weight", "hash", "string", "distribution", 0 + "_TCP_NODELAY", "NAMESPACE", "POOL_MIN", "POOL_MAX", "MD5", "CRC", + "FNV1_64", "FNV1A_64", "FNV1_32", "FNV1A_32", "HSIEH", "MURMUR", + "JENKINS", "CONSISTENT", "MODULA", "RANDOM", "TRUE", "FALSE", "','", + "'='", "FLOAT", "NUMBER", "PORT", "WEIGHT_START", "IPADDRESS", + "HOSTNAME", "STRING", "QUOTED_STRING", "FILE_PATH", "' '", "$accept", + "begin", "statement", "expression", "behaviors", "behavior_number", + "behavior_boolean", "optional_port", "optional_weight", "hash", "string", + "distribution", 0 }; #endif @@ -567,33 +571,33 @@ static const yytype_uint16 yytoknum[] = 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 44, 61, 315, 316, 317, 318, 319, 320, 321, 322, - 323, 32 + 315, 316, 44, 61, 317, 318, 319, 320, 321, 322, + 323, 324, 325, 32 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 72, 73, 73, 74, 74, 74, 74, 74, 74, - 74, 74, 75, 75, 75, 75, 76, 76, 76, 76, - 76, 76, 76, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 79, 79, 80, - 80, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 82, 82, 83, 83, 83 + 0, 74, 75, 75, 76, 76, 76, 76, 76, 76, + 76, 76, 77, 77, 77, 77, 77, 77, 78, 78, + 78, 78, 78, 78, 78, 79, 79, 79, 79, 79, + 79, 79, 79, 79, 79, 79, 79, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 81, + 81, 82, 82, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 84, 84, 85, 85, 85 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 1, 3, 1, 1, 1, 1, 1, 1, - 1, 3, 4, 4, 2, 1, 2, 2, 4, 2, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 3, 4, 4, 2, 2, 2, 1, 2, 2, + 4, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -602,42 +606,44 @@ static const yytype_uint8 yyr2[] = static const yytype_uint8 yydefact[] = { 0, 5, 7, 8, 9, 10, 0, 0, 6, 0, - 35, 36, 24, 0, 0, 37, 26, 27, 25, 38, - 28, 29, 39, 30, 23, 31, 32, 33, 34, 40, - 41, 22, 45, 46, 43, 44, 42, 0, 0, 2, - 4, 15, 0, 21, 0, 60, 61, 14, 47, 47, - 62, 63, 64, 17, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 19, 16, 1, 0, 20, 11, 48, - 49, 49, 0, 3, 50, 13, 12, 18 + 37, 38, 26, 0, 0, 39, 28, 29, 27, 40, + 30, 31, 41, 32, 25, 33, 34, 35, 36, 42, + 43, 24, 47, 48, 45, 46, 44, 0, 0, 0, + 0, 2, 4, 17, 0, 23, 0, 62, 63, 14, + 49, 49, 64, 65, 66, 19, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 21, 18, 15, 16, 1, + 0, 22, 11, 50, 51, 51, 0, 3, 52, 13, + 12, 20 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 38, 39, 40, 41, 42, 43, 70, 75, 63, - 47, 53 + -1, 40, 41, 42, 43, 44, 45, 74, 79, 65, + 49, 55 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -59 +#define YYPACT_NINF -61 static const yytype_int8 yypact[] = { - -2, -59, -59, -59, -59, -59, -58, -13, -59, -43, - -59, -59, -59, -45, -1, -59, -59, -59, -59, -59, - -59, -59, -59, -59, -59, -59, -59, -59, -59, -59, - -59, -59, -59, -59, -59, -59, -59, -13, 0, -59, - -59, -59, -19, -59, -13, -59, -59, -59, -7, -7, - -59, -59, -59, 2, -59, -59, -59, -59, -59, -59, - -59, -59, -59, -59, -59, -59, -2, -59, -59, -59, - -6, -6, -1, -59, -59, -59, -59, -59 + -2, -61, -61, -61, -61, -61, -60, -23, -61, -45, + -61, -61, -61, -47, 8, -61, -61, -61, -61, -61, + -61, -61, -61, -61, -61, -61, -61, -61, -61, -61, + -61, -61, -61, -61, -61, -61, -61, -23, -16, -15, + 0, -61, -61, -61, -14, -61, -23, -61, -61, -61, + -13, -13, -61, -61, -61, -10, -61, -61, -61, -61, + -61, -61, -61, -61, -61, -61, -61, -61, -61, -61, + -2, -61, -61, -61, -1, -1, 8, -61, -61, -61, + -61, -61 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -59, -59, -8, -59, -59, -59, -59, 11, -5, -9, - 17, -59 + -61, -61, -5, -61, -61, -61, -61, 3, -8, -7, + 9, -61 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -647,26 +653,26 @@ static const yytype_int8 yypgoto[] = #define YYTABLE_NINF -1 static const yytype_uint8 yytable[] = { - 65, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 50, 51, 52, 44, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 48, 49, 19, 20, 21, 22, 23, + 69, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 52, 53, 54, 46, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 50, 51, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 67, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 64, 45, 46, 69, 73, 74, - 71, 68, 72, 77, 0, 0, 76, 0, 0, 0, - 0, 66 + 34, 35, 36, 37, 38, 39, 66, 47, 48, 67, + 68, 71, 76, 73, 75, 72, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 77, 78, 80, 0, 81, + 0, 0, 0, 70 }; static const yytype_int8 yycheck[] = { 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 55, 56, 57, 71, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 66, 67, 27, 28, 29, 30, 31, + 57, 58, 59, 73, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 68, 69, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 63, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 37, 68, 69, 64, 66, 65, - 49, 44, 60, 72, -1, -1, 71, -1, -1, -1, - -1, 71 + 42, 43, 44, 45, 46, 47, 37, 70, 71, 65, + 65, 65, 62, 66, 51, 46, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 70, 67, 75, -1, 76, + -1, -1, -1, 73 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -676,11 +682,12 @@ static const yytype_uint8 yystos[] = 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16, 17, 18, 19, 20, 21, 22, 23, 24, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 73, 74, - 75, 76, 77, 78, 71, 68, 69, 82, 66, 67, - 55, 56, 57, 83, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 81, 82, 0, 71, 63, 82, 64, - 79, 79, 60, 74, 65, 80, 80, 81 + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, + 75, 76, 77, 78, 79, 80, 73, 70, 71, 84, + 68, 69, 57, 58, 59, 85, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 83, 84, 65, 65, 0, + 73, 65, 84, 66, 81, 81, 62, 76, 67, 82, + 82, 83 }; #define yyerrok (yyerrstatus = 0) @@ -1515,28 +1522,28 @@ yyreduce: case 4: /* Line 1464 of yacc.c */ -#line 159 "libmemcached/options/parser.yy" +#line 163 "libmemcached/options/parser.yy" { ;} break; case 5: /* Line 1464 of yacc.c */ -#line 161 "libmemcached/options/parser.yy" +#line 165 "libmemcached/options/parser.yy" { ;} break; case 6: /* Line 1464 of yacc.c */ -#line 163 "libmemcached/options/parser.yy" +#line 167 "libmemcached/options/parser.yy" { ;} break; case 7: /* Line 1464 of yacc.c */ -#line 165 "libmemcached/options/parser.yy" +#line 169 "libmemcached/options/parser.yy" { context->set_end(); YYACCEPT; @@ -1546,7 +1553,7 @@ yyreduce: case 8: /* Line 1464 of yacc.c */ -#line 170 "libmemcached/options/parser.yy" +#line 174 "libmemcached/options/parser.yy" { context->rc= MEMCACHED_PARSE_USER_ERROR; parser_abort(context, NULL); @@ -1556,7 +1563,7 @@ yyreduce: case 9: /* Line 1464 of yacc.c */ -#line 175 "libmemcached/options/parser.yy" +#line 179 "libmemcached/options/parser.yy" { memcached_reset(context->memc); ;} @@ -1565,7 +1572,7 @@ yyreduce: case 10: /* Line 1464 of yacc.c */ -#line 179 "libmemcached/options/parser.yy" +#line 183 "libmemcached/options/parser.yy" { yydebug= 1; ;} @@ -1574,7 +1581,7 @@ yyreduce: case 11: /* Line 1464 of yacc.c */ -#line 183 "libmemcached/options/parser.yy" +#line 187 "libmemcached/options/parser.yy" { if ((context->rc= memcached_parse_configure_file(context->memc, (yyvsp[(3) - (3)].string).c_str, (yyvsp[(3) - (3)].string).length)) != MEMCACHED_SUCCESS) { @@ -1586,7 +1593,7 @@ yyreduce: case 12: /* Line 1464 of yacc.c */ -#line 194 "libmemcached/options/parser.yy" +#line 198 "libmemcached/options/parser.yy" { if ((context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(2) - (4)].server).port, (yyvsp[(2) - (4)].server).weight)) != MEMCACHED_SUCCESS) { @@ -1599,7 +1606,7 @@ yyreduce: case 13: /* Line 1464 of yacc.c */ -#line 202 "libmemcached/options/parser.yy" +#line 206 "libmemcached/options/parser.yy" { if ((context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(2) - (4)].server).port, (yyvsp[(2) - (4)].server).weight)) != MEMCACHED_SUCCESS) { @@ -1612,16 +1619,34 @@ yyreduce: case 14: /* Line 1464 of yacc.c */ -#line 210 "libmemcached/options/parser.yy" +#line 214 "libmemcached/options/parser.yy" { memcached_set_configuration_file(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).length); ;} break; - case 16: + case 15: /* Line 1464 of yacc.c */ #line 218 "libmemcached/options/parser.yy" + { + context->memc->configure.initial_pool_size= (yyvsp[(2) - (2)].number); + ;} + break; + + case 16: + +/* Line 1464 of yacc.c */ +#line 222 "libmemcached/options/parser.yy" + { + context->memc->configure.max_pool_size= (yyvsp[(2) - (2)].number); + ;} + break; + + case 18: + +/* Line 1464 of yacc.c */ +#line 230 "libmemcached/options/parser.yy" { if ((context->rc= memcached_set_prefix_key(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).length)) != MEMCACHED_SUCCESS) { @@ -1630,10 +1655,10 @@ yyreduce: ;} break; - case 17: + case 19: /* Line 1464 of yacc.c */ -#line 225 "libmemcached/options/parser.yy" +#line 237 "libmemcached/options/parser.yy" { if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (2)].distribution))) != MEMCACHED_SUCCESS) { @@ -1642,10 +1667,10 @@ yyreduce: ;} break; - case 18: + case 20: /* Line 1464 of yacc.c */ -#line 232 "libmemcached/options/parser.yy" +#line 244 "libmemcached/options/parser.yy" { if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (4)].distribution))) != MEMCACHED_SUCCESS) { @@ -1658,10 +1683,10 @@ yyreduce: ;} break; - case 19: + case 21: /* Line 1464 of yacc.c */ -#line 243 "libmemcached/options/parser.yy" +#line 255 "libmemcached/options/parser.yy" { if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_HASH, (yyvsp[(2) - (2)].hash))) != MEMCACHED_SUCCESS) { @@ -1670,10 +1695,10 @@ yyreduce: ;} break; - case 20: + case 22: /* Line 1464 of yacc.c */ -#line 250 "libmemcached/options/parser.yy" +#line 262 "libmemcached/options/parser.yy" { if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (2)].behavior), (yyvsp[(2) - (2)].number))) != MEMCACHED_SUCCESS) { @@ -1682,10 +1707,10 @@ yyreduce: ;} break; - case 21: + case 23: /* Line 1464 of yacc.c */ -#line 257 "libmemcached/options/parser.yy" +#line 269 "libmemcached/options/parser.yy" { if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (1)].behavior), true)) != MEMCACHED_SUCCESS) { @@ -1694,380 +1719,380 @@ yyreduce: ;} break; - case 22: + case 24: /* Line 1464 of yacc.c */ -#line 264 "libmemcached/options/parser.yy" +#line 276 "libmemcached/options/parser.yy" { ;} break; - case 23: + case 25: /* Line 1464 of yacc.c */ -#line 270 "libmemcached/options/parser.yy" +#line 282 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS; ;} break; - case 24: + case 26: /* Line 1464 of yacc.c */ -#line 274 "libmemcached/options/parser.yy" +#line 286 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT; ;} break; - case 25: + case 27: /* Line 1464 of yacc.c */ -#line 278 "libmemcached/options/parser.yy" +#line 290 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK; ;} break; - case 26: + case 28: /* Line 1464 of yacc.c */ -#line 282 "libmemcached/options/parser.yy" +#line 294 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK; ;} break; - case 27: + case 29: /* Line 1464 of yacc.c */ -#line 286 "libmemcached/options/parser.yy" +#line 298 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH; ;} break; - case 28: + case 30: /* Line 1464 of yacc.c */ -#line 290 "libmemcached/options/parser.yy" +#line 302 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS; ;} break; - case 29: + case 31: /* Line 1464 of yacc.c */ -#line 294 "libmemcached/options/parser.yy" +#line 306 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_POLL_TIMEOUT; ;} break; - case 30: + case 32: /* Line 1464 of yacc.c */ -#line 298 "libmemcached/options/parser.yy" +#line 310 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_RCV_TIMEOUT; ;} break; - case 31: + case 33: /* Line 1464 of yacc.c */ -#line 302 "libmemcached/options/parser.yy" +#line 314 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT; ;} break; - case 32: + case 34: /* Line 1464 of yacc.c */ -#line 306 "libmemcached/options/parser.yy" +#line 318 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SND_TIMEOUT; ;} break; - case 33: + case 35: /* Line 1464 of yacc.c */ -#line 310 "libmemcached/options/parser.yy" +#line 322 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE; ;} break; - case 34: + case 36: /* Line 1464 of yacc.c */ -#line 314 "libmemcached/options/parser.yy" +#line 326 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE; ;} break; - case 35: + case 37: /* Line 1464 of yacc.c */ -#line 321 "libmemcached/options/parser.yy" +#line 333 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL; ;} break; - case 36: + case 38: /* Line 1464 of yacc.c */ -#line 325 "libmemcached/options/parser.yy" +#line 337 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS; ;} break; - case 37: + case 39: /* Line 1464 of yacc.c */ -#line 329 "libmemcached/options/parser.yy" +#line 341 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY; ;} break; - case 38: + case 40: /* Line 1464 of yacc.c */ -#line 333 "libmemcached/options/parser.yy" +#line 345 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_NOREPLY; ;} break; - case 39: + case 41: /* Line 1464 of yacc.c */ -#line 337 "libmemcached/options/parser.yy" +#line 349 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ; ;} break; - case 40: + case 42: /* Line 1464 of yacc.c */ -#line 341 "libmemcached/options/parser.yy" +#line 353 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SORT_HOSTS; ;} break; - case 41: + case 43: /* Line 1464 of yacc.c */ -#line 345 "libmemcached/options/parser.yy" +#line 357 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SUPPORT_CAS; ;} break; - case 42: + case 44: /* Line 1464 of yacc.c */ -#line 349 "libmemcached/options/parser.yy" +#line 361 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_NODELAY; ;} break; - case 43: + case 45: /* Line 1464 of yacc.c */ -#line 353 "libmemcached/options/parser.yy" +#line 365 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPALIVE; ;} break; - case 44: + case 46: /* Line 1464 of yacc.c */ -#line 357 "libmemcached/options/parser.yy" +#line 369 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPIDLE; ;} break; - case 45: + case 47: /* Line 1464 of yacc.c */ -#line 361 "libmemcached/options/parser.yy" +#line 373 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_USE_UDP; ;} break; - case 46: + case 48: /* Line 1464 of yacc.c */ -#line 365 "libmemcached/options/parser.yy" +#line 377 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_VERIFY_KEY; ;} break; - case 47: + case 49: /* Line 1464 of yacc.c */ -#line 371 "libmemcached/options/parser.yy" +#line 383 "libmemcached/options/parser.yy" { ;} break; - case 48: + case 50: /* Line 1464 of yacc.c */ -#line 373 "libmemcached/options/parser.yy" +#line 385 "libmemcached/options/parser.yy" { ;} break; - case 49: + case 51: /* Line 1464 of yacc.c */ -#line 377 "libmemcached/options/parser.yy" +#line 389 "libmemcached/options/parser.yy" { ;} break; - case 50: + case 52: /* Line 1464 of yacc.c */ -#line 379 "libmemcached/options/parser.yy" +#line 391 "libmemcached/options/parser.yy" { ;} break; - case 51: + case 53: /* Line 1464 of yacc.c */ -#line 384 "libmemcached/options/parser.yy" +#line 396 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_MD5; ;} break; - case 52: + case 54: /* Line 1464 of yacc.c */ -#line 388 "libmemcached/options/parser.yy" +#line 400 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_CRC; ;} break; - case 53: + case 55: /* Line 1464 of yacc.c */ -#line 392 "libmemcached/options/parser.yy" +#line 404 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1_64; ;} break; - case 54: + case 56: /* Line 1464 of yacc.c */ -#line 396 "libmemcached/options/parser.yy" +#line 408 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1A_64; ;} break; - case 55: + case 57: /* Line 1464 of yacc.c */ -#line 400 "libmemcached/options/parser.yy" +#line 412 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1_32; ;} break; - case 56: + case 58: /* Line 1464 of yacc.c */ -#line 404 "libmemcached/options/parser.yy" +#line 416 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1A_32; ;} break; - case 57: + case 59: /* Line 1464 of yacc.c */ -#line 408 "libmemcached/options/parser.yy" +#line 420 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_HSIEH; ;} break; - case 58: + case 60: /* Line 1464 of yacc.c */ -#line 412 "libmemcached/options/parser.yy" +#line 424 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_MURMUR; ;} break; - case 59: + case 61: /* Line 1464 of yacc.c */ -#line 416 "libmemcached/options/parser.yy" +#line 428 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_JENKINS; ;} break; - case 60: + case 62: /* Line 1464 of yacc.c */ -#line 423 "libmemcached/options/parser.yy" +#line 435 "libmemcached/options/parser.yy" { (yyval.string)= (yyvsp[(1) - (1)].string); ;} break; - case 61: + case 63: /* Line 1464 of yacc.c */ -#line 427 "libmemcached/options/parser.yy" +#line 439 "libmemcached/options/parser.yy" { (yyval.string).c_str= (yyvsp[(1) - (1)].string).c_str +1; // +1 to move use passed the initial quote (yyval.string).length= (yyvsp[(1) - (1)].string).length -1; // -1 removes the end quote ;} break; - case 62: + case 64: /* Line 1464 of yacc.c */ -#line 435 "libmemcached/options/parser.yy" +#line 447 "libmemcached/options/parser.yy" { (yyval.distribution)= MEMCACHED_DISTRIBUTION_CONSISTENT; ;} break; - case 63: + case 65: /* Line 1464 of yacc.c */ -#line 439 "libmemcached/options/parser.yy" +#line 451 "libmemcached/options/parser.yy" { (yyval.distribution)= MEMCACHED_DISTRIBUTION_MODULA; ;} break; - case 64: + case 66: /* Line 1464 of yacc.c */ -#line 443 "libmemcached/options/parser.yy" +#line 455 "libmemcached/options/parser.yy" { (yyval.distribution)= MEMCACHED_DISTRIBUTION_RANDOM; ;} @@ -2076,7 +2101,7 @@ yyreduce: /* Line 1464 of yacc.c */ -#line 2080 "libmemcached/options/parser.cc" +#line 2105 "libmemcached/options/parser.cc" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2288,7 +2313,7 @@ yyreturn: /* Line 1684 of yacc.c */ -#line 448 "libmemcached/options/parser.yy" +#line 460 "libmemcached/options/parser.yy" void Context::start() diff --git a/libmemcached/options/parser.h b/libmemcached/options/parser.h index 73d70401..1f305e5c 100644 --- a/libmemcached/options/parser.h +++ b/libmemcached/options/parser.h @@ -81,29 +81,31 @@ _TCP_KEEPIDLE = 298, _TCP_NODELAY = 299, NAMESPACE = 300, - MD5 = 301, - CRC = 302, - FNV1_64 = 303, - FNV1A_64 = 304, - FNV1_32 = 305, - FNV1A_32 = 306, - HSIEH = 307, - MURMUR = 308, - JENKINS = 309, - CONSISTENT = 310, - MODULA = 311, - RANDOM = 312, - TRUE = 313, - FALSE = 314, - FLOAT = 315, - NUMBER = 316, - PORT = 317, - WEIGHT_START = 318, - IPADDRESS = 319, - HOSTNAME = 320, - STRING = 321, - QUOTED_STRING = 322, - FILE_PATH = 323 + POOL_MIN = 301, + POOL_MAX = 302, + MD5 = 303, + CRC = 304, + FNV1_64 = 305, + FNV1A_64 = 306, + FNV1_32 = 307, + FNV1A_32 = 308, + HSIEH = 309, + MURMUR = 310, + JENKINS = 311, + CONSISTENT = 312, + MODULA = 313, + RANDOM = 314, + TRUE = 315, + FALSE = 316, + FLOAT = 317, + NUMBER = 318, + PORT = 319, + WEIGHT_START = 320, + IPADDRESS = 321, + HOSTNAME = 322, + STRING = 323, + QUOTED_STRING = 324, + FILE_PATH = 325 }; #endif diff --git a/libmemcached/options/parser.yy b/libmemcached/options/parser.yy index 0f0aee65..02679883 100644 --- a/libmemcached/options/parser.yy +++ b/libmemcached/options/parser.yy @@ -108,6 +108,10 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error) /* Callbacks */ %token NAMESPACE +/* Pool */ +%token POOL_MIN +%token POOL_MAX + /* Hash types */ %token MD5 %token CRC @@ -210,6 +214,14 @@ expression: { memcached_set_configuration_file(context->memc, $2.c_str, $2.length); } + | POOL_MIN NUMBER + { + context->memc->configure.initial_pool_size= $2; + } + | POOL_MAX NUMBER + { + context->memc->configure.max_pool_size= $2; + } | behaviors ; diff --git a/libmemcached/options/scanner.cc b/libmemcached/options/scanner.cc index 894662ec..b6143087 100644 --- a/libmemcached/options/scanner.cc +++ b/libmemcached/options/scanner.cc @@ -449,8 +449,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); yyg->yy_c_buf_p = yy_cp; /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ -#define YY_NUM_RULES 87 -#define YY_END_OF_BUFFER 88 +#define YY_NUM_RULES 64 +#define YY_END_OF_BUFFER 65 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -458,89 +458,65 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[739] = +static yyconst flex_int16_t yy_accept[514] = { 0, - 0, 0, 88, 86, 5, 5, 1, 86, 86, 86, - 2, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 0, 85, 70, 0, 0, + 0, 0, 65, 63, 5, 5, 1, 63, 63, 63, + 2, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 0, 62, 47, 0, 0, 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 6, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 4, 84, 84, 2, 3, - 84, 75, 84, 66, 84, 84, 84, 84, 84, 84, - 74, 84, 84, 84, 84, 84, 84, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - - 70, 70, 70, 70, 70, 70, 70, 4, 0, 84, - 2, 3, 84, 84, 84, 84, 84, 84, 84, 84, - 84, 84, 84, 84, 84, 68, 70, 70, 70, 70, - 70, 0, 0, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 4, - 84, 84, 3, 84, 64, 67, 69, 84, 0, 80, - 84, 84, 84, 84, 84, 63, 84, 70, 70, 70, - 70, 70, 70, 0, 0, 0, 0, 0, 0, 70, - 70, 70, 70, 70, 0, 0, 70, 70, 70, 0, - 0, 70, 70, 70, 0, 0, 0, 70, 0, 70, - - 4, 0, 84, 3, 84, 0, 84, 84, 84, 84, - 72, 81, 73, 84, 70, 70, 70, 70, 70, 0, - 19, 0, 0, 0, 0, 0, 0, 0, 70, 70, - 70, 0, 0, 70, 0, 0, 70, 70, 70, 0, - 0, 70, 0, 0, 70, 0, 0, 0, 0, 0, - 0, 0, 0, 70, 4, 83, 84, 84, 84, 84, - 78, 76, 62, 82, 65, 70, 70, 70, 70, 70, - 0, 0, 0, 0, 0, 0, 0, 0, 70, 70, - 70, 0, 0, 70, 0, 0, 70, 0, 0, 70, - 0, 0, 70, 0, 0, 70, 0, 0, 0, 0, - - 0, 0, 0, 0, 70, 83, 84, 79, 77, 0, - 0, 0, 0, 70, 70, 70, 0, 0, 0, 0, - 0, 0, 0, 0, 70, 28, 0, 0, 0, 0, - 70, 0, 0, 0, 0, 0, 0, 7, 0, 0, - 0, 0, 0, 0, 70, 0, 0, 0, 0, 60, - 0, 0, 59, 0, 0, 83, 84, 0, 0, 0, - 0, 70, 0, 0, 70, 0, 0, 0, 0, 0, - 0, 0, 0, 70, 0, 0, 0, 0, 70, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 71, 0, 0, 0, 0, 70, 0, - 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, - 70, 0, 0, 0, 0, 70, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 58, 57, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 70, 0, 0, 0, 0, 0, 0, 0, 0, 61, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 48, 47, - 0, 0, 0, 0, 0, 0, 0, 0, 9, 8, + 0, 6, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 4, 61, 61, 2, 3, + 61, 52, 61, 43, 61, 61, 61, 61, 61, 61, + 51, 61, 61, 61, 61, 61, 61, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + + 47, 47, 47, 47, 47, 47, 47, 4, 0, 61, + 2, 3, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 45, 47, 47, 47, 47, + 47, 0, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 4, + 61, 61, 3, 61, 41, 44, 46, 61, 0, 57, + 61, 61, 61, 61, 61, 40, 61, 47, 47, 47, + 47, 47, 47, 0, 0, 0, 47, 47, 47, 47, + 47, 47, 0, 47, 47, 47, 0, 47, 47, 47, + 0, 0, 47, 47, 4, 0, 61, 3, 61, 0, + + 61, 61, 61, 61, 49, 58, 50, 61, 47, 47, + 47, 47, 47, 0, 14, 0, 0, 0, 47, 47, + 47, 0, 0, 47, 0, 47, 47, 47, 0, 47, + 0, 47, 0, 0, 0, 0, 47, 4, 60, 61, + 61, 61, 61, 55, 53, 39, 59, 42, 47, 47, + 47, 47, 47, 0, 0, 0, 0, 47, 47, 47, + 0, 0, 47, 0, 47, 0, 47, 0, 47, 0, + 47, 0, 0, 0, 0, 47, 60, 61, 56, 54, + 0, 0, 47, 47, 47, 0, 0, 0, 0, 47, + 18, 0, 0, 0, 0, 47, 0, 0, 0, 7, + + 0, 0, 0, 47, 0, 0, 33, 0, 0, 60, + 61, 0, 0, 47, 0, 47, 0, 0, 0, 0, + 47, 0, 0, 0, 0, 47, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, + 0, 47, 0, 47, 0, 0, 0, 0, 47, 0, + 0, 37, 36, 47, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 34, 0, 0, 0, 0, + 0, 47, 0, 0, 0, 0, 38, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, + 0, 35, 0, 0, 0, 0, 47, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 70, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 50, 49, 0, 0, 52, - 0, 0, 51, 0, 0, 0, 0, 0, 0, 0, - 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 36, 35, 0, 0, - 0, 0, 40, 39, 0, 0, 0, 0, 0, 56, - 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, - 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 32, 31, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 54, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 38, 37, 0, - 0, 0, 0, 11, 10, 13, 12, 15, 14, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, - 16, 0, 0, 0, 25, 0, 0, 24, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 27, 0, 26, 0, 0, 0, 0, 0, - - 0, 44, 46, 43, 45, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 21, 20, 23, 22, 30, - 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 34, 33, 42, 41, 0 + 29, 0, 0, 32, 0, 0, 0, 0, 47, 0, + 0, 0, 0, 0, 0, 0, 22, 0, 0, 25, + 0, 0, 0, 31, 0, 0, 0, 0, 12, 0, + 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, + 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 24, 0, 0, 8, 9, 10, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, + 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, + 17, 0, 0, 0, 26, 27, 0, 0, 0, 0, + + 0, 13, 15, 19, 0, 0, 0, 0, 0, 0, + 21, 23, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -557,8 +533,8 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 47, 1, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 70, 44, - 71, 72, 1, 1, 1, 1, 1, 1, 1, 1, + 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -575,7 +551,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[73] = +static yyconst flex_int32_t yy_meta[74] = { 0, 1, 1, 2, 1, 3, 1, 1, 3, 3, 1, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, @@ -584,182 +560,132 @@ static yyconst flex_int32_t yy_meta[73] = 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3 + 3, 3, 3 } ; -static yyconst flex_int16_t yy_base[743] = +static yyconst flex_int16_t yy_base[518] = { 0, - 0, 825, 827, 2013, 2013, 2013, 2013, 794, 772, 745, - 64, 71, 0, 54, 49, 56, 70, 54, 61, 71, - 73, 77, 74, 62, 740, 728, 717, 131, 193, 102, - 206, 249, 213, 233, 226, 228, 235, 243, 263, 279, - 284, 292, 294, 309, 311, 325, 341, 352, 359, 368, - 715, 2013, 415, 303, 68, 76, 85, 74, 345, 77, - 360, 400, 90, 112, 187, 415, 395, 480, 523, 487, - 411, 464, 500, 505, 507, 512, 514, 540, 548, 555, - 567, 574, 576, 588, 619, 596, 621, 213, 230, 244, - 240, 246, 208, 276, 273, 291, 295, 309, 305, 354, - - 314, 341, 346, 342, 359, 408, 402, 636, 669, 712, - 755, 643, 632, 684, 667, 690, 692, 745, 736, 701, - 747, 773, 699, 779, 788, 781, 426, 422, 564, 419, - 435, 776, 790, 454, 519, 524, 518, 538, 290, 532, - 553, 564, 623, 632, 624, 631, 688, 711, 718, 840, - 853, 824, 861, 874, 876, 881, 883, 888, 890, 897, - 903, 909, 911, 917, 933, 940, 952, 753, 770, 774, - 785, 773, 797, 462, 790, 821, 484, 884, 885, 907, - 911, 927, 704, 927, 925, 927, 926, 529, 944, 931, - 935, 951, 728, 942, 947, 952, 943, 754, 944, 962, - - 1007, 1020, 1063, 2013, 1041, 992, 1035, 1046, 1048, 1055, - 1057, 1078, 1098, 1104, 563, 976, 1015, 1035, 1041, 1041, - 2013, 1046, 1050, 574, 1064, 1052, 772, 1069, 1063, 1069, - 1067, 1074, 1075, 1087, 1093, 1098, 1104, 777, 1092, 1102, - 1104, 1094, 1107, 1108, 1099, 1113, 1104, 1115, 1109, 1122, - 1124, 1126, 1128, 858, 2013, 1175, 1173, 1188, 1190, 1196, - 1201, 1207, 1209, 1216, 1218, 800, 886, 1161, 1167, 1197, - 1199, 1201, 1206, 695, 694, 1207, 640, 622, 1212, 981, - 983, 1210, 1212, 1213, 1211, 1212, 1051, 1207, 1209, 643, - 1217, 1218, 1147, 1217, 1218, 1221, 1237, 1240, 1242, 1246, - - 1237, 1254, 1260, 1246, 1161, 1305, 1278, 1287, 1296, 1248, - 1263, 1265, 1268, 1277, 1277, 1282, 1287, 1288, 1290, 1295, - 1289, 1296, 1300, 1294, 1315, 0, 1305, 1306, 1311, 1312, - 1113, 1321, 1322, 1322, 1323, 1322, 1324, 2013, 1332, 1335, - 1331, 1343, 1322, 1327, 1369, 1343, 1358, 1349, 1361, 2013, - 1350, 1351, 2013, 1361, 1363, 1390, 1395, 1363, 1364, 1380, - 1382, 1386, 1374, 1380, 1382, 1395, 1396, 624, 1387, 1405, - 575, 1389, 1409, 1406, 1407, 1410, 1414, 1415, 1418, 1409, - 1410, 1425, 1427, 1422, 1423, 1424, 1426, 1439, 1440, 1443, - 1444, 1434, 1436, 1454, 1455, 1458, 1448, 1460, 1452, 1464, - - 1469, 1468, 1469, 1510, 1462, 1463, 1462, 1463, 1494, 1480, - 1481, 1484, 612, 569, 1479, 1498, 1488, 1486, 1506, 1492, - 592, 602, 556, 1498, 1499, 1522, 1494, 1497, 1510, 1514, - 1519, 1520, 1505, 1506, 1525, 1517, 1529, 1519, 1515, 1524, - 1543, 1546, 1536, 1552, 1556, 1550, 1559, 1563, 2013, 2013, - 1129, 1344, 1545, 1546, 1546, 1547, 1563, 1566, 1560, 1563, - 1562, 1564, 1565, 1579, 1575, 1577, 1584, 1580, 1582, 2013, - 1570, 1579, 1577, 1580, 1584, 1592, 1591, 1596, 1605, 1606, - 1604, 1605, 1601, 1602, 1601, 1622, 1605, 1626, 2013, 2013, - 1612, 1613, 1624, 1622, 1611, 1630, 1628, 1617, 2013, 2013, - - 1636, 1637, 1650, 1651, 1654, 1655, 1660, 1664, 1656, 1670, - 1671, 1653, 1669, 1657, 1656, 1672, 1662, 1676, 1679, 1665, - 1666, 1682, 1683, 580, 569, 1684, 1688, 1673, 1674, 547, - 539, 535, 522, 478, 477, 2013, 2013, 1683, 1701, 2013, - 1687, 1705, 2013, 1714, 1715, 1700, 1704, 1712, 1713, 1711, - 1712, 499, 1715, 1716, 1725, 1711, 1721, 1730, 1718, 1726, - 1724, 1725, 468, 427, 1726, 1727, 2013, 2013, 1743, 1744, - 1729, 1739, 2013, 2013, 1741, 1744, 1745, 1752, 1767, 2013, - 1768, 2013, 1762, 1763, 1759, 1760, 1776, 1777, 1762, 1763, - 2013, 1780, 1783, 1771, 1789, 1792, 1776, 1792, 1795, 1785, - - 1789, 2013, 2013, 1790, 1791, 437, 376, 398, 382, 1804, - 1805, 1808, 1809, 2013, 2013, 1813, 1814, 1808, 1812, 379, - 370, 1812, 1813, 1815, 1816, 1823, 1829, 1820, 1826, 1834, - 1825, 1837, 1838, 1839, 1840, 1831, 1832, 2013, 2013, 1829, - 1830, 1831, 1841, 2013, 2013, 2013, 2013, 2013, 2013, 363, - 334, 1852, 1855, 1871, 326, 1868, 1879, 310, 1873, 1882, - 1883, 1884, 1885, 1884, 1885, 1886, 1887, 1889, 1891, 2013, - 2013, 1896, 1899, 1883, 2013, 304, 1884, 2013, 288, 1902, - 1903, 1904, 1907, 1891, 1892, 285, 272, 251, 250, 1917, - 1919, 1914, 2013, 1915, 2013, 1914, 1915, 238, 198, 1916, - - 1917, 2013, 2013, 2013, 2013, 1935, 1936, 213, 194, 131, - 119, 1924, 1925, 1939, 1940, 2013, 2013, 2013, 2013, 2013, - 2013, 1941, 1943, 1932, 1933, 1953, 1954, 1937, 1938, 1954, - 1955, 118, 115, 2013, 2013, 2013, 2013, 2013, 2006, 125, - 2009, 112 + 0, 641, 636, 1648, 1648, 1648, 1648, 629, 625, 604, + 65, 72, 0, 55, 50, 57, 71, 55, 62, 72, + 74, 78, 75, 63, 619, 616, 613, 132, 195, 103, + 208, 251, 215, 235, 228, 230, 237, 245, 265, 281, + 286, 294, 296, 311, 313, 327, 343, 354, 361, 370, + 610, 1648, 417, 305, 69, 77, 86, 75, 347, 78, + 362, 402, 91, 113, 189, 417, 397, 482, 525, 489, + 413, 466, 502, 507, 509, 514, 516, 542, 550, 557, + 569, 576, 578, 590, 621, 598, 623, 215, 232, 246, + 242, 248, 604, 278, 275, 293, 354, 295, 303, 402, + + 311, 330, 427, 331, 335, 355, 358, 638, 671, 714, + 757, 645, 634, 686, 669, 692, 694, 747, 738, 703, + 749, 775, 701, 781, 790, 783, 376, 423, 566, 421, + 453, 778, 521, 523, 530, 532, 537, 569, 602, 573, + 627, 624, 597, 638, 631, 688, 594, 759, 708, 838, + 851, 824, 861, 874, 876, 881, 883, 888, 894, 896, + 901, 910, 928, 942, 937, 951, 953, 711, 735, 749, + 768, 769, 501, 767, 788, 775, 778, 782, 794, 593, + 582, 796, 840, 845, 850, 875, 872, 901, 568, 903, + 932, 913, 560, 929, 997, 1014, 1057, 1648, 996, 969, + + 959, 987, 1012, 1036, 1030, 1041, 1043, 1048, 943, 995, + 1013, 1031, 1026, 1015, 1648, 1036, 1033, 1052, 1044, 1052, + 1048, 1049, 1058, 1059, 1064, 1069, 552, 1058, 1068, 1058, + 1071, 1062, 1076, 1073, 1085, 1086, 1067, 1648, 1135, 1124, + 1133, 1148, 1154, 1159, 1165, 1167, 1178, 1183, 549, 537, + 1113, 1126, 1155, 1149, 1159, 527, 524, 1168, 1145, 523, + 1165, 1178, 1167, 1164, 519, 1160, 507, 1169, 481, 1173, + 1169, 1185, 1189, 1179, 1197, 440, 1241, 1239, 1223, 1254, + 1197, 1200, 1201, 439, 1200, 1211, 1225, 1231, 1226, 1248, + 0, 1237, 1242, 1232, 1243, 1233, 1255, 1255, 1253, 1648, + + 1258, 1246, 1248, 417, 1253, 1265, 1648, 1252, 1262, 1313, + 1318, 1259, 1280, 1288, 1275, 1285, 1300, 411, 1291, 1309, + 1309, 1309, 1311, 384, 381, 1312, 1304, 1320, 1310, 1309, + 1320, 1321, 1307, 1325, 1330, 1317, 1329, 1328, 1374, 1319, + 1330, 383, 1340, 1355, 376, 1344, 1363, 1349, 336, 339, + 1355, 1648, 1648, 331, 1350, 1363, 1368, 1354, 1374, 1364, + 1360, 1379, 1369, 1378, 1382, 1648, 1359, 1365, 1365, 1381, + 1375, 1374, 1376, 1391, 1387, 1398, 1648, 1400, 1400, 1404, + 1403, 1412, 1410, 1406, 1405, 1424, 1648, 1410, 1422, 1420, + 1408, 1648, 1419, 1430, 1427, 1432, 1424, 1438, 1420, 1436, + + 1424, 1438, 1424, 1441, 312, 1442, 1436, 306, 301, 298, + 1648, 1450, 1470, 1648, 1473, 1458, 1466, 1464, 281, 1467, + 1476, 1462, 1470, 1469, 274, 1470, 1648, 1483, 1468, 1648, + 1470, 1471, 1486, 1648, 1477, 1473, 1489, 1474, 1648, 1491, + 1479, 1495, 1499, 1489, 1648, 1499, 264, 252, 1517, 1520, + 1648, 1518, 1512, 238, 1512, 1514, 1521, 1527, 1518, 1528, + 1530, 1521, 1648, 1515, 1516, 1648, 1648, 1648, 229, 1527, + 1543, 228, 1534, 1543, 1544, 1543, 1544, 1545, 1648, 1550, + 1534, 1648, 215, 1553, 1554, 1547, 199, 196, 1577, 1572, + 1648, 1565, 143, 1563, 1648, 1648, 1581, 120, 119, 1569, + + 1583, 1648, 1648, 1648, 1584, 1572, 1590, 1574, 1590, 116, + 1648, 1648, 1648, 1641, 126, 1644, 113 } ; -static yyconst flex_int16_t yy_def[743] = +static yyconst flex_int16_t yy_def[518] = { 0, - 738, 1, 738, 738, 738, 738, 738, 739, 738, 738, - 740, 738, 740, 740, 740, 740, 740, 740, 740, 740, - 740, 740, 740, 740, 741, 739, 739, 738, 738, 742, - 742, 742, 738, 742, 742, 742, 742, 742, 742, 742, - 742, 742, 742, 742, 742, 742, 742, 742, 742, 742, - 741, 738, 28, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 738, 742, 742, 742, 738, - 742, 742, 742, 742, 742, 742, 742, 742, 742, 742, - 742, 742, 742, 742, 742, 742, 742, 53, 53, 53, + 513, 1, 513, 513, 513, 513, 513, 514, 513, 513, + 515, 513, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 516, 514, 514, 513, 513, 517, + 517, 517, 513, 517, 517, 517, 517, 517, 517, 517, + 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, + 516, 513, 28, 53, 53, 53, 53, 53, 53, 53, + 53, 53, 53, 53, 53, 513, 517, 517, 517, 513, + 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, + 517, 517, 517, 517, 517, 517, 517, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 53, 53, 738, 742, 742, - 742, 738, 742, 742, 742, 742, 742, 742, 742, 742, - 742, 742, 742, 742, 742, 742, 53, 53, 53, 53, - 53, 738, 738, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 53, 53, 53, 53, 738, - 742, 742, 738, 742, 742, 742, 742, 742, 742, 742, - 742, 742, 742, 742, 742, 742, 742, 53, 53, 53, - 53, 53, 53, 738, 738, 738, 738, 738, 738, 53, - 53, 53, 53, 53, 738, 738, 53, 53, 53, 738, - 738, 53, 53, 53, 738, 738, 738, 53, 738, 53, - - 738, 742, 742, 738, 742, 742, 742, 742, 742, 742, - 742, 742, 742, 742, 53, 53, 53, 53, 53, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 53, 53, - 53, 738, 738, 53, 738, 738, 53, 53, 53, 738, - 738, 53, 738, 738, 53, 738, 738, 738, 738, 738, - 738, 738, 738, 53, 738, 742, 742, 742, 742, 742, - 742, 742, 742, 742, 742, 53, 53, 53, 53, 53, - 738, 738, 738, 738, 738, 738, 738, 738, 53, 53, - 53, 738, 738, 53, 738, 738, 53, 738, 738, 53, - 738, 738, 53, 738, 738, 53, 738, 738, 738, 738, - - 738, 738, 738, 738, 53, 742, 742, 742, 742, 738, - 738, 738, 738, 53, 53, 53, 738, 738, 738, 738, - 738, 738, 738, 738, 53, 53, 738, 738, 738, 738, - 53, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 53, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 742, 742, 738, 738, 738, - 738, 53, 738, 738, 53, 738, 738, 738, 738, 738, - 738, 738, 738, 53, 738, 738, 738, 738, 53, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - - 738, 738, 738, 742, 738, 738, 738, 738, 53, 738, - 738, 53, 738, 738, 738, 738, 738, 738, 738, 738, - 53, 738, 738, 738, 738, 53, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 53, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - - 738, 738, 738, 738, 738, 738, 738, 738, 53, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 53, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 0, 738, 738, - 738, 738 + 53, 53, 53, 53, 53, 53, 53, 513, 517, 517, + 517, 513, 517, 517, 517, 517, 517, 517, 517, 517, + 517, 517, 517, 517, 517, 517, 53, 53, 53, 53, + 53, 513, 53, 53, 53, 53, 53, 53, 53, 53, + 53, 53, 53, 53, 53, 53, 53, 53, 53, 513, + 517, 517, 513, 517, 517, 517, 517, 517, 517, 517, + 517, 517, 517, 517, 517, 517, 517, 53, 53, 53, + 53, 53, 53, 513, 513, 513, 53, 53, 53, 53, + 53, 53, 513, 53, 53, 53, 513, 53, 53, 53, + 513, 513, 53, 53, 513, 517, 517, 513, 517, 517, + + 517, 517, 517, 517, 517, 517, 517, 517, 53, 53, + 53, 53, 53, 513, 513, 513, 513, 513, 53, 53, + 53, 513, 513, 53, 513, 53, 53, 53, 513, 53, + 513, 53, 513, 513, 513, 513, 53, 513, 517, 517, + 517, 517, 517, 517, 517, 517, 517, 517, 53, 53, + 53, 53, 53, 513, 513, 513, 513, 53, 53, 53, + 513, 513, 53, 513, 53, 513, 53, 513, 53, 513, + 53, 513, 513, 513, 513, 53, 517, 517, 517, 517, + 513, 513, 53, 53, 53, 513, 513, 513, 513, 53, + 53, 513, 513, 513, 513, 53, 513, 513, 513, 513, + + 513, 513, 513, 53, 513, 513, 513, 513, 513, 517, + 517, 513, 513, 53, 513, 53, 513, 513, 513, 513, + 53, 513, 513, 513, 513, 53, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 517, 513, + 513, 53, 513, 53, 513, 513, 513, 513, 53, 513, + 513, 513, 513, 53, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 53, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 53, 513, 513, 513, + + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 53, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 0, 513, 513, 513, 513 } ; -static yyconst flex_int16_t yy_nxt[2086] = +static yyconst flex_int16_t yy_nxt[1722] = { 0, 4, 5, 6, 7, 8, 4, 7, 9, 4, 10, 11, 11, 11, 11, 11, 11, 11, 12, 7, 4, @@ -768,231 +694,192 @@ static yyconst flex_int16_t yy_nxt[2086] = 13, 13, 13, 13, 13, 13, 4, 13, 13, 14, 15, 16, 17, 13, 18, 19, 20, 13, 13, 21, 13, 13, 13, 13, 22, 23, 24, 13, 13, 13, - 13, 13, 31, 36, 32, 32, 32, 32, 32, 32, - 32, 33, 33, 33, 33, 33, 33, 33, 34, 37, - 39, 35, 41, 38, 42, 43, 44, 47, 49, 50, - - 36, 48, 90, 40, 91, 92, 30, 45, 93, 30, - 30, 97, 105, 46, 67, 34, 37, 39, 35, 41, - 38, 42, 43, 44, 47, 49, 50, 30, 48, 90, - 40, 91, 92, 737, 45, 93, 736, 721, 97, 105, - 46, 53, 53, 53, 53, 53, 53, 53, 30, 720, - 106, 53, 54, 55, 56, 53, 53, 53, 57, 58, - 53, 53, 53, 53, 59, 53, 60, 53, 61, 62, - 63, 64, 65, 53, 53, 53, 53, 106, 53, 54, - 55, 56, 53, 53, 53, 57, 58, 53, 53, 53, - 53, 59, 53, 60, 53, 61, 62, 63, 64, 65, - - 53, 53, 53, 66, 66, 66, 66, 66, 66, 66, - 30, 107, 719, 30, 30, 132, 68, 68, 68, 68, - 68, 68, 68, 70, 70, 70, 70, 70, 70, 70, - 30, 718, 30, 30, 30, 30, 30, 30, 107, 30, - 30, 30, 30, 30, 713, 712, 127, 30, 72, 73, - 30, 30, 30, 30, 133, 128, 30, 31, 74, 69, - 69, 69, 69, 69, 69, 69, 71, 30, 705, 704, - 30, 30, 30, 127, 30, 72, 73, 129, 130, 30, - 75, 30, 128, 30, 131, 74, 30, 30, 30, 30, - 703, 30, 30, 71, 76, 30, 30, 185, 30, 30, - - 30, 30, 30, 702, 129, 130, 695, 75, 134, 30, - 135, 131, 78, 30, 79, 30, 30, 30, 30, 30, - 77, 76, 693, 136, 81, 30, 137, 80, 678, 30, - 30, 88, 30, 30, 82, 134, 186, 135, 30, 78, - 30, 79, 138, 89, 675, 30, 139, 77, 30, 30, - 136, 142, 671, 137, 80, 30, 30, 30, 88, 30, - 30, 82, 83, 30, 143, 94, 30, 30, 144, 138, - 89, 30, 30, 139, 84, 30, 30, 146, 142, 95, - 98, 670, 99, 145, 100, 96, 140, 30, 649, 83, - 85, 143, 94, 141, 147, 144, 86, 648, 30, 30, - - 639, 84, 30, 30, 146, 30, 95, 98, 87, 99, - 145, 100, 96, 140, 30, 30, 638, 85, 30, 30, - 141, 147, 637, 86, 101, 108, 108, 108, 108, 108, - 108, 108, 148, 102, 103, 87, 53, 53, 53, 149, - 104, 30, 53, 53, 636, 603, 168, 169, 53, 113, - 53, 101, 53, 53, 53, 53, 53, 30, 172, 148, - 102, 103, 173, 53, 53, 53, 149, 104, 30, 53, - 53, 30, 30, 168, 169, 53, 113, 53, 180, 53, - 53, 53, 53, 53, 30, 172, 602, 30, 109, 173, - 110, 110, 110, 110, 110, 110, 110, 112, 112, 112, - - 112, 112, 112, 112, 30, 180, 223, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 591, 30, 30, - 30, 30, 30, 578, 577, 117, 30, 30, 226, 576, - 30, 31, 223, 111, 111, 111, 111, 111, 111, 111, - 114, 115, 575, 181, 30, 182, 30, 30, 30, 183, - 116, 30, 30, 30, 226, 30, 30, 574, 30, 30, - 30, 184, 30, 30, 118, 573, 187, 114, 115, 30, - 181, 30, 182, 238, 30, 30, 183, 116, 30, 119, - 30, 30, 30, 30, 30, 120, 30, 568, 184, 170, - 188, 118, 30, 187, 30, 30, 30, 171, 567, 238, - - 30, 30, 472, 30, 30, 189, 119, 266, 122, 471, - 470, 123, 120, 30, 121, 463, 170, 188, 274, 462, - 30, 418, 30, 30, 171, 30, 30, 30, 30, 30, - 190, 415, 189, 266, 30, 122, 30, 125, 123, 30, - 30, 121, 30, 124, 274, 126, 150, 150, 150, 150, - 150, 150, 150, 153, 153, 153, 153, 153, 153, 153, - 154, 338, 192, 193, 125, 30, 194, 30, 324, 191, - 124, 30, 126, 30, 30, 30, 30, 30, 30, 151, - 151, 151, 151, 151, 151, 151, 323, 154, 30, 192, - 193, 30, 30, 194, 30, 195, 30, 30, 30, 30, - - 30, 321, 320, 30, 156, 30, 30, 30, 30, 30, - 155, 232, 158, 30, 157, 30, 30, 52, 197, 30, - 109, 27, 152, 152, 152, 152, 152, 152, 152, 162, - 30, 156, 27, 165, 196, 243, 30, 155, 159, 158, - 30, 157, 52, 30, 30, 30, 200, 30, 198, 30, - 233, 30, 30, 30, 30, 30, 162, 199, 30, 30, - 165, 251, 30, 30, 29, 111, 111, 111, 111, 111, - 111, 111, 160, 200, 244, 198, 161, 30, 163, 28, - 30, 30, 30, 30, 288, 30, 30, 30, 30, 30, - 215, 30, 30, 30, 216, 30, 30, 174, 27, 160, - - 252, 30, 217, 161, 220, 163, 175, 310, 176, 218, - 219, 177, 167, 164, 224, 221, 277, 215, 166, 30, - 178, 216, 179, 289, 174, 30, 738, 30, 30, 217, - 25, 30, 109, 175, 30, 176, 218, 219, 177, 167, - 164, 224, 277, 222, 738, 166, 311, 178, 738, 179, - 201, 201, 201, 201, 201, 201, 201, 30, 738, 225, - 30, 202, 738, 203, 203, 203, 203, 203, 203, 203, - 30, 204, 204, 204, 204, 204, 204, 204, 30, 738, - 30, 30, 30, 30, 30, 30, 225, 30, 30, 30, - 30, 30, 30, 312, 30, 30, 30, 30, 30, 30, - - 738, 30, 305, 207, 30, 30, 208, 30, 227, 738, - 30, 30, 205, 30, 738, 30, 30, 30, 30, 30, - 30, 30, 30, 228, 30, 30, 209, 30, 305, 30, - 738, 211, 313, 738, 206, 227, 30, 30, 738, 205, - 30, 30, 210, 30, 30, 229, 230, 30, 30, 30, - 228, 231, 738, 209, 212, 30, 30, 30, 211, 30, - 30, 234, 738, 30, 235, 213, 236, 237, 239, 210, - 240, 738, 229, 230, 241, 242, 245, 246, 231, 30, - 247, 212, 248, 250, 253, 249, 30, 254, 234, 214, - 327, 235, 213, 236, 237, 239, 30, 240, 30, 30, - - 30, 241, 242, 245, 246, 259, 738, 247, 260, 248, - 250, 253, 249, 267, 254, 738, 214, 255, 255, 255, - 255, 255, 255, 255, 30, 326, 738, 30, 30, 328, - 256, 256, 256, 256, 256, 256, 256, 738, 30, 30, - 267, 268, 30, 30, 738, 30, 738, 261, 30, 30, - 30, 326, 30, 30, 30, 30, 30, 269, 334, 30, - 262, 30, 30, 30, 30, 30, 30, 30, 268, 270, - 30, 202, 263, 257, 257, 257, 257, 257, 257, 257, - 258, 30, 30, 271, 269, 30, 30, 30, 272, 273, - 275, 276, 30, 264, 30, 278, 270, 335, 279, 263, - - 280, 30, 30, 30, 281, 30, 30, 258, 30, 30, - 271, 30, 30, 282, 283, 272, 273, 275, 276, 284, - 264, 285, 278, 738, 30, 279, 286, 280, 287, 290, - 291, 281, 292, 293, 294, 295, 296, 297, 298, 299, - 282, 283, 265, 300, 30, 301, 284, 302, 285, 303, - 30, 304, 738, 286, 341, 287, 290, 291, 379, 292, - 293, 294, 295, 296, 297, 298, 299, 738, 354, 265, - 300, 738, 301, 499, 302, 738, 303, 30, 304, 30, - 30, 202, 30, 30, 379, 306, 306, 306, 306, 306, - 306, 306, 30, 342, 30, 30, 30, 30, 30, 499, - - 30, 314, 308, 30, 30, 30, 315, 355, 30, 30, - 309, 30, 307, 30, 30, 30, 30, 30, 316, 30, - 30, 30, 30, 30, 30, 30, 30, 317, 314, 318, - 319, 322, 325, 315, 30, 738, 30, 738, 329, 307, - 330, 331, 30, 332, 333, 316, 336, 30, 337, 339, - 340, 343, 344, 30, 317, 30, 318, 319, 322, 325, - 345, 346, 30, 347, 30, 329, 348, 330, 331, 349, - 332, 333, 350, 336, 351, 337, 339, 340, 343, 344, - 352, 353, 30, 358, 363, 30, 30, 345, 346, 738, - 347, 30, 738, 348, 30, 30, 349, 738, 359, 350, - - 30, 351, 360, 30, 30, 361, 738, 352, 353, 30, - 358, 357, 30, 30, 362, 356, 356, 356, 356, 356, - 356, 356, 365, 364, 30, 359, 366, 367, 368, 360, - 369, 370, 361, 30, 371, 372, 373, 374, 357, 375, - 376, 362, 30, 377, 378, 380, 381, 382, 383, 365, - 384, 30, 385, 366, 367, 368, 386, 369, 370, 387, - 392, 371, 372, 373, 374, 393, 375, 376, 388, 389, - 377, 378, 380, 381, 382, 383, 394, 384, 396, 385, - 390, 391, 397, 386, 398, 399, 387, 392, 500, 400, - 401, 402, 393, 403, 30, 388, 389, 30, 30, 30, - - 405, 406, 30, 30, 407, 396, 408, 390, 391, 397, - 409, 398, 399, 410, 500, 395, 400, 401, 402, 411, - 403, 412, 413, 414, 416, 417, 419, 405, 406, 420, - 421, 407, 422, 408, 404, 423, 30, 409, 424, 425, - 410, 30, 426, 427, 428, 429, 411, 430, 412, 413, - 414, 416, 417, 419, 431, 432, 420, 421, 433, 422, - 434, 404, 423, 435, 436, 424, 425, 437, 438, 426, - 427, 428, 429, 439, 430, 440, 441, 442, 443, 445, - 446, 431, 432, 448, 449, 433, 444, 434, 447, 450, - 435, 436, 451, 452, 437, 438, 453, 454, 455, 456, - - 439, 457, 440, 441, 442, 443, 445, 446, 459, 460, - 448, 449, 461, 444, 30, 447, 450, 30, 30, 451, - 452, 464, 465, 453, 454, 455, 456, 466, 467, 475, - 468, 469, 473, 474, 477, 459, 460, 478, 479, 461, - 458, 738, 480, 481, 482, 483, 484, 485, 464, 465, - 486, 487, 488, 489, 466, 467, 30, 468, 469, 473, - 474, 477, 490, 491, 478, 479, 492, 493, 476, 480, - 481, 482, 483, 484, 485, 494, 495, 486, 487, 488, - 489, 496, 497, 498, 501, 502, 503, 504, 505, 490, - 491, 506, 507, 492, 493, 508, 509, 510, 511, 512, - - 513, 514, 494, 495, 515, 516, 517, 518, 496, 497, - 498, 501, 502, 503, 504, 505, 519, 520, 506, 507, - 521, 522, 508, 509, 510, 511, 512, 513, 514, 523, - 524, 515, 516, 517, 518, 525, 526, 527, 528, 529, - 530, 531, 532, 519, 520, 533, 534, 521, 522, 535, - 536, 537, 538, 539, 738, 540, 523, 524, 541, 542, - 738, 543, 525, 526, 527, 528, 529, 530, 531, 532, - 544, 545, 533, 534, 546, 547, 535, 536, 537, 538, - 539, 540, 548, 549, 550, 541, 542, 543, 551, 552, - 553, 554, 555, 556, 557, 558, 559, 544, 545, 560, - - 561, 546, 547, 562, 563, 564, 565, 566, 569, 548, - 549, 550, 570, 571, 572, 551, 552, 553, 554, 555, - 556, 557, 558, 559, 579, 580, 560, 561, 581, 582, - 562, 563, 564, 565, 566, 569, 583, 584, 585, 570, - 571, 572, 586, 587, 588, 589, 590, 592, 593, 594, - 595, 579, 580, 596, 597, 581, 582, 598, 599, 600, - 601, 604, 605, 583, 584, 585, 606, 607, 608, 586, - 587, 588, 589, 590, 592, 593, 594, 595, 609, 610, - 596, 597, 611, 612, 598, 599, 600, 601, 604, 605, - 613, 614, 615, 606, 607, 608, 616, 617, 618, 619, - - 620, 621, 622, 623, 624, 609, 610, 625, 626, 611, - 612, 627, 628, 629, 630, 631, 632, 613, 614, 615, - 633, 634, 635, 616, 617, 618, 619, 620, 621, 622, - 623, 624, 640, 641, 625, 626, 642, 643, 627, 628, - 629, 630, 631, 632, 644, 645, 646, 633, 634, 635, - 647, 650, 651, 652, 653, 654, 655, 656, 657, 640, - 641, 658, 659, 642, 643, 660, 661, 662, 663, 664, - 665, 644, 645, 646, 666, 667, 668, 647, 650, 651, - 652, 653, 654, 655, 656, 657, 669, 672, 658, 659, - 673, 674, 660, 661, 662, 663, 664, 665, 676, 677, - - 666, 667, 668, 679, 680, 681, 682, 683, 684, 685, - 686, 687, 669, 688, 672, 689, 690, 673, 674, 691, - 692, 694, 696, 697, 698, 676, 677, 699, 700, 701, - 679, 680, 681, 682, 683, 684, 685, 686, 687, 706, - 688, 707, 689, 690, 708, 709, 691, 692, 694, 696, - 697, 698, 710, 711, 699, 700, 701, 714, 715, 716, - 717, 722, 723, 724, 725, 726, 706, 727, 707, 728, - 729, 708, 709, 730, 731, 732, 733, 734, 735, 710, - 711, 738, 738, 738, 714, 715, 716, 717, 722, 723, - 724, 725, 726, 738, 727, 738, 728, 729, 738, 738, - - 730, 731, 732, 733, 734, 735, 26, 738, 26, 51, - 51, 51, 3, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738 + 13, 13, 13, 31, 36, 32, 32, 32, 32, 32, + 32, 32, 33, 33, 33, 33, 33, 33, 33, 34, + 37, 39, 35, 41, 38, 42, 43, 44, 47, 49, + + 50, 36, 48, 90, 40, 91, 92, 30, 45, 93, + 30, 30, 97, 105, 46, 67, 34, 37, 39, 35, + 41, 38, 42, 43, 44, 47, 49, 50, 30, 48, + 90, 40, 91, 92, 512, 45, 93, 504, 503, 97, + 105, 46, 53, 53, 53, 53, 53, 53, 53, 30, + 500, 106, 53, 54, 55, 56, 53, 53, 53, 57, + 58, 53, 53, 53, 53, 59, 53, 60, 53, 61, + 62, 63, 64, 65, 53, 53, 53, 53, 106, 53, + 54, 55, 56, 53, 53, 53, 57, 58, 53, 53, + 53, 53, 59, 53, 60, 53, 61, 62, 63, 64, + + 65, 53, 53, 53, 53, 66, 66, 66, 66, 66, + 66, 66, 30, 107, 496, 30, 30, 495, 68, 68, + 68, 68, 68, 68, 68, 70, 70, 70, 70, 70, + 70, 70, 30, 491, 30, 30, 30, 30, 30, 30, + 107, 30, 30, 30, 30, 30, 482, 479, 127, 30, + 72, 73, 30, 30, 30, 30, 468, 128, 30, 31, + 74, 69, 69, 69, 69, 69, 69, 69, 71, 30, + 463, 462, 30, 30, 30, 127, 30, 72, 73, 129, + 130, 30, 75, 30, 128, 30, 131, 74, 30, 30, + 30, 30, 445, 30, 30, 71, 76, 30, 30, 439, + + 30, 30, 30, 30, 30, 432, 129, 130, 431, 75, + 133, 30, 134, 131, 78, 30, 79, 30, 30, 30, + 30, 30, 77, 76, 430, 135, 81, 30, 138, 80, + 427, 30, 30, 88, 30, 30, 82, 133, 380, 134, + 30, 78, 30, 79, 139, 89, 378, 30, 142, 77, + 30, 30, 135, 143, 377, 138, 80, 30, 30, 30, + 88, 30, 30, 82, 83, 30, 146, 94, 30, 30, + 147, 139, 89, 30, 30, 142, 84, 30, 30, 148, + 143, 95, 98, 373, 99, 136, 100, 96, 137, 30, + 370, 83, 85, 146, 94, 149, 168, 147, 86, 353, + + 30, 30, 352, 84, 30, 30, 148, 30, 95, 98, + 87, 99, 136, 100, 96, 137, 30, 30, 346, 85, + 30, 30, 149, 168, 334, 86, 101, 108, 108, 108, + 108, 108, 108, 108, 140, 102, 103, 87, 53, 53, + 53, 141, 104, 30, 53, 53, 315, 309, 169, 144, + 53, 113, 53, 101, 53, 53, 53, 53, 53, 30, + 172, 140, 102, 103, 145, 53, 53, 53, 141, 104, + 30, 53, 53, 30, 30, 169, 144, 53, 113, 53, + 173, 53, 53, 53, 53, 53, 30, 172, 302, 30, + 109, 145, 110, 110, 110, 110, 110, 110, 110, 112, + + 112, 112, 112, 112, 112, 112, 30, 173, 214, 30, + 30, 30, 30, 30, 30, 30, 30, 30, 30, 215, + 30, 30, 30, 30, 30, 300, 298, 117, 30, 30, + 292, 289, 30, 31, 288, 111, 111, 111, 111, 111, + 111, 111, 114, 115, 282, 177, 30, 178, 30, 30, + 30, 179, 116, 30, 30, 30, 281, 30, 30, 266, + 30, 30, 30, 180, 30, 30, 118, 236, 181, 114, + 115, 30, 177, 30, 178, 231, 30, 30, 179, 116, + 30, 119, 30, 30, 30, 30, 30, 120, 30, 223, + 180, 170, 182, 118, 30, 181, 30, 30, 30, 171, + + 222, 191, 30, 30, 187, 30, 30, 184, 119, 183, + 122, 132, 52, 123, 120, 30, 121, 27, 170, 182, + 27, 52, 30, 29, 30, 30, 171, 30, 30, 30, + 30, 30, 28, 27, 184, 513, 30, 122, 30, 125, + 123, 30, 30, 121, 30, 124, 25, 126, 150, 150, + 150, 150, 150, 150, 150, 153, 153, 153, 153, 153, + 153, 153, 154, 513, 185, 186, 125, 30, 188, 30, + 189, 513, 124, 30, 126, 30, 30, 30, 30, 30, + 30, 151, 151, 151, 151, 151, 151, 151, 513, 154, + 30, 185, 186, 30, 30, 188, 30, 189, 30, 30, + + 30, 30, 30, 513, 513, 30, 156, 30, 30, 30, + 30, 30, 155, 513, 158, 30, 157, 30, 30, 513, + 513, 30, 109, 190, 152, 152, 152, 152, 152, 152, + 152, 162, 30, 156, 513, 165, 194, 513, 30, 155, + 159, 158, 30, 157, 513, 30, 30, 30, 209, 30, + 190, 30, 513, 30, 30, 30, 30, 30, 162, 210, + 30, 30, 165, 194, 30, 30, 192, 111, 111, 111, + 111, 111, 111, 111, 160, 209, 513, 211, 161, 30, + 163, 513, 30, 30, 30, 30, 210, 30, 30, 30, + 30, 30, 212, 30, 30, 30, 193, 30, 30, 174, + + 513, 160, 513, 30, 211, 161, 213, 163, 175, 513, + 176, 216, 217, 218, 167, 164, 219, 220, 221, 212, + 166, 30, 513, 193, 513, 513, 174, 30, 30, 30, + 224, 30, 109, 213, 513, 175, 30, 176, 216, 217, + 218, 167, 164, 219, 220, 221, 513, 166, 195, 195, + 195, 195, 195, 195, 195, 30, 513, 224, 30, 196, + 513, 197, 197, 197, 197, 197, 197, 197, 513, 513, + 30, 198, 198, 198, 198, 198, 198, 198, 30, 225, + 30, 30, 30, 30, 30, 30, 226, 30, 30, 30, + 30, 30, 30, 513, 227, 30, 30, 30, 30, 228, + + 30, 30, 30, 30, 30, 30, 225, 201, 30, 30, + 202, 229, 199, 226, 30, 513, 513, 30, 30, 513, + 30, 227, 30, 513, 203, 230, 228, 30, 513, 30, + 513, 513, 30, 513, 200, 30, 30, 232, 229, 199, + 30, 30, 30, 204, 30, 30, 30, 30, 205, 30, + 30, 203, 230, 235, 237, 30, 30, 30, 30, 30, + 30, 30, 233, 30, 232, 234, 30, 30, 513, 207, + 204, 244, 513, 30, 30, 205, 30, 30, 513, 206, + 235, 237, 242, 30, 513, 243, 513, 249, 30, 233, + 208, 30, 234, 513, 30, 30, 207, 30, 513, 30, + + 30, 245, 513, 30, 30, 30, 206, 238, 238, 238, + 238, 238, 238, 238, 249, 30, 30, 208, 30, 30, + 30, 30, 30, 513, 239, 239, 239, 239, 239, 239, + 239, 513, 250, 30, 30, 241, 246, 30, 30, 251, + 30, 513, 30, 30, 30, 30, 513, 30, 30, 30, + 30, 30, 30, 252, 253, 30, 30, 254, 30, 250, + 30, 30, 241, 246, 30, 196, 251, 240, 240, 240, + 240, 240, 240, 240, 247, 255, 30, 256, 257, 258, + 252, 253, 30, 259, 254, 260, 248, 30, 261, 30, + 262, 263, 264, 265, 30, 267, 268, 269, 270, 271, + + 272, 247, 255, 30, 256, 257, 258, 273, 274, 275, + 259, 276, 260, 248, 513, 261, 513, 262, 263, 264, + 265, 513, 267, 268, 269, 270, 271, 272, 30, 513, + 513, 30, 196, 513, 273, 274, 275, 30, 276, 30, + 30, 30, 30, 30, 513, 277, 277, 277, 277, 277, + 277, 277, 30, 283, 513, 30, 30, 278, 30, 513, + 279, 30, 30, 30, 513, 284, 30, 30, 280, 30, + 30, 30, 30, 30, 30, 30, 285, 286, 513, 30, + 283, 30, 30, 287, 278, 30, 30, 30, 290, 291, + 30, 30, 284, 293, 30, 296, 297, 513, 294, 299, + + 30, 301, 513, 285, 286, 30, 295, 303, 304, 305, + 287, 30, 306, 30, 307, 290, 291, 308, 513, 513, + 293, 513, 296, 297, 30, 294, 299, 30, 301, 30, + 30, 30, 312, 295, 303, 304, 305, 313, 314, 306, + 316, 307, 513, 30, 308, 30, 30, 30, 30, 30, + 317, 310, 310, 310, 310, 310, 310, 310, 30, 312, + 513, 30, 30, 318, 313, 314, 319, 316, 320, 30, + 321, 322, 311, 513, 323, 324, 325, 317, 326, 327, + 328, 329, 330, 331, 332, 30, 333, 30, 335, 336, + 318, 337, 338, 319, 513, 320, 340, 321, 322, 311, + + 30, 323, 324, 325, 341, 326, 327, 328, 329, 330, + 331, 332, 342, 333, 343, 335, 336, 30, 337, 338, + 30, 30, 30, 340, 344, 30, 30, 345, 347, 348, + 513, 341, 513, 349, 350, 351, 354, 513, 355, 342, + 356, 343, 357, 358, 359, 360, 361, 362, 365, 366, + 363, 344, 367, 368, 345, 347, 348, 339, 364, 30, + 349, 350, 351, 354, 30, 355, 369, 356, 371, 357, + 358, 359, 360, 361, 362, 365, 366, 363, 30, 367, + 368, 30, 30, 372, 339, 364, 374, 375, 376, 379, + 381, 382, 383, 369, 384, 371, 385, 386, 387, 388, + + 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, + 372, 399, 400, 374, 375, 376, 379, 381, 382, 383, + 30, 384, 401, 385, 386, 387, 388, 389, 390, 391, + 392, 393, 394, 395, 396, 397, 398, 402, 399, 400, + 403, 404, 405, 406, 407, 408, 409, 410, 411, 401, + 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, + 422, 423, 424, 425, 402, 426, 428, 403, 404, 405, + 406, 407, 408, 409, 410, 411, 429, 412, 413, 414, + 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, + 425, 433, 426, 428, 434, 435, 436, 437, 438, 440, + + 441, 442, 443, 429, 444, 446, 447, 448, 449, 450, + 451, 452, 453, 454, 455, 456, 457, 458, 433, 459, + 460, 434, 435, 436, 437, 438, 440, 441, 442, 443, + 461, 444, 446, 447, 448, 449, 450, 451, 452, 453, + 454, 455, 456, 457, 458, 464, 459, 460, 465, 466, + 467, 469, 470, 471, 472, 473, 474, 461, 475, 476, + 477, 478, 480, 481, 483, 484, 485, 486, 487, 488, + 489, 490, 464, 492, 493, 465, 466, 467, 469, 470, + 471, 472, 473, 474, 494, 475, 476, 477, 478, 480, + 481, 483, 484, 485, 486, 487, 488, 489, 490, 497, + + 492, 493, 498, 499, 501, 502, 505, 506, 507, 508, + 509, 494, 510, 511, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 497, 513, 513, 498, + 499, 501, 502, 505, 506, 507, 508, 509, 513, 510, + 511, 26, 513, 26, 51, 51, 51, 3, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513 } ; -static yyconst flex_int16_t yy_chk[2086] = +static yyconst flex_int16_t yy_chk[1722] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1001,241 +888,200 @@ static yyconst flex_int16_t yy_chk[2086] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 11, 15, 11, 11, 11, 11, 11, 11, - 11, 12, 12, 12, 12, 12, 12, 12, 14, 16, - 17, 14, 18, 16, 19, 20, 21, 22, 23, 24, - - 15, 22, 55, 17, 56, 57, 30, 21, 58, 30, - 30, 60, 63, 21, 742, 14, 16, 17, 14, 18, - 16, 19, 20, 21, 22, 23, 24, 740, 22, 55, - 17, 56, 57, 733, 21, 58, 732, 711, 60, 63, - 21, 28, 28, 28, 28, 28, 28, 28, 30, 710, - 64, 28, 28, 28, 28, 28, 28, 28, 28, 28, + 1, 1, 1, 11, 15, 11, 11, 11, 11, 11, + 11, 11, 12, 12, 12, 12, 12, 12, 12, 14, + 16, 17, 14, 18, 16, 19, 20, 21, 22, 23, + + 24, 15, 22, 55, 17, 56, 57, 30, 21, 58, + 30, 30, 60, 63, 21, 517, 14, 16, 17, 14, + 18, 16, 19, 20, 21, 22, 23, 24, 515, 22, + 55, 17, 56, 57, 510, 21, 58, 499, 498, 60, + 63, 21, 28, 28, 28, 28, 28, 28, 28, 30, + 493, 64, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, - 28, 28, 28, 28, 28, 28, 28, 64, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 28, 64, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, - 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, - 31, 65, 709, 31, 31, 93, 31, 31, 31, 31, - 31, 31, 31, 33, 33, 33, 33, 33, 33, 33, - 35, 708, 36, 35, 35, 36, 36, 34, 65, 37, - 34, 34, 37, 37, 699, 698, 88, 38, 35, 36, - 38, 38, 31, 32, 93, 89, 32, 32, 37, 32, - 32, 32, 32, 32, 32, 32, 34, 39, 689, 688, - 39, 39, 35, 88, 36, 35, 36, 90, 91, 34, - 38, 37, 89, 40, 92, 37, 40, 40, 41, 38, - 687, 41, 41, 34, 39, 32, 42, 139, 43, 42, - - 42, 43, 43, 686, 90, 91, 679, 38, 94, 39, - 95, 92, 41, 44, 42, 45, 44, 44, 45, 45, - 40, 39, 676, 96, 44, 40, 97, 43, 658, 46, - 41, 54, 46, 46, 45, 94, 139, 95, 42, 41, - 43, 42, 98, 54, 655, 47, 99, 40, 47, 47, - 96, 101, 651, 97, 43, 44, 48, 45, 54, 48, - 48, 45, 46, 49, 102, 59, 49, 49, 103, 98, - 54, 46, 50, 99, 47, 50, 50, 104, 101, 59, - 61, 650, 61, 103, 61, 59, 100, 47, 621, 46, - 48, 102, 59, 100, 105, 103, 49, 620, 48, 67, - - 609, 47, 67, 67, 104, 49, 59, 61, 50, 61, - 103, 61, 59, 100, 50, 71, 608, 48, 71, 71, - 100, 105, 607, 49, 62, 66, 66, 66, 66, 66, - 66, 66, 106, 62, 62, 50, 53, 53, 53, 107, - 62, 67, 53, 53, 606, 564, 127, 128, 53, 71, - 53, 62, 53, 53, 53, 53, 53, 71, 130, 106, - 62, 62, 131, 53, 53, 53, 107, 62, 72, 53, - 53, 72, 72, 127, 128, 53, 71, 53, 134, 53, - 53, 53, 53, 53, 68, 130, 563, 68, 68, 131, - 68, 68, 68, 68, 68, 68, 68, 70, 70, 70, - - 70, 70, 70, 70, 73, 134, 174, 73, 73, 74, - 72, 75, 74, 74, 75, 75, 76, 552, 77, 76, - 76, 77, 77, 535, 534, 77, 68, 69, 177, 533, - 69, 69, 174, 69, 69, 69, 69, 69, 69, 69, - 73, 75, 532, 135, 78, 136, 73, 78, 78, 137, - 76, 74, 79, 75, 177, 79, 79, 531, 76, 80, - 77, 138, 80, 80, 78, 530, 140, 73, 75, 69, - 135, 81, 136, 188, 81, 81, 137, 76, 82, 79, - 83, 82, 82, 83, 83, 80, 78, 525, 138, 129, - 141, 78, 84, 140, 79, 84, 84, 129, 524, 188, - - 86, 80, 423, 86, 86, 142, 79, 215, 83, 422, - 421, 84, 80, 81, 82, 414, 129, 141, 224, 413, - 82, 371, 83, 85, 129, 87, 85, 85, 87, 87, - 143, 368, 142, 215, 84, 83, 113, 86, 84, 113, - 113, 82, 86, 85, 224, 87, 108, 108, 108, 108, - 108, 108, 108, 112, 112, 112, 112, 112, 112, 112, - 113, 290, 144, 145, 86, 85, 146, 87, 278, 143, - 85, 115, 87, 109, 115, 115, 109, 109, 113, 109, - 109, 109, 109, 109, 109, 109, 277, 113, 114, 144, - 145, 114, 114, 146, 116, 147, 117, 116, 116, 117, - - 117, 275, 274, 123, 115, 120, 123, 123, 120, 120, - 114, 183, 117, 115, 116, 109, 110, 51, 148, 110, - 110, 27, 110, 110, 110, 110, 110, 110, 110, 120, - 114, 115, 26, 123, 147, 193, 116, 114, 117, 117, - 119, 116, 25, 119, 119, 123, 149, 120, 148, 118, - 183, 121, 118, 118, 121, 121, 120, 148, 110, 111, - 123, 198, 111, 111, 10, 111, 111, 111, 111, 111, - 111, 111, 118, 149, 193, 148, 119, 122, 121, 9, - 122, 122, 119, 124, 238, 126, 124, 124, 126, 126, - 168, 118, 125, 121, 169, 125, 125, 132, 8, 118, - - 198, 111, 170, 119, 173, 121, 132, 266, 132, 171, - 172, 133, 125, 122, 175, 173, 227, 168, 124, 122, - 133, 169, 133, 238, 132, 124, 3, 126, 152, 170, - 2, 152, 152, 132, 125, 132, 171, 172, 133, 125, - 122, 175, 227, 173, 0, 124, 266, 133, 0, 133, - 150, 150, 150, 150, 150, 150, 150, 151, 0, 176, - 151, 151, 0, 151, 151, 151, 151, 151, 151, 151, - 152, 153, 153, 153, 153, 153, 153, 153, 154, 0, - 155, 154, 154, 155, 155, 156, 176, 157, 156, 156, - 157, 157, 158, 267, 159, 158, 158, 159, 159, 151, - - 0, 160, 254, 159, 160, 160, 159, 161, 178, 0, - 161, 161, 154, 162, 0, 163, 162, 162, 163, 163, - 154, 164, 155, 179, 164, 164, 161, 156, 254, 157, - 0, 163, 267, 0, 158, 178, 159, 165, 0, 154, - 165, 165, 162, 160, 166, 180, 181, 166, 166, 161, - 179, 182, 0, 161, 164, 162, 167, 163, 163, 167, - 167, 184, 0, 164, 185, 165, 186, 187, 189, 162, - 190, 0, 180, 181, 191, 192, 194, 195, 182, 165, - 195, 164, 196, 197, 199, 196, 166, 200, 184, 167, - 281, 185, 165, 186, 187, 189, 206, 190, 167, 206, - - 206, 191, 192, 194, 195, 206, 0, 195, 206, 196, - 197, 199, 196, 216, 200, 0, 167, 201, 201, 201, - 201, 201, 201, 201, 202, 280, 0, 202, 202, 281, - 202, 202, 202, 202, 202, 202, 202, 0, 206, 207, - 216, 217, 207, 207, 0, 205, 0, 207, 205, 205, - 208, 280, 209, 208, 208, 209, 209, 218, 287, 210, - 208, 211, 210, 210, 211, 211, 202, 203, 217, 219, - 203, 203, 209, 203, 203, 203, 203, 203, 203, 203, - 205, 207, 212, 220, 218, 212, 212, 205, 222, 223, - 225, 226, 208, 210, 209, 228, 219, 287, 229, 209, - - 230, 210, 213, 211, 231, 213, 213, 205, 214, 203, - 220, 214, 214, 232, 233, 222, 223, 225, 226, 234, - 210, 235, 228, 0, 212, 229, 236, 230, 237, 239, - 240, 231, 241, 242, 243, 244, 245, 246, 247, 248, - 232, 233, 214, 249, 213, 250, 234, 251, 235, 252, - 214, 253, 0, 236, 293, 237, 239, 240, 331, 241, - 242, 243, 244, 245, 246, 247, 248, 0, 305, 214, - 249, 0, 250, 451, 251, 0, 252, 257, 253, 256, - 257, 257, 256, 256, 331, 256, 256, 256, 256, 256, - 256, 256, 258, 293, 259, 258, 258, 259, 259, 451, - - 260, 268, 259, 260, 260, 261, 269, 305, 261, 261, - 260, 262, 258, 263, 262, 262, 263, 263, 270, 257, - 264, 256, 265, 264, 264, 265, 265, 271, 268, 272, - 273, 276, 279, 269, 258, 0, 259, 0, 282, 258, - 283, 284, 260, 285, 286, 270, 288, 261, 289, 291, - 292, 294, 295, 262, 271, 263, 272, 273, 276, 279, - 296, 297, 264, 298, 265, 282, 299, 283, 284, 300, - 285, 286, 301, 288, 302, 289, 291, 292, 294, 295, - 303, 304, 307, 310, 315, 307, 307, 296, 297, 0, - 298, 308, 0, 299, 308, 308, 300, 0, 311, 301, - - 309, 302, 312, 309, 309, 313, 0, 303, 304, 306, - 310, 307, 306, 306, 314, 306, 306, 306, 306, 306, - 306, 306, 316, 315, 307, 311, 317, 318, 319, 312, - 320, 321, 313, 308, 322, 323, 324, 325, 307, 327, - 328, 314, 309, 329, 330, 332, 333, 334, 335, 316, - 336, 306, 337, 317, 318, 319, 339, 320, 321, 340, - 343, 322, 323, 324, 325, 344, 327, 328, 341, 341, - 329, 330, 332, 333, 334, 335, 345, 336, 346, 337, - 342, 342, 347, 339, 348, 349, 340, 343, 452, 351, - 352, 354, 344, 355, 356, 341, 341, 356, 356, 357, - - 358, 359, 357, 357, 360, 346, 361, 342, 342, 347, - 362, 348, 349, 363, 452, 345, 351, 352, 354, 364, - 355, 365, 366, 367, 369, 370, 372, 358, 359, 373, - 374, 360, 375, 361, 357, 376, 356, 362, 377, 378, - 363, 357, 379, 380, 381, 382, 364, 383, 365, 366, - 367, 369, 370, 372, 384, 385, 373, 374, 386, 375, - 387, 357, 376, 388, 389, 377, 378, 390, 391, 379, - 380, 381, 382, 392, 383, 393, 394, 395, 396, 397, - 398, 384, 385, 399, 400, 386, 396, 387, 398, 401, - 388, 389, 402, 403, 390, 391, 405, 406, 407, 408, - - 392, 409, 393, 394, 395, 396, 397, 398, 410, 411, - 399, 400, 412, 396, 404, 398, 401, 404, 404, 402, - 403, 415, 416, 405, 406, 407, 408, 417, 418, 426, - 419, 420, 424, 425, 427, 410, 411, 428, 429, 412, - 409, 0, 430, 431, 432, 433, 434, 435, 415, 416, - 436, 437, 438, 439, 417, 418, 404, 419, 420, 424, - 425, 427, 440, 441, 428, 429, 442, 443, 426, 430, - 431, 432, 433, 434, 435, 444, 445, 436, 437, 438, - 439, 446, 447, 448, 453, 454, 455, 456, 457, 440, - 441, 458, 459, 442, 443, 460, 461, 462, 463, 464, - - 465, 466, 444, 445, 467, 468, 469, 471, 446, 447, - 448, 453, 454, 455, 456, 457, 472, 473, 458, 459, - 474, 475, 460, 461, 462, 463, 464, 465, 466, 476, - 477, 467, 468, 469, 471, 478, 479, 480, 481, 482, - 483, 484, 485, 472, 473, 486, 487, 474, 475, 488, - 491, 492, 493, 494, 0, 495, 476, 477, 496, 497, - 0, 498, 478, 479, 480, 481, 482, 483, 484, 485, - 501, 502, 486, 487, 503, 504, 488, 491, 492, 493, - 494, 495, 505, 506, 507, 496, 497, 498, 508, 509, - 510, 511, 512, 513, 514, 515, 516, 501, 502, 517, - - 518, 503, 504, 519, 520, 521, 522, 523, 526, 505, - 506, 507, 527, 528, 529, 508, 509, 510, 511, 512, - 513, 514, 515, 516, 538, 539, 517, 518, 541, 542, - 519, 520, 521, 522, 523, 526, 544, 545, 546, 527, - 528, 529, 547, 548, 549, 550, 551, 553, 554, 555, - 556, 538, 539, 557, 558, 541, 542, 559, 560, 561, - 562, 565, 566, 544, 545, 546, 569, 570, 571, 547, - 548, 549, 550, 551, 553, 554, 555, 556, 572, 575, - 557, 558, 576, 577, 559, 560, 561, 562, 565, 566, - 578, 579, 581, 569, 570, 571, 583, 584, 585, 586, - - 587, 588, 589, 590, 592, 572, 575, 593, 594, 576, - 577, 595, 596, 597, 598, 599, 600, 578, 579, 581, - 601, 604, 605, 583, 584, 585, 586, 587, 588, 589, - 590, 592, 610, 611, 593, 594, 612, 613, 595, 596, - 597, 598, 599, 600, 616, 617, 618, 601, 604, 605, - 619, 622, 623, 624, 625, 626, 627, 628, 629, 610, - 611, 630, 631, 612, 613, 632, 633, 634, 635, 636, - 637, 616, 617, 618, 640, 641, 642, 619, 622, 623, - 624, 625, 626, 627, 628, 629, 643, 652, 630, 631, - 653, 654, 632, 633, 634, 635, 636, 637, 656, 657, - - 640, 641, 642, 659, 660, 661, 662, 663, 664, 665, - 666, 667, 643, 668, 652, 669, 672, 653, 654, 673, - 674, 677, 680, 681, 682, 656, 657, 683, 684, 685, - 659, 660, 661, 662, 663, 664, 665, 666, 667, 690, - 668, 691, 669, 672, 692, 694, 673, 674, 677, 680, - 681, 682, 696, 697, 683, 684, 685, 700, 701, 706, - 707, 712, 713, 714, 715, 722, 690, 723, 691, 724, - 725, 692, 694, 726, 727, 728, 729, 730, 731, 696, - 697, 0, 0, 0, 700, 701, 706, 707, 712, 713, - 714, 715, 722, 0, 723, 0, 724, 725, 0, 0, - - 726, 727, 728, 729, 730, 731, 739, 0, 739, 741, - 741, 741, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738 + 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, + 29, 29, 31, 65, 488, 31, 31, 487, 31, 31, + 31, 31, 31, 31, 31, 33, 33, 33, 33, 33, + 33, 33, 35, 483, 36, 35, 35, 36, 36, 34, + 65, 37, 34, 34, 37, 37, 472, 469, 88, 38, + 35, 36, 38, 38, 31, 32, 454, 89, 32, 32, + 37, 32, 32, 32, 32, 32, 32, 32, 34, 39, + 448, 447, 39, 39, 35, 88, 36, 35, 36, 90, + 91, 34, 38, 37, 89, 40, 92, 37, 40, 40, + 41, 38, 425, 41, 41, 34, 39, 32, 42, 419, + + 43, 42, 42, 43, 43, 410, 90, 91, 409, 38, + 94, 39, 95, 92, 41, 44, 42, 45, 44, 44, + 45, 45, 40, 39, 408, 96, 44, 40, 98, 43, + 405, 46, 41, 54, 46, 46, 45, 94, 354, 95, + 42, 41, 43, 42, 99, 54, 350, 47, 101, 40, + 47, 47, 96, 102, 349, 98, 43, 44, 48, 45, + 54, 48, 48, 45, 46, 49, 104, 59, 49, 49, + 105, 99, 54, 46, 50, 101, 47, 50, 50, 106, + 102, 59, 61, 345, 61, 97, 61, 59, 97, 47, + 342, 46, 48, 104, 59, 107, 127, 105, 49, 325, + + 48, 67, 324, 47, 67, 67, 106, 49, 59, 61, + 50, 61, 97, 61, 59, 97, 50, 71, 318, 48, + 71, 71, 107, 127, 304, 49, 62, 66, 66, 66, + 66, 66, 66, 66, 100, 62, 62, 50, 53, 53, + 53, 100, 62, 67, 53, 53, 284, 276, 128, 103, + 53, 71, 53, 62, 53, 53, 53, 53, 53, 71, + 130, 100, 62, 62, 103, 53, 53, 53, 100, 62, + 72, 53, 53, 72, 72, 128, 103, 53, 71, 53, + 131, 53, 53, 53, 53, 53, 68, 130, 269, 68, + 68, 103, 68, 68, 68, 68, 68, 68, 68, 70, + + 70, 70, 70, 70, 70, 70, 73, 131, 173, 73, + 73, 74, 72, 75, 74, 74, 75, 75, 76, 173, + 77, 76, 76, 77, 77, 267, 265, 77, 68, 69, + 260, 257, 69, 69, 256, 69, 69, 69, 69, 69, + 69, 69, 73, 75, 250, 133, 78, 134, 73, 78, + 78, 135, 76, 74, 79, 75, 249, 79, 79, 227, + 76, 80, 77, 136, 80, 80, 78, 193, 137, 73, + 75, 69, 133, 81, 134, 189, 81, 81, 135, 76, + 82, 79, 83, 82, 82, 83, 83, 80, 78, 181, + 136, 129, 138, 78, 84, 137, 79, 84, 84, 129, + + 180, 147, 86, 80, 143, 86, 86, 140, 79, 139, + 83, 93, 51, 84, 80, 81, 82, 27, 129, 138, + 26, 25, 82, 10, 83, 85, 129, 87, 85, 85, + 87, 87, 9, 8, 140, 3, 84, 83, 113, 86, + 84, 113, 113, 82, 86, 85, 2, 87, 108, 108, + 108, 108, 108, 108, 108, 112, 112, 112, 112, 112, + 112, 112, 113, 0, 141, 142, 86, 85, 144, 87, + 145, 0, 85, 115, 87, 109, 115, 115, 109, 109, + 113, 109, 109, 109, 109, 109, 109, 109, 0, 113, + 114, 141, 142, 114, 114, 144, 116, 145, 117, 116, + + 116, 117, 117, 0, 0, 123, 115, 120, 123, 123, + 120, 120, 114, 0, 117, 115, 116, 109, 110, 0, + 0, 110, 110, 146, 110, 110, 110, 110, 110, 110, + 110, 120, 114, 115, 0, 123, 149, 0, 116, 114, + 117, 117, 119, 116, 0, 119, 119, 123, 168, 120, + 146, 118, 0, 121, 118, 118, 121, 121, 120, 169, + 110, 111, 123, 149, 111, 111, 148, 111, 111, 111, + 111, 111, 111, 111, 118, 168, 0, 170, 119, 122, + 121, 0, 122, 122, 119, 124, 169, 126, 124, 124, + 126, 126, 171, 118, 125, 121, 148, 125, 125, 132, + + 0, 118, 0, 111, 170, 119, 172, 121, 132, 0, + 132, 174, 175, 176, 125, 122, 177, 178, 179, 171, + 124, 122, 0, 148, 0, 0, 132, 124, 152, 126, + 182, 152, 152, 172, 0, 132, 125, 132, 174, 175, + 176, 125, 122, 177, 178, 179, 0, 124, 150, 150, + 150, 150, 150, 150, 150, 151, 0, 182, 151, 151, + 0, 151, 151, 151, 151, 151, 151, 151, 0, 0, + 152, 153, 153, 153, 153, 153, 153, 153, 154, 183, + 155, 154, 154, 155, 155, 156, 184, 157, 156, 156, + 157, 157, 158, 0, 185, 158, 158, 151, 159, 186, + + 160, 159, 159, 160, 160, 161, 183, 159, 161, 161, + 159, 187, 154, 184, 162, 0, 0, 162, 162, 0, + 154, 185, 155, 0, 161, 188, 186, 156, 0, 157, + 0, 0, 163, 0, 158, 163, 163, 190, 187, 154, + 159, 165, 160, 162, 165, 165, 164, 161, 163, 164, + 164, 161, 188, 192, 194, 166, 162, 167, 166, 166, + 167, 167, 191, 201, 190, 191, 201, 201, 0, 165, + 162, 201, 0, 200, 163, 163, 200, 200, 0, 164, + 192, 194, 200, 165, 0, 200, 0, 209, 164, 191, + 167, 202, 191, 0, 202, 202, 165, 166, 0, 167, + + 199, 202, 0, 199, 199, 201, 164, 195, 195, 195, + 195, 195, 195, 195, 209, 200, 203, 167, 196, 203, + 203, 196, 196, 0, 196, 196, 196, 196, 196, 196, + 196, 0, 210, 202, 205, 199, 203, 205, 205, 211, + 204, 0, 199, 204, 204, 206, 0, 207, 206, 206, + 207, 207, 208, 212, 213, 208, 208, 214, 203, 210, + 196, 197, 199, 203, 197, 197, 211, 197, 197, 197, + 197, 197, 197, 197, 204, 216, 205, 217, 218, 219, + 212, 213, 204, 220, 214, 221, 208, 206, 222, 207, + 223, 224, 225, 226, 208, 228, 229, 230, 231, 232, + + 233, 204, 216, 197, 217, 218, 219, 234, 235, 236, + 220, 237, 221, 208, 0, 222, 0, 223, 224, 225, + 226, 0, 228, 229, 230, 231, 232, 233, 240, 0, + 0, 240, 240, 0, 234, 235, 236, 241, 237, 239, + 241, 241, 239, 239, 0, 239, 239, 239, 239, 239, + 239, 239, 242, 251, 0, 242, 242, 241, 243, 0, + 242, 243, 243, 244, 0, 252, 244, 244, 243, 245, + 240, 246, 245, 245, 246, 246, 253, 254, 0, 241, + 251, 239, 247, 255, 241, 247, 247, 248, 258, 259, + 248, 248, 252, 261, 242, 263, 264, 0, 262, 266, + + 243, 268, 0, 253, 254, 244, 262, 270, 271, 272, + 255, 245, 273, 246, 274, 258, 259, 275, 0, 0, + 261, 0, 263, 264, 247, 262, 266, 279, 268, 248, + 279, 279, 281, 262, 270, 271, 272, 282, 283, 273, + 285, 274, 0, 278, 275, 277, 278, 278, 277, 277, + 286, 277, 277, 277, 277, 277, 277, 277, 280, 281, + 0, 280, 280, 287, 282, 283, 288, 285, 289, 279, + 290, 292, 278, 0, 293, 294, 295, 286, 296, 297, + 298, 299, 301, 302, 302, 278, 303, 277, 305, 306, + 287, 308, 309, 288, 0, 289, 312, 290, 292, 278, + + 280, 293, 294, 295, 313, 296, 297, 298, 299, 301, + 302, 302, 314, 303, 315, 305, 306, 310, 308, 309, + 310, 310, 311, 312, 316, 311, 311, 317, 319, 320, + 0, 313, 0, 321, 322, 323, 326, 0, 327, 314, + 328, 315, 329, 330, 331, 332, 333, 334, 336, 337, + 335, 316, 338, 340, 317, 319, 320, 311, 335, 310, + 321, 322, 323, 326, 311, 327, 341, 328, 343, 329, + 330, 331, 332, 333, 334, 336, 337, 335, 339, 338, + 340, 339, 339, 344, 311, 335, 346, 347, 348, 351, + 355, 356, 357, 341, 358, 343, 359, 360, 361, 362, + + 363, 364, 365, 367, 368, 369, 370, 371, 372, 373, + 344, 374, 375, 346, 347, 348, 351, 355, 356, 357, + 339, 358, 376, 359, 360, 361, 362, 363, 364, 365, + 367, 368, 369, 370, 371, 372, 373, 378, 374, 375, + 379, 380, 381, 382, 383, 384, 385, 386, 388, 376, + 389, 390, 391, 393, 394, 395, 396, 397, 398, 399, + 400, 401, 402, 403, 378, 404, 406, 379, 380, 381, + 382, 383, 384, 385, 386, 388, 407, 389, 390, 391, + 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, + 403, 412, 404, 406, 413, 415, 416, 417, 418, 420, + + 421, 422, 423, 407, 424, 426, 428, 429, 431, 432, + 433, 435, 436, 437, 438, 440, 441, 442, 412, 443, + 444, 413, 415, 416, 417, 418, 420, 421, 422, 423, + 446, 424, 426, 428, 429, 431, 432, 433, 435, 436, + 437, 438, 440, 441, 442, 449, 443, 444, 450, 452, + 453, 455, 456, 457, 458, 459, 460, 446, 461, 462, + 464, 465, 470, 471, 473, 474, 475, 476, 477, 478, + 480, 481, 449, 484, 485, 450, 452, 453, 455, 456, + 457, 458, 459, 460, 486, 461, 462, 464, 465, 470, + 471, 473, 474, 475, 476, 477, 478, 480, 481, 489, + + 484, 485, 490, 492, 494, 497, 500, 501, 505, 506, + 507, 486, 508, 509, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 489, 0, 0, 490, + 492, 494, 497, 500, 501, 505, 506, 507, 0, 508, + 509, 514, 0, 514, 516, 516, 516, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513, 513, 513, 513, 513, 513, 513, 513, 513, 513, + 513 } ; -static yyconst flex_int16_t yy_rule_linenum[87] = +static yyconst flex_int16_t yy_rule_linenum[64] = { 0, 77, 79, 81, 83, 85, 88, 92, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, - 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, - 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, - 148, 150, 151, 152, 153, 154, 155, 157, 158, 161, - 166, 167, 168, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 180, 189, 207, 213 + 117, 118, 119, 120, 121, 123, 124, 126, 128, 129, + 130, 131, 132, 133, 135, 136, 139, 144, 145, 146, + 148, 149, 150, 151, 152, 153, 154, 155, 156, 158, + 167, 185, 191 } ; /* The intent behind this definition is that it'll catch @@ -1290,7 +1136,7 @@ static yyconst flex_int16_t yy_rule_linenum[87] = #define YY_INPUT(buffer, result, max_size) get_lex_chars(buffer, result, max_size, PARAM) -#line 1294 "libmemcached/options/scanner.cc" +#line 1140 "libmemcached/options/scanner.cc" #define INITIAL 0 @@ -1597,7 +1443,7 @@ YY_DECL -#line 1601 "libmemcached/options/scanner.cc" +#line 1447 "libmemcached/options/scanner.cc" yylval = yylval_param; @@ -1663,13 +1509,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 739 ) + if ( yy_current_state >= 514 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 2013 ); + while ( yy_base[yy_current_state] != 1648 ); yy_find_action: /* %% [10.0] code to find the action number goes here */ @@ -1692,13 +1538,13 @@ do_action: /* This label is used only to access EOF actions. */ { if ( yy_act == 0 ) fprintf( stderr, "--scanner backing up\n" ); - else if ( yy_act < 87 ) + else if ( yy_act < 64 ) fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", (long)yy_rule_linenum[yy_act], yytext ); - else if ( yy_act == 87 ) + else if ( yy_act == 64 ) fprintf( stderr, "--accepting default rule (\"%s\")\n", yytext ); - else if ( yy_act == 88 ) + else if ( yy_act == 65 ) fprintf( stderr, "--(end of buffer or a NUL)\n" ); else fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); @@ -1758,384 +1604,269 @@ YY_RULE_SETUP case 8: YY_RULE_SETUP #line 94 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return VERIFY_KEY; } +{ yyextra->begin= yytext; return BINARY_PROTOCOL; } YY_BREAK case 9: YY_RULE_SETUP #line 95 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return VERIFY_KEY; } +{ yyextra->begin= yytext; return BUFFER_REQUESTS; } YY_BREAK case 10: YY_RULE_SETUP #line 96 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return BINARY_PROTOCOL; } +{ yyextra->begin= yytext; return CONFIGURE_FILE; } YY_BREAK case 11: YY_RULE_SETUP #line 97 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return BINARY_PROTOCOL; } +{ yyextra->begin= yytext; return CONNECT_TIMEOUT; } YY_BREAK case 12: YY_RULE_SETUP #line 98 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return BUFFER_REQUESTS; } +{ yyextra->begin= yytext; return DISTRIBUTION; } YY_BREAK case 13: YY_RULE_SETUP #line 99 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return BUFFER_REQUESTS; } +{ yyextra->begin= yytext; return HASH_WITH_NAMESPACE; } YY_BREAK case 14: YY_RULE_SETUP #line 100 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return CONFIGURE_FILE; } +{ yyextra->begin= yytext; return HASH; } YY_BREAK case 15: YY_RULE_SETUP #line 101 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return CONFIGURE_FILE; } +{ yyextra->begin= yytext; return IO_BYTES_WATERMARK; } YY_BREAK case 16: YY_RULE_SETUP #line 102 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return CONNECT_TIMEOUT; } +{ yyextra->begin= yytext; return IO_KEY_PREFETCH; } YY_BREAK case 17: YY_RULE_SETUP #line 103 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return CONNECT_TIMEOUT; } +{ yyextra->begin= yytext; return IO_MSG_WATERMARK; } YY_BREAK case 18: YY_RULE_SETUP #line 104 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return DISTRIBUTION; } +{ yyextra->begin= yytext; return NOREPLY; } YY_BREAK case 19: YY_RULE_SETUP #line 105 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return HASH; } +{ yyextra->begin= yytext; return NUMBER_OF_REPLICAS; } YY_BREAK case 20: YY_RULE_SETUP #line 106 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return HASH_WITH_NAMESPACE; } +{ yyextra->begin= yytext; return POLL_TIMEOUT; } YY_BREAK case 21: YY_RULE_SETUP #line 107 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return HASH_WITH_NAMESPACE; } +{ yyextra->begin= yytext; return RANDOMIZE_REPLICA_READ; } YY_BREAK case 22: YY_RULE_SETUP #line 108 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return IO_BYTES_WATERMARK; } +{ yyextra->begin= yytext; return RCV_TIMEOUT; } YY_BREAK case 23: YY_RULE_SETUP #line 109 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return IO_BYTES_WATERMARK; } +{ yyextra->begin= yytext; return REMOVE_FAILED_SERVERS; } YY_BREAK case 24: YY_RULE_SETUP #line 110 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return IO_KEY_PREFETCH; } +{ yyextra->begin= yytext; return RETRY_TIMEOUT; } YY_BREAK case 25: YY_RULE_SETUP #line 111 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return IO_KEY_PREFETCH; } +{ yyextra->begin= yytext; return SND_TIMEOUT; } YY_BREAK case 26: YY_RULE_SETUP #line 112 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return IO_MSG_WATERMARK; } +{ yyextra->begin= yytext; return SOCKET_RECV_SIZE; } YY_BREAK case 27: YY_RULE_SETUP #line 113 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return IO_MSG_WATERMARK; } +{ yyextra->begin= yytext; return SOCKET_SEND_SIZE; } YY_BREAK case 28: YY_RULE_SETUP #line 114 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return NOREPLY; } +{ yyextra->begin= yytext; return SORT_HOSTS; } YY_BREAK case 29: YY_RULE_SETUP #line 115 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return NUMBER_OF_REPLICAS; } +{ yyextra->begin= yytext; return SUPPORT_CAS; } YY_BREAK case 30: YY_RULE_SETUP #line 116 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return NUMBER_OF_REPLICAS; } +{ yyextra->begin= yytext; return _TCP_KEEPALIVE; } YY_BREAK case 31: YY_RULE_SETUP #line 117 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return POLL_TIMEOUT; } +{ yyextra->begin= yytext; return _TCP_KEEPIDLE; } YY_BREAK case 32: YY_RULE_SETUP #line 118 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return POLL_TIMEOUT; } +{ yyextra->begin= yytext; return _TCP_NODELAY; } YY_BREAK case 33: YY_RULE_SETUP #line 119 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return RANDOMIZE_REPLICA_READ; } +{ yyextra->begin= yytext; return USE_UDP; } YY_BREAK case 34: YY_RULE_SETUP #line 120 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return RANDOMIZE_REPLICA_READ; } +{ yyextra->begin= yytext; return USER_DATA; } YY_BREAK case 35: YY_RULE_SETUP #line 121 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return RCV_TIMEOUT; } +{ yyextra->begin= yytext; return VERIFY_KEY; } YY_BREAK case 36: YY_RULE_SETUP -#line 122 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return RCV_TIMEOUT; } - YY_BREAK -case 37: -YY_RULE_SETUP #line 123 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return RETRY_TIMEOUT; } +{ yyextra->begin= yytext; return POOL_MIN; } YY_BREAK -case 38: +case 37: YY_RULE_SETUP #line 124 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return RETRY_TIMEOUT; } - YY_BREAK -case 39: -YY_RULE_SETUP -#line 125 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return SND_TIMEOUT; } +{ yyextra->begin= yytext; return POOL_MAX; } YY_BREAK -case 40: +case 38: YY_RULE_SETUP #line 126 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return SND_TIMEOUT; } - YY_BREAK -case 41: -YY_RULE_SETUP -#line 127 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return REMOVE_FAILED_SERVERS; } - YY_BREAK -case 42: -YY_RULE_SETUP -#line 128 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return REMOVE_FAILED_SERVERS; } - YY_BREAK -case 43: -YY_RULE_SETUP -#line 129 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return SOCKET_RECV_SIZE; } - YY_BREAK -case 44: -YY_RULE_SETUP -#line 130 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return SOCKET_RECV_SIZE; } - YY_BREAK -case 45: -YY_RULE_SETUP -#line 131 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return SOCKET_SEND_SIZE; } - YY_BREAK -case 46: -YY_RULE_SETUP -#line 132 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return SOCKET_SEND_SIZE; } - YY_BREAK -case 47: -YY_RULE_SETUP -#line 133 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return SORT_HOSTS; } - YY_BREAK -case 48: -YY_RULE_SETUP -#line 134 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return SORT_HOSTS; } - YY_BREAK -case 49: -YY_RULE_SETUP -#line 135 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return SUPPORT_CAS; } - YY_BREAK -case 50: -YY_RULE_SETUP -#line 136 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return SUPPORT_CAS; } - YY_BREAK -case 51: -YY_RULE_SETUP -#line 137 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return _TCP_NODELAY; } - YY_BREAK -case 52: -YY_RULE_SETUP -#line 138 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return _TCP_NODELAY; } - YY_BREAK -case 53: -YY_RULE_SETUP -#line 139 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return _TCP_KEEPALIVE; } - YY_BREAK -case 54: -YY_RULE_SETUP -#line 140 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return _TCP_KEEPALIVE; } - YY_BREAK -case 55: -YY_RULE_SETUP -#line 141 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return _TCP_KEEPIDLE; } - YY_BREAK -case 56: -YY_RULE_SETUP -#line 142 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return _TCP_KEEPIDLE; } - YY_BREAK -case 57: -YY_RULE_SETUP -#line 143 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return USER_DATA; } - YY_BREAK -case 58: -YY_RULE_SETUP -#line 144 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return USER_DATA; } - YY_BREAK -case 59: -YY_RULE_SETUP -#line 145 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return USE_UDP; } - YY_BREAK -case 60: -YY_RULE_SETUP -#line 146 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return USE_UDP; } - YY_BREAK -case 61: -YY_RULE_SETUP -#line 148 "libmemcached/options/scanner.l" { yyextra->begin= yytext; return NAMESPACE; } YY_BREAK -case 62: +case 39: YY_RULE_SETUP -#line 150 "libmemcached/options/scanner.l" +#line 128 "libmemcached/options/scanner.l" { yyextra->begin= yytext; return INCLUDE; } YY_BREAK -case 63: +case 40: YY_RULE_SETUP -#line 151 "libmemcached/options/scanner.l" +#line 129 "libmemcached/options/scanner.l" { yyextra->begin= yytext; return RESET; } YY_BREAK -case 64: +case 41: YY_RULE_SETUP -#line 152 "libmemcached/options/scanner.l" +#line 130 "libmemcached/options/scanner.l" { yyextra->begin= yytext; return PARSER_DEBUG; } YY_BREAK -case 65: +case 42: YY_RULE_SETUP -#line 153 "libmemcached/options/scanner.l" +#line 131 "libmemcached/options/scanner.l" { yyextra->begin= yytext; return SERVERS; } YY_BREAK -case 66: +case 43: YY_RULE_SETUP -#line 154 "libmemcached/options/scanner.l" +#line 132 "libmemcached/options/scanner.l" { yyextra->begin= yytext; return END; } YY_BREAK -case 67: +case 44: YY_RULE_SETUP -#line 155 "libmemcached/options/scanner.l" +#line 133 "libmemcached/options/scanner.l" { yyextra->begin= yytext; return ERROR; } YY_BREAK -case 68: +case 45: YY_RULE_SETUP -#line 157 "libmemcached/options/scanner.l" +#line 135 "libmemcached/options/scanner.l" { return TRUE; } YY_BREAK -case 69: +case 46: YY_RULE_SETUP -#line 158 "libmemcached/options/scanner.l" +#line 136 "libmemcached/options/scanner.l" { return FALSE; } YY_BREAK -case 70: +case 47: YY_RULE_SETUP -#line 161 "libmemcached/options/scanner.l" +#line 139 "libmemcached/options/scanner.l" { yyextra->begin= yytext; return UNKNOWN_OPTION; } YY_BREAK -case 71: +case 48: YY_RULE_SETUP -#line 166 "libmemcached/options/scanner.l" +#line 144 "libmemcached/options/scanner.l" { return CONSISTENT; } YY_BREAK -case 72: +case 49: YY_RULE_SETUP -#line 167 "libmemcached/options/scanner.l" +#line 145 "libmemcached/options/scanner.l" { return MODULA; } YY_BREAK -case 73: +case 50: YY_RULE_SETUP -#line 168 "libmemcached/options/scanner.l" +#line 146 "libmemcached/options/scanner.l" { return RANDOM; } YY_BREAK -case 74: +case 51: YY_RULE_SETUP -#line 170 "libmemcached/options/scanner.l" +#line 148 "libmemcached/options/scanner.l" { return MD5; } YY_BREAK -case 75: +case 52: YY_RULE_SETUP -#line 171 "libmemcached/options/scanner.l" +#line 149 "libmemcached/options/scanner.l" { return CRC; } YY_BREAK -case 76: +case 53: YY_RULE_SETUP -#line 172 "libmemcached/options/scanner.l" +#line 150 "libmemcached/options/scanner.l" { return FNV1_64; } YY_BREAK -case 77: +case 54: YY_RULE_SETUP -#line 173 "libmemcached/options/scanner.l" +#line 151 "libmemcached/options/scanner.l" { return FNV1A_64; } YY_BREAK -case 78: +case 55: YY_RULE_SETUP -#line 174 "libmemcached/options/scanner.l" +#line 152 "libmemcached/options/scanner.l" { return FNV1_32; } YY_BREAK -case 79: +case 56: YY_RULE_SETUP -#line 175 "libmemcached/options/scanner.l" +#line 153 "libmemcached/options/scanner.l" { return FNV1A_32; } YY_BREAK -case 80: +case 57: YY_RULE_SETUP -#line 176 "libmemcached/options/scanner.l" +#line 154 "libmemcached/options/scanner.l" { return HSIEH; } YY_BREAK -case 81: +case 58: YY_RULE_SETUP -#line 177 "libmemcached/options/scanner.l" +#line 155 "libmemcached/options/scanner.l" { return MURMUR; } YY_BREAK -case 82: +case 59: YY_RULE_SETUP -#line 178 "libmemcached/options/scanner.l" +#line 156 "libmemcached/options/scanner.l" { return JENKINS; } YY_BREAK -case 83: +case 60: YY_RULE_SETUP -#line 180 "libmemcached/options/scanner.l" +#line 158 "libmemcached/options/scanner.l" { yylval->server.port= MEMCACHED_DEFAULT_PORT; yylval->server.weight= 1; @@ -2145,9 +1876,9 @@ YY_RULE_SETUP return IPADDRESS; } YY_BREAK -case 84: +case 61: YY_RULE_SETUP -#line 189 "libmemcached/options/scanner.l" +#line 167 "libmemcached/options/scanner.l" { if (yyextra->is_server()) { @@ -2166,29 +1897,29 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 85: +case 62: YY_RULE_SETUP -#line 207 "libmemcached/options/scanner.l" +#line 185 "libmemcached/options/scanner.l" { yylval->string.c_str = yytext; yylval->string.length = yyleng; return QUOTED_STRING; } YY_BREAK -case 86: +case 63: YY_RULE_SETUP -#line 213 "libmemcached/options/scanner.l" +#line 191 "libmemcached/options/scanner.l" { yyextra->begin= yytext; return UNKNOWN; } YY_BREAK -case 87: +case 64: YY_RULE_SETUP -#line 218 "libmemcached/options/scanner.l" +#line 196 "libmemcached/options/scanner.l" ECHO; YY_BREAK -#line 2192 "libmemcached/options/scanner.cc" +#line 1923 "libmemcached/options/scanner.cc" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2504,7 +2235,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 739 ) + if ( yy_current_state >= 514 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2538,11 +2269,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 739 ) + if ( yy_current_state >= 514 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 738); + yy_is_jam = (yy_current_state == 513); return yy_is_jam ? 0 : yy_current_state; } @@ -3454,7 +3185,7 @@ void config_free (void * ptr , yyscan_t yyscanner) /* %ok-for-header */ -#line 218 "libmemcached/options/scanner.l" +#line 196 "libmemcached/options/scanner.l" diff --git a/libmemcached/options/scanner.h b/libmemcached/options/scanner.h index 6d0b71e9..b5bddde3 100644 --- a/libmemcached/options/scanner.h +++ b/libmemcached/options/scanner.h @@ -471,7 +471,7 @@ extern int config_lex \ #undef YY_DECL #endif -#line 218 "libmemcached/options/scanner.l" +#line 196 "libmemcached/options/scanner.l" #line 478 "libmemcached/options/scanner.h" diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l index 4c2801d2..b501ffe5 100644 --- a/libmemcached/options/scanner.l +++ b/libmemcached/options/scanner.l @@ -91,59 +91,37 @@ "--SERVER=" { yyextra->begin= yytext; yyextra->set_server(); return SERVER; } -"--VERIFY_KEY" { yyextra->begin= yytext; return VERIFY_KEY; } -"--VERIFY-KEY" { yyextra->begin= yytext; return VERIFY_KEY; } -"--BINARY_PROTOCOL" { yyextra->begin= yytext; return BINARY_PROTOCOL; } "--BINARY-PROTOCOL" { yyextra->begin= yytext; return BINARY_PROTOCOL; } -"--BUFFER_REQUESTS" { yyextra->begin= yytext; return BUFFER_REQUESTS; } "--BUFFER-REQUESTS" { yyextra->begin= yytext; return BUFFER_REQUESTS; } -"--CONFIGURE_FILE=" { yyextra->begin= yytext; return CONFIGURE_FILE; } "--CONFIGURE-FILE=" { yyextra->begin= yytext; return CONFIGURE_FILE; } -"--CONNECT_TIMEOUT=" { yyextra->begin= yytext; return CONNECT_TIMEOUT; } "--CONNECT-TIMEOUT=" { yyextra->begin= yytext; return CONNECT_TIMEOUT; } "--DISTRIBUTION=" { yyextra->begin= yytext; return DISTRIBUTION; } -"--HASH=" { yyextra->begin= yytext; return HASH; } -"--HASH_WITH_NAMESPACE" { yyextra->begin= yytext; return HASH_WITH_NAMESPACE; } "--HASH-WITH-NAMESPACE" { yyextra->begin= yytext; return HASH_WITH_NAMESPACE; } -"--IO_BYTES_WATERMARK=" { yyextra->begin= yytext; return IO_BYTES_WATERMARK; } +"--HASH=" { yyextra->begin= yytext; return HASH; } "--IO-BYTES-WATERMARK=" { yyextra->begin= yytext; return IO_BYTES_WATERMARK; } -"--IO_KEY_PREFETCH=" { yyextra->begin= yytext; return IO_KEY_PREFETCH; } "--IO-KEY-PREFETCH=" { yyextra->begin= yytext; return IO_KEY_PREFETCH; } -"--IO_MSG_WATERMARK=" { yyextra->begin= yytext; return IO_MSG_WATERMARK; } "--IO-MSG-WATERMARK=" { yyextra->begin= yytext; return IO_MSG_WATERMARK; } "--NOREPLY" { yyextra->begin= yytext; return NOREPLY; } -"--NUMBER_OF_REPLICAS=" { yyextra->begin= yytext; return NUMBER_OF_REPLICAS; } "--NUMBER-OF-REPLICAS=" { yyextra->begin= yytext; return NUMBER_OF_REPLICAS; } -"--POLL_TIMEOUT=" { yyextra->begin= yytext; return POLL_TIMEOUT; } "--POLL-TIMEOUT=" { yyextra->begin= yytext; return POLL_TIMEOUT; } -"--RANDOMIZE_REPLICA_READ" { yyextra->begin= yytext; return RANDOMIZE_REPLICA_READ; } "--RANDOMIZE-REPLICA-READ" { yyextra->begin= yytext; return RANDOMIZE_REPLICA_READ; } -"--RCV_TIMEOUT=" { yyextra->begin= yytext; return RCV_TIMEOUT; } "--RCV-TIMEOUT=" { yyextra->begin= yytext; return RCV_TIMEOUT; } -"--RETRY_TIMEOUT=" { yyextra->begin= yytext; return RETRY_TIMEOUT; } +"--REMOVE-FAILED-SERVERS=" { yyextra->begin= yytext; return REMOVE_FAILED_SERVERS; } "--RETRY-TIMEOUT=" { yyextra->begin= yytext; return RETRY_TIMEOUT; } -"--SND_TIMEOUT=" { yyextra->begin= yytext; return SND_TIMEOUT; } "--SND-TIMEOUT=" { yyextra->begin= yytext; return SND_TIMEOUT; } -"--REMOVE_FAILED_SERVERS=" { yyextra->begin= yytext; return REMOVE_FAILED_SERVERS; } -"--REMOVE-FAILED-SERVERS=" { yyextra->begin= yytext; return REMOVE_FAILED_SERVERS; } -"--SOCKET_RECV_SIZE=" { yyextra->begin= yytext; return SOCKET_RECV_SIZE; } "--SOCKET-RECV-SIZE=" { yyextra->begin= yytext; return SOCKET_RECV_SIZE; } -"--SOCKET_SEND_SIZE=" { yyextra->begin= yytext; return SOCKET_SEND_SIZE; } "--SOCKET-SEND-SIZE=" { yyextra->begin= yytext; return SOCKET_SEND_SIZE; } -"--SORT_HOSTS" { yyextra->begin= yytext; return SORT_HOSTS; } "--SORT-HOSTS" { yyextra->begin= yytext; return SORT_HOSTS; } -"--SUPPORT_CAS" { yyextra->begin= yytext; return SUPPORT_CAS; } "--SUPPORT-CAS" { yyextra->begin= yytext; return SUPPORT_CAS; } -"--TCP_NODELAY" { yyextra->begin= yytext; return _TCP_NODELAY; } -"--TCP-NODELAY" { yyextra->begin= yytext; return _TCP_NODELAY; } -"--TCP_KEEPALIVE" { yyextra->begin= yytext; return _TCP_KEEPALIVE; } "--TCP-KEEPALIVE" { yyextra->begin= yytext; return _TCP_KEEPALIVE; } -"--TCP_KEEPIDLE" { yyextra->begin= yytext; return _TCP_KEEPIDLE; } "--TCP-KEEPIDLE" { yyextra->begin= yytext; return _TCP_KEEPIDLE; } -"--USER_DATA" { yyextra->begin= yytext; return USER_DATA; } -"--USER-DATA" { yyextra->begin= yytext; return USER_DATA; } -"--USE_UDP" { yyextra->begin= yytext; return USE_UDP; } +"--TCP-NODELAY" { yyextra->begin= yytext; return _TCP_NODELAY; } "--USE-UDP" { yyextra->begin= yytext; return USE_UDP; } +"--USER-DATA" { yyextra->begin= yytext; return USER_DATA; } +"--VERIFY-KEY" { yyextra->begin= yytext; return VERIFY_KEY; } + +"--POOL-MIN=" { yyextra->begin= yytext; return POOL_MIN; } +"--POOL-MAX=" { yyextra->begin= yytext; return POOL_MAX; } "--NAMESPACE=" { yyextra->begin= yytext; return NAMESPACE; } diff --git a/libmemcached/util/pool.c b/libmemcached/util/pool.c index e8be3c73..fd3f6ffe 100644 --- a/libmemcached/util/pool.c +++ b/libmemcached/util/pool.c @@ -75,25 +75,33 @@ static int grow_pool(memcached_pool_st* pool) static inline memcached_pool_st *_pool_create(memcached_st* mmc, uint32_t initial, uint32_t max) { memcached_pool_st* ret= NULL; + + if (! initial || ! max || initial > max) + { + errno= EINVAL; + return NULL; + } + memcached_pool_st object= { .mutex = PTHREAD_MUTEX_INITIALIZER, - .cond = PTHREAD_COND_INITIALIZER, - .master = mmc, - .mmc = calloc(max, sizeof(memcached_st*)), + .cond= PTHREAD_COND_INITIALIZER, + .master= mmc, + .mmc= calloc(max, sizeof(memcached_st*)), .firstfree= -1, - .size = max, + .size= max, .current_size= 0, ._owns_master= false}; if (object.mmc != NULL) { - ret= calloc(1, sizeof(*ret)); + ret= (memcached_pool_st*)calloc(1, sizeof(memcached_pool_st)); if (ret == NULL) { free(object.mmc); + errno= ENOMEM; // Set this for the failed calloc return NULL; } - *ret = object; + *ret= object; /* Try to create the initial size of the pool. An allocation failure at @@ -123,14 +131,15 @@ memcached_pool_st * memcached_pool(const char *option_string, size_t option_stri return NULL; self= memcached_pool_create(memc, memc->configure.initial_pool_size, memc->configure.max_pool_size); - if (self) - { - self->_owns_master= true; - } - else + if (! self) { memcached_free(memc); + errno= ENOMEM; + return NULL; } + errno= 0; + + self->_owns_master= true; return self; } @@ -166,9 +175,17 @@ memcached_st* memcached_pool_pop(memcached_pool_st* pool, bool block, memcached_return_t *rc) { + if (! pool || ! rc) + { + errno= EINVAL; + return NULL; + } + memcached_st *ret= NULL; if ((*rc= mutex_enter(&pool->mutex)) != MEMCACHED_SUCCESS) + { return NULL; + } do { @@ -209,6 +226,9 @@ memcached_st* memcached_pool_pop(memcached_pool_st* pool, memcached_return_t memcached_pool_push(memcached_pool_st* pool, memcached_st *mmc) { + if (! pool) + return MEMCACHED_INVALID_ARGUMENTS; + memcached_return_t rc= mutex_enter(&pool->mutex); if (rc != MEMCACHED_SUCCESS) @@ -246,6 +266,8 @@ memcached_return_t memcached_pool_behavior_set(memcached_pool_st *pool, memcached_behavior_t flag, uint64_t data) { + if (! pool) + return MEMCACHED_INVALID_ARGUMENTS; memcached_return_t rc= mutex_enter(&pool->mutex); if (rc != MEMCACHED_SUCCESS) @@ -295,8 +317,10 @@ memcached_return_t memcached_pool_behavior_get(memcached_pool_st *pool, memcached_behavior_t flag, uint64_t *value) { - memcached_return_t rc= mutex_enter(&pool->mutex); + if (! pool) + return MEMCACHED_INVALID_ARGUMENTS; + memcached_return_t rc= mutex_enter(&pool->mutex); if (rc != MEMCACHED_SUCCESS) { return rc; diff --git a/tests/parser.cc b/tests/parser.cc index 704a51fc..118c5f93 100644 --- a/tests/parser.cc +++ b/tests/parser.cc @@ -173,34 +173,34 @@ scanner_variable_t bad_test_strings[]= { }; scanner_variable_t test_number_options[]= { - { ARRAY, make_scanner_string("--CONNECT_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--IO_BYTES_WATERMARK=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--IO_KEY_PREFETCH=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--IO_MSG_WATERMARK=456"), make_scanner_string("456"), __check_IO_MSG_WATERMARK }, - { ARRAY, make_scanner_string("--NUMBER_OF_REPLICAS=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--POLL_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--RCV_TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--CONNECT-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--IO-BYTES-WATERMARK=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--IO-KEY-PREFETCH=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--IO-MSG-WATERMARK=456"), make_scanner_string("456"), __check_IO_MSG_WATERMARK }, + { ARRAY, make_scanner_string("--NUMBER-OF-REPLICAS=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--POLL-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--RCV-TIMEOUT=456"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--REMOVE-FAILED-SERVERS=3"), scanner_string_null, __check_REMOVE_FAILED_SERVERS }, - { ARRAY, make_scanner_string("--RETRY_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SND_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SOCKET_RECV_SIZE=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SOCKET_SEND_SIZE=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--RETRY-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SND-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SOCKET-RECV-SIZE=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SOCKET-SEND-SIZE=456"), scanner_string_null, NULL }, { NIL, scanner_string_null, scanner_string_null, NULL} }; scanner_variable_t test_boolean_options[]= { - { ARRAY, make_scanner_string("--BINARY_PROTOCOL"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--BUFFER_REQUESTS"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--HASH_WITH_NAMESPACE"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--BINARY-PROTOCOL"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--BUFFER-REQUESTS"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--HASH-WITH-NAMESPACE"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--NOREPLY"), scanner_string_null, __check_NOREPLY }, - { ARRAY, make_scanner_string("--RANDOMIZE_REPLICA_READ"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SORT_HOSTS"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SUPPORT_CAS"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--TCP_NODELAY"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--TCP_KEEPALIVE"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--TCP_KEEPIDLE"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--USE_UDP"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--VERIFY_KEY"), scanner_string_null, __check_VERIFY_KEY }, + { ARRAY, make_scanner_string("--RANDOMIZE-REPLICA-READ"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SORT-HOSTS"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SUPPORT-CAS"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--TCP-NODELAY"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--TCP-KEEPALIVE"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--TCP-KEEPIDLE"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--USE-UDP"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--VERIFY-KEY"), scanner_string_null, __check_VERIFY_KEY }, { NIL, scanner_string_null, scanner_string_null, NULL} }; diff --git a/tests/pool.cc b/tests/pool.cc index e7929232..ed5016f0 100644 --- a/tests/pool.cc +++ b/tests/pool.cc @@ -48,10 +48,17 @@ test_return_t memcached_pool_test(memcached_st *) { - const char *config_string= "--SERVER=host10.example.com --SERVER=host11.example.com --SERVER=host10.example.com"; + memcached_return_t rc; + const char *config_string= "--SERVER=host10.example.com --SERVER=host11.example.com --SERVER=host10.example.com --POOL-MIN=10 --POOL-MAX=32"; + + char buffer[2048]; + rc= libmemcached_check_configuration(config_string, sizeof(config_string) -1, buffer, sizeof(buffer)); + + test_true_got(rc != MEMCACHED_SUCCESS, buffer); + memcached_pool_st* pool= memcached_pool(config_string, strlen(config_string)); + test_true_got(pool, strerror(errno)); - memcached_return_t rc; memcached_st *memc= memcached_pool_pop(pool, false, &rc); test_true(rc == MEMCACHED_SUCCESS); -- 2.30.2