projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in code such that we are much closer to running the same test
[awesomized/libmemcached]
/
libmemcached
/
options
/
parser.yy
diff --git
a/libmemcached/options/parser.yy
b/libmemcached/options/parser.yy
index 0f0aee65a459115f6da1f104b3198888bde67029..722ced5f9db6ffd41669cd9a96336f0624671ea7 100644
(file)
--- a/
libmemcached/options/parser.yy
+++ b/
libmemcached/options/parser.yy
@@
-39,14
+39,14
@@
#include <stdint.h>
#include <stdint.h>
+#include <libmemcached/common.h>
+#include <libmemcached/options.hpp>
+
#include <libmemcached/options/context.h>
#include <libmemcached/options/context.h>
-#include <libmemcached/options/string.h>
#include <libmemcached/options/symbol.h>
#include <libmemcached/options/symbol.h>
-#include <libmemcached/visibility.h>
-#include <libmemcached/prefix_key.h>
+#include <libmemcached/options/scanner.h>
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wold-style-cast"
-#include <libmemcached/options/scanner.h>
int conf_lex(YYSTYPE* lvalp, void* scanner);
int conf_lex(YYSTYPE* lvalp, void* scanner);
@@
-108,6
+108,10
@@
inline void config_error(Context *context, yyscan_t *scanner, const char *error)
/* Callbacks */
%token NAMESPACE
/* Callbacks */
%token NAMESPACE
+/* Pool */
+%token POOL_MIN
+%token POOL_MAX
+
/* Hash types */
%token MD5
%token CRC
/* Hash types */
%token MD5
%token CRC
@@
-133,19
+137,21
@@
inline void config_error(Context *context, yyscan_t *scanner, const char *error)
%token <number> FLOAT
%token <number> NUMBER
%token <number> FLOAT
%token <number> NUMBER
-%token PORT
-%token WEIGHT_START
+%token
<number>
PORT
+%token
<number>
WEIGHT_START
%token <server> IPADDRESS
%token <server> HOSTNAME
%token <string> STRING
%token <string> QUOTED_STRING
%token <string> FILE_PATH
%token <server> IPADDRESS
%token <server> HOSTNAME
%token <string> STRING
%token <string> QUOTED_STRING
%token <string> FILE_PATH
-%type <string> string
-%type <distribution> distribution
-%type <hash> hash
%type <behavior> behavior_boolean
%type <behavior> behavior_number
%type <behavior> behavior_boolean
%type <behavior> behavior_number
+%type <distribution> distribution
+%type <hash> hash
+%type <number> optional_port
+%type <number> optional_weight
+%type <string> string
%%
%%
@@
-181,7
+187,7
@@
statement:
}
| INCLUDE ' ' string
{
}
| INCLUDE ' ' string
{
- if ((context->rc= memcached_parse_configure_file(
context->memc, $3.c_str, $3.length
)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_parse_configure_file(
*context->memc, $3.c_str, $3.size
)) != MEMCACHED_SUCCESS)
{
parser_abort(context, NULL);
}
{
parser_abort(context, NULL);
}
@@
-192,7
+198,7
@@
statement:
expression:
SERVER HOSTNAME optional_port optional_weight
{
expression:
SERVER HOSTNAME optional_port optional_weight
{
- if (
(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $2.port, $2.weight)) != MEMCACHED_SUCCESS
)
+ if (
memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, $4))
)
{
parser_abort(context, NULL);
}
{
parser_abort(context, NULL);
}
@@
-200,7
+206,7
@@
expression:
}
| SERVER IPADDRESS optional_port optional_weight
{
}
| SERVER IPADDRESS optional_port optional_weight
{
- if (
(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $2.port, $2.weight)) != MEMCACHED_SUCCESS
)
+ if (
memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, $4))
)
{
parser_abort(context, NULL);
}
{
parser_abort(context, NULL);
}
@@
-208,7
+214,15
@@
expression:
}
| CONFIGURE_FILE string
{
}
| CONFIGURE_FILE string
{
- memcached_set_configuration_file(context->memc, $2.c_str, $2.length);
+ memcached_set_configuration_file(context->memc, $2.c_str, $2.size);
+ }
+ | POOL_MIN NUMBER
+ {
+ context->memc->configure.initial_pool_size= $2;
+ }
+ | POOL_MAX NUMBER
+ {
+ context->memc->configure.max_pool_size= $2;
}
| behaviors
;
}
| behaviors
;
@@
-216,7
+230,7
@@
expression:
behaviors:
NAMESPACE string
{
behaviors:
NAMESPACE string
{
- if ((context->rc= memcached_set_prefix_key(context->memc, $2.c_str, $2.
length
)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_set_prefix_key(context->memc, $2.c_str, $2.
size
)) != MEMCACHED_SUCCESS)
{
parser_abort(context, NULL);;
}
{
parser_abort(context, NULL);;
}
@@
-368,13
+382,13
@@
behavior_boolean:
optional_port:
optional_port:
- { }
+ {
$$= MEMCACHED_DEFAULT_PORT;
}
| PORT
{ };
;
optional_weight:
| PORT
{ };
;
optional_weight:
- { }
+ {
$$= 1;
}
| WEIGHT_START
{ }
;
| WEIGHT_START
{ }
;
@@
-426,7
+440,7
@@
string:
| QUOTED_STRING
{
$$.c_str= $1.c_str +1; // +1 to move use passed the initial quote
| QUOTED_STRING
{
$$.c_str= $1.c_str +1; // +1 to move use passed the initial quote
- $$.
length= $1.length -1; // -1 removes the
end quote
+ $$.
size= $1.size -2; // -2 removes the begin and
end quote
}
;
}
;