projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Refactored all of the IO commands to pass only server structures (this is an
[m6w6/libmemcached]
/
lib
/
memcached_behavior.c
diff --git
a/lib/memcached_behavior.c
b/lib/memcached_behavior.c
index 31d8f0525c7fe6e8983aa19052bec8805097478d..62b767f7b037a85ca473d142fec64e044ba58204 100644
(file)
--- a/
lib/memcached_behavior.c
+++ b/
lib/memcached_behavior.c
@@
-49,6
+49,9
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_KETAMA:
set_behavior_flag(ptr, MEM_USE_KETAMA, 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:
{
int32_t timeout= (*((int32_t *)data));
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
int32_t timeout= (*((int32_t *)data));
@@
-104,6
+107,9
@@
unsigned long long memcached_behavior_get(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_KETAMA:
temp_flag= MEM_USE_KETAMA;
break;
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;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
return (unsigned long long)ptr->poll_timeout;
@@
-113,8
+119,9
@@
unsigned long long memcached_behavior_get(memcached_st *ptr,
int sock_size;
socklen_t sock_length= sizeof(int);
int sock_size;
socklen_t sock_length= sizeof(int);
+ /* REFACTOR */
/* We just try the first host, and if it is down we return zero */
/* 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,
return 0;
if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET,
@@
-128,8
+135,9
@@
unsigned long long memcached_behavior_get(memcached_st *ptr,
int sock_size;
socklen_t sock_length= sizeof(int);
int sock_size;
socklen_t sock_length= sizeof(int);
+ /* REFACTOR */
/* We just try the first host, and if it is down we return zero */
/* 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,
return 0;
if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET,