projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Refactor test system to give me times on calling tests (frankly I still need
[m6w6/libmemcached]
/
lib
/
memcached_response.c
diff --git
a/lib/memcached_response.c
b/lib/memcached_response.c
index 24ee832f148a593ab9791f049abb1308d2170aad..d0962a2d759e27b27839181d14251f81f02a89e8 100644
(file)
--- a/
lib/memcached_response.c
+++ b/
lib/memcached_response.c
@@
-6,32
+6,48
@@
*/
#include "common.h"
*/
#include "common.h"
+#include "memcached_io.h"
memcached_return memcached_response(memcached_st *ptr,
char *buffer, size_t buffer_length,
unsigned int server_key)
{
memcached_return memcached_response(memcached_st *ptr,
char *buffer, size_t buffer_length,
unsigned int server_key)
{
+ unsigned int x;
size_t send_length;
char *buffer_ptr;
size_t send_length;
char *buffer_ptr;
+ unsigned int max_messages;
+
memset(buffer, 0, buffer_length);
send_length= 0;
memset(buffer, 0, buffer_length);
send_length= 0;
-
buffer_ptr= buffer
;
-
while (1
)
+
max_messages= memcached_server_response_count(ptr, server_key)
;
+
for (x= 0; x <= max_messages; x++
)
{
{
- unsigned int read_length;
+ size_t total_length= 0;
+ buffer_ptr= buffer;
+
+ while (1)
+ {
+ unsigned int read_length;
+
+ read_length= memcached_io_read(ptr, server_key,
+ buffer_ptr, 1);
- read_length= memcached_io_read(ptr, server_key,
-
buffer_ptr, 1)
;
+ if (read_length != 1)
+
return MEMCACHED_UNKNOWN_READ_FAILURE
;
- if (read_length != 1)
- return MEMCACHED_UNKNOWN_READ_FAILURE;
+ if (*buffer_ptr == '\n')
+ break;
+ else
+ buffer_ptr++;
+
+ total_length++;
+ assert(total_length < buffer_length);
+ }
- if (*buffer_ptr == '\n')
- break;
- else
- buffer_ptr++;
+ if (memcached_server_response_count(ptr, server_key))
+ memcached_server_response_decrement(ptr, server_key);
}
switch(buffer[0])
}
switch(buffer[0])
@@
-42,10
+58,12
@@
memcached_return memcached_response(memcached_st *ptr,
return MEMCACHED_SUCCESS;
case 'S': /* STORED STATS SERVER_ERROR */
{
return MEMCACHED_SUCCESS;
case 'S': /* STORED STATS SERVER_ERROR */
{
- if (buffer[
1] == 'T
') /* STORED STATS */
- return MEMCACHED_S
UCCESS
;
+ if (buffer[
2] == 'A
') /* STORED STATS */
+ return MEMCACHED_S
TAT
;
else if (buffer[1] == 'E')
return MEMCACHED_SERVER_ERROR;
else if (buffer[1] == 'E')
return MEMCACHED_SERVER_ERROR;
+ else if (buffer[1] == 'T')
+ return MEMCACHED_STORED;
else
return MEMCACHED_UNKNOWN_READ_FAILURE;
}
else
return MEMCACHED_UNKNOWN_READ_FAILURE;
}