break;
case MEMCACHED_BEHAVIOR_NO_BLOCK:
set_behavior_flag(ptr, MEM_NO_BLOCK, data);
+ case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
+ set_behavior_flag(ptr, MEM_BUFFER_REQUESTS, data);
break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
set_behavior_flag(ptr, MEM_TCP_NODELAY, data);
break;
+ case MEMCACHED_BEHAVIOR_DISTRIBUTION:
+ ptr->distribution= *(memcached_server_distribution *)(data);
+ break;
case MEMCACHED_BEHAVIOR_HASH:
ptr->hash= *(memcached_hash *)(data);
break;
case MEMCACHED_BEHAVIOR_KETAMA:
set_behavior_flag(ptr, MEM_USE_KETAMA, data);
break;
+ case MEMCACHED_BEHAVIOR_USER_DATA:
+ ptr->user_data= data;
+ break;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
- unsigned int timeout= (*((unsigned int *)data));
+ int32_t timeout= (*((int32_t *)data));
ptr->poll_timeout= timeout;
break;
case MEMCACHED_BEHAVIOR_NO_BLOCK:
temp_flag= MEM_NO_BLOCK;
break;
+ case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
+ temp_flag= MEM_BUFFER_REQUESTS;
+ break;
case MEMCACHED_BEHAVIOR_TCP_NODELAY:
temp_flag= MEM_TCP_NODELAY;
break;
+ case MEMCACHED_BEHAVIOR_DISTRIBUTION:
+ return ptr->distribution;
case MEMCACHED_BEHAVIOR_HASH:
return ptr->hash;
case MEMCACHED_BEHAVIOR_KETAMA:
temp_flag= MEM_USE_KETAMA;
break;
+ case MEMCACHED_BEHAVIOR_USER_DATA:
+ return 0;
+ //return (unsigned long long)ptr->user_data;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
return (unsigned long long)ptr->poll_timeout;
int sock_size;
socklen_t sock_length= sizeof(int);
+ /* REFACTOR */
/* We just try the first host, and if it is down we return zero */
- if ((memcached_connect(ptr, 0)) != MEMCACHED_SUCCESS)
+ if ((memcached_connect(&ptr->hosts[0])) != MEMCACHED_SUCCESS)
return 0;
if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET,
int sock_size;
socklen_t sock_length= sizeof(int);
+ /* REFACTOR */
/* We just try the first host, and if it is down we return zero */
- if ((memcached_connect(ptr, 0)) != MEMCACHED_SUCCESS)
+ if ((memcached_connect(&ptr->hosts[0])) != MEMCACHED_SUCCESS)
return 0;
if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET,