projects
/
awesomized
/
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
[awesomized/libmemcached]
/
lib
/
memcached_fetch.c
diff --git
a/lib/memcached_fetch.c
b/lib/memcached_fetch.c
index 257bfbc45245119d7bdbb0a25712089a10712e44..791791149a574f8dbdb9f4a5d3a7fd836cf7c204 100644
(file)
--- a/
lib/memcached_fetch.c
+++ b/
lib/memcached_fetch.c
@@
-1,12
+1,11
@@
#include "common.h"
#include "memcached_io.h"
#include "common.h"
#include "memcached_io.h"
-memcached_return value_fetch(memcached_st *ptr,
+memcached_return value_fetch(memcached_s
erver_s
t *ptr,
char *buffer,
char *buffer,
- memcached_result_st *result,
- unsigned int server_key)
+ memcached_result_st *result)
{
{
- memcached_return rc;
+ memcached_return rc
= MEMCACHED_SUCCESS
;
char *string_ptr;
char *end_ptr;
char *next_ptr;
char *string_ptr;
char *end_ptr;
char *next_ptr;
@@
-104,8
+103,7
@@
memcached_return value_fetch(memcached_st *ptr,
*/
to_read= (value_length) + 2;
*/
to_read= (value_length) + 2;
- read_length= memcached_io_read(ptr, server_key,
- value_ptr, to_read);
+ read_length= memcached_io_read(ptr, value_ptr, to_read);
if (read_length != (size_t)(value_length + 2))
{
if (read_length != (size_t)(value_length + 2))
{
@@
-141,17
+139,17
@@
char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
- if (memcached_server_response_count(
ptr, ptr->cursor_server
) == 0)
+ if (memcached_server_response_count(
&ptr->hosts[ptr->cursor_server]
) == 0)
{
ptr->cursor_server++;
continue;
}
{
ptr->cursor_server++;
continue;
}
- *error= memcached_response(
ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result_buffer, ptr->cursor_serv
er);
+ *error= memcached_response(
&ptr->hosts[ptr->cursor_server], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result_buff
er);
if (*error == MEMCACHED_END) /* END means that we move on to the next */
{
if (*error == MEMCACHED_END) /* END means that we move on to the next */
{
- memcached_server_response_reset(
ptr, ptr->cursor_server
);
+ memcached_server_response_reset(
&ptr->hosts[ptr->cursor_server]
);
ptr->cursor_server++;
continue;
}
ptr->cursor_server++;
continue;
}
@@
-189,24
+187,26
@@
memcached_result_st *memcached_fetch_result(memcached_st *ptr,
WATCHPOINT_ASSERT(result->value.is_allocated != MEMCACHED_USED);
WATCHPOINT_ASSERT(result->value.is_allocated != MEMCACHED_USED);
+#ifdef UNUSED
if (ptr->flags & MEM_NO_BLOCK)
memcached_io_preread(ptr);
if (ptr->flags & MEM_NO_BLOCK)
memcached_io_preread(ptr);
+#endif
while (ptr->cursor_server < ptr->number_of_hosts)
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
while (ptr->cursor_server < ptr->number_of_hosts)
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
- if (memcached_server_response_count(
ptr, ptr->cursor_server
) == 0)
+ if (memcached_server_response_count(
&ptr->hosts[ptr->cursor_server]
) == 0)
{
ptr->cursor_server++;
continue;
}
{
ptr->cursor_server++;
continue;
}
- *error= memcached_response(
ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result, ptr->cursor_server
);
+ *error= memcached_response(
&ptr->hosts[ptr->cursor_server], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result
);
if (*error == MEMCACHED_END) /* END means that we move on to the next */
{
if (*error == MEMCACHED_END) /* END means that we move on to the next */
{
- memcached_server_response_reset(
ptr, ptr->cursor_server
);
+ memcached_server_response_reset(
&ptr->hosts[ptr->cursor_server]
);
ptr->cursor_server++;
continue;
}
ptr->cursor_server++;
continue;
}