projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Cleanup for version 0.26
[awesomized/libmemcached]
/
libmemcached
/
memcached_behavior.c
diff --git
a/libmemcached/memcached_behavior.c
b/libmemcached/memcached_behavior.c
index ef4907dd24e02502cd96b69b534421cf3c2e7729..5a992b42b8780e7d7c5ab9b9a32d7fe88f8cc7b2 100644
(file)
--- a/
libmemcached/memcached_behavior.c
+++ b/
libmemcached/memcached_behavior.c
@@
-1,4
+1,5
@@
#include "common.h"
#include "common.h"
+#include <time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/tcp.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/tcp.h>
@@
-23,6
+24,12
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
{
switch (flag)
{
{
switch (flag)
{
+ case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
+ ptr->io_msg_watermark= (int32_t)data;
+ break;
+ case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
+ ptr->io_bytes_watermark= (int32_t)data;
+ break;
case MEMCACHED_BEHAVIOR_SND_TIMEOUT:
ptr->snd_timeout= (int32_t)data;
break;
case MEMCACHED_BEHAVIOR_SND_TIMEOUT:
ptr->snd_timeout= (int32_t)data;
break;
@@
-33,6
+40,8
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
ptr->server_failure_limit= (uint32_t)data;
break;
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
ptr->server_failure_limit= (uint32_t)data;
break;
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
+ if (data)
+ set_behavior_flag(ptr, MEM_VERIFY_KEY, 0);
set_behavior_flag(ptr, MEM_BINARY_PROTOCOL, data);
break;
case MEMCACHED_BEHAVIOR_SUPPORT_CAS:
set_behavior_flag(ptr, MEM_BINARY_PROTOCOL, data);
break;
case MEMCACHED_BEHAVIOR_SUPPORT_CAS:
@@
-52,6
+61,10
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
{
ptr->distribution= (memcached_server_distribution)(data);
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
{
ptr->distribution= (memcached_server_distribution)(data);
+ if (ptr->distribution == MEMCACHED_DISTRIBUTION_RANDOM)
+ {
+ srandom(time(NULL));
+ }
run_distribution(ptr);
break;
}
run_distribution(ptr);
break;
}
@@
-90,6
+103,8
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
memcached_quit(ptr);
break;
case MEMCACHED_BEHAVIOR_VERIFY_KEY:
memcached_quit(ptr);
break;
case MEMCACHED_BEHAVIOR_VERIFY_KEY:
+ if (ptr->flags & MEM_BINARY_PROTOCOL)
+ break;
set_behavior_flag(ptr, MEM_VERIFY_KEY, data);
break;
case MEMCACHED_BEHAVIOR_SORT_HOSTS:
set_behavior_flag(ptr, MEM_VERIFY_KEY, data);
break;
case MEMCACHED_BEHAVIOR_SORT_HOSTS:
@@
-118,6
+133,12
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
break;
case MEMCACHED_BEHAVIOR_USER_DATA:
return MEMCACHED_FAILURE;
break;
case MEMCACHED_BEHAVIOR_USER_DATA:
return MEMCACHED_FAILURE;
+ case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
+ set_behavior_flag(ptr, MEM_HASH_WITH_PREFIX_KEY, data);
+ break;
+ case MEMCACHED_BEHAVIOR_NOREPLY:
+ set_behavior_flag(ptr, MEM_NOREPLY, data);
+ break;
}
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
@@
-130,6
+151,12
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
switch (flag)
{
switch (flag)
{
+ case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
+ temp_flag = ptr->io_msg_watermark;
+ break;
+ case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
+ temp_flag = ptr->io_bytes_watermark;
+ break;
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
temp_flag= MEM_BINARY_PROTOCOL;
break;
case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
temp_flag= MEM_BINARY_PROTOCOL;
break;
@@
-217,6
+244,12
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
}
case MEMCACHED_BEHAVIOR_USER_DATA:
return MEMCACHED_FAILURE;
}
case MEMCACHED_BEHAVIOR_USER_DATA:
return MEMCACHED_FAILURE;
+ case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
+ temp_flag= MEM_HASH_WITH_PREFIX_KEY;
+ break;
+ case MEMCACHED_BEHAVIOR_NOREPLY:
+ temp_flag= MEM_NOREPLY;
+ break;
}
WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */
}
WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */
@@
-224,6
+257,4
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
return 1;
else
return 0;
return 1;
else
return 0;
-
- return MEMCACHED_SUCCESS;
}
}