projects
/
awesomized
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
ea51827
)
Refactor: memcached_io_read should return memcached_return error codes
author
Trond Norbye
<trond.norbye@sun.com>
Sat, 2 May 2009 06:54:30 +0000
(23:54 -0700)
committer
Trond Norbye
<trond.norbye@sun.com>
Sat, 2 May 2009 06:54:30 +0000
(23:54 -0700)
libmemcached/memcached_io.c
patch
|
blob
|
history
libmemcached/memcached_io.h
patch
|
blob
|
history
libmemcached/memcached_quit.c
patch
|
blob
|
history
libmemcached/memcached_response.c
patch
|
blob
|
history
tests/function.c
patch
|
blob
|
history
diff --git
a/libmemcached/memcached_io.c
b/libmemcached/memcached_io.c
index 3f184e068624fbbde7c876dd5554a96f61860855..95774865445ced3318f32cb26cea51da29a7809c 100644
(file)
--- a/
libmemcached/memcached_io.c
+++ b/
libmemcached/memcached_io.c
@@
-90,8
+90,8
@@
void memcached_io_preread(memcached_st *ptr)
}
#endif
}
#endif
-
ssize_t
memcached_io_read(memcached_server_st *ptr,
-
void *buffer, size_t length
)
+
memcached_return
memcached_io_read(memcached_server_st *ptr,
+
void *buffer, size_t length, ssize_t *nread
)
{
char *buffer_ptr;
{
char *buffer_ptr;
@@
-105,26
+105,26
@@
ssize_t memcached_io_read(memcached_server_st *ptr,
while (1)
{
while (1)
{
- data_read= read(ptr->fd,
- ptr->read_buffer,
- MEMCACHED_MAX_BUFFER);
+ data_read= read(ptr->fd, ptr->read_buffer, MEMCACHED_MAX_BUFFER);
if (data_read > 0)
break;
else if (data_read == -1)
{
ptr->cached_errno= errno;
if (data_read > 0)
break;
else if (data_read == -1)
{
ptr->cached_errno= errno;
+ memcached_return rc= MEMCACHED_UNKNOWN_READ_FAILURE;
switch (errno)
{
case EAGAIN:
case EINTR:
switch (errno)
{
case EAGAIN:
case EINTR:
- if (
io_wait(ptr, MEM_READ
) == MEMCACHED_SUCCESS)
+ if (
(rc= io_wait(ptr, MEM_READ)
) == MEMCACHED_SUCCESS)
continue;
/* fall through */
default:
{
memcached_quit_server(ptr, 1);
continue;
/* fall through */
default:
{
memcached_quit_server(ptr, 1);
- return -1;
+ *nread= -1;
+ return rc;
}
}
}
}
}
}
@@
-140,7
+140,8
@@
ssize_t memcached_io_read(memcached_server_st *ptr,
it will return EGAIN if data is not immediatly available.
*/
memcached_quit_server(ptr, 1);
it will return EGAIN if data is not immediatly available.
*/
memcached_quit_server(ptr, 1);
- return -1;
+ *nread= -1;
+ return MEMCACHED_UNKNOWN_READ_FAILURE;
}
}
}
}
@@
-173,7
+174,8
@@
ssize_t memcached_io_read(memcached_server_st *ptr,
}
ptr->server_failure_counter= 0;
}
ptr->server_failure_counter= 0;
- return (size_t)(buffer_ptr - (char*)buffer);
+ *nread = (size_t)(buffer_ptr - (char*)buffer);
+ return MEMCACHED_SUCCESS;
}
ssize_t memcached_io_write(memcached_server_st *ptr,
}
ssize_t memcached_io_write(memcached_server_st *ptr,
@@
-443,12
+445,12
@@
memcached_return memcached_safe_read(memcached_server_st *ptr,
while (offset < size)
{
while (offset < size)
{
- ssize_t nread
= memcached_io_read(ptr, data + offset, size - offset)
;
- if (nread <= 0)
- {
- memcached_io_reset(ptr);
- return
MEMCACHED_UNKNOWN_READ_FAILURE
;
- }
+ ssize_t nread;
+ memcached_return rc= memcached_io_read(ptr, data + offset, size - offset,
+ &nread);
+ if (rc != MEMCACHED_SUCCESS)
+ return
rc
;
+
offset+= nread;
}
offset+= nread;
}
@@
-471,8
+473,10
@@
memcached_return memcached_io_readline(memcached_server_st *ptr,
* buffer. Call the standard read function to avoid duplicating
* the logic.
*/
* buffer. Call the standard read function to avoid duplicating
* the logic.
*/
- if (memcached_io_read(ptr, buffer_ptr, 1) != 1)
- return MEMCACHED_UNKNOWN_READ_FAILURE;
+ ssize_t nread;
+ memcached_return rc= memcached_io_read(ptr, buffer_ptr, 1, &nread);
+ if (rc != MEMCACHED_SUCCESS)
+ return rc;
if (*buffer_ptr == '\n')
line_complete= true;
if (*buffer_ptr == '\n')
line_complete= true;
diff --git
a/libmemcached/memcached_io.h
b/libmemcached/memcached_io.h
index 5442277447d658020b5a66a28427fad353bd04d8..372357a937b7d30000d09cadd945b3ab91936176 100644
(file)
--- a/
libmemcached/memcached_io.h
+++ b/
libmemcached/memcached_io.h
@@
-26,8
+26,8
@@
struct udp_datagram_header_st {
ssize_t memcached_io_write(memcached_server_st *ptr,
const void *buffer, size_t length, char with_flush);
void memcached_io_reset(memcached_server_st *ptr);
ssize_t memcached_io_write(memcached_server_st *ptr,
const void *buffer, size_t length, char with_flush);
void memcached_io_reset(memcached_server_st *ptr);
-
ssize_t
memcached_io_read(memcached_server_st *ptr,
-
void *buffer, size_t length
);
+
memcached_return
memcached_io_read(memcached_server_st *ptr,
+
void *buffer, size_t length, ssize_t *nread
);
/* Read a line (terminated by '\n') into the buffer */
memcached_return memcached_io_readline(memcached_server_st *ptr,
char *buffer_ptr,
/* Read a line (terminated by '\n') into the buffer */
memcached_return memcached_io_readline(memcached_server_st *ptr,
char *buffer_ptr,
diff --git
a/libmemcached/memcached_quit.c
b/libmemcached/memcached_quit.c
index c93cb1883ac17dbadfe818a02fe43caf3dbe926c..c202d43365debe8817580ad344f7cb6bdc6d5694 100644
(file)
--- a/
libmemcached/memcached_quit.c
+++ b/
libmemcached/memcached_quit.c
@@
-16,7
+16,6
@@
void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
if (io_death == 0 && ptr->type != MEMCACHED_CONNECTION_UDP)
{
memcached_return rc;
if (io_death == 0 && ptr->type != MEMCACHED_CONNECTION_UDP)
{
memcached_return rc;
- ssize_t read_length;
char buffer[MEMCACHED_MAX_BUFFER];
if (ptr->root->flags & MEM_BINARY_PROTOCOL)
char buffer[MEMCACHED_MAX_BUFFER];
if (ptr->root->flags & MEM_BINARY_PROTOCOL)
@@
-37,9
+36,9
@@
void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
* results in server throwing away all data which is
* not read
*/
* results in server throwing away all data which is
* not read
*/
- while ((read_length=
- memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer)))
-
> 0
);
+ ssize_t nread;
+ while (memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer),
+
&nread) == MEMCACHED_SUCCESS
);
}
memcached_io_close(ptr);
}
memcached_io_close(ptr);
diff --git
a/libmemcached/memcached_response.c
b/libmemcached/memcached_response.c
index 554169300fa61a279029d903a7359bb2a16a62c4..845052db865d3e058b791a4ffe5f0ffe58779d76 100644
(file)
--- a/
libmemcached/memcached_response.c
+++ b/
libmemcached/memcached_response.c
@@
-80,7
+80,6
@@
static memcached_return textual_value_fetch(memcached_server_st *ptr,
char *end_ptr;
char *next_ptr;
size_t value_length;
char *end_ptr;
char *next_ptr;
size_t value_length;
- size_t read_length;
size_t to_read;
char *value_ptr;
size_t to_read;
char *value_ptr;
@@
-167,7
+166,6
@@
static memcached_return textual_value_fetch(memcached_server_st *ptr,
}
value_ptr= memcached_string_value(&result->value);
}
value_ptr= memcached_string_value(&result->value);
- read_length= 0;
/*
We read the \r\n into the string since not doing so is more
cycles then the waster of memory to do so.
/*
We read the \r\n into the string since not doing so is more
cycles then the waster of memory to do so.
@@
-176,7
+174,11
@@
static memcached_return textual_value_fetch(memcached_server_st *ptr,
some people lazy about using the return length.
*/
to_read= (value_length) + 2;
some people lazy about using the return length.
*/
to_read= (value_length) + 2;
- read_length= memcached_io_read(ptr, value_ptr, to_read);
+ ssize_t read_length= 0;
+ memcached_return rrc= memcached_io_read(ptr, value_ptr, to_read, &read_length);
+ if (rrc != MEMCACHED_SUCCESS)
+ return rrc;
+
if (read_length != (size_t)(value_length + 2))
{
goto read_error;
if (read_length != (size_t)(value_length + 2))
{
goto read_error;
diff --git
a/tests/function.c
b/tests/function.c
index 182aa8c35bce03f86f12fe71b5e38767d354e797..485a95ccdd448e0efff7101ed4de63fa4cf24b2c 100644
(file)
--- a/
tests/function.c
+++ b/
tests/function.c
@@
-2020,9
+2020,10
@@
static test_return user_supplied_bug10(memcached_st *memc)
{
rc= memcached_set(mclone, key, key_len,value, value_length, 0, 0);
{
rc= memcached_set(mclone, key, key_len,value, value_length, 0, 0);
- assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_BUFFERED);
+ assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE ||
+ rc == MEMCACHED_BUFFERED || rc == MEMCACHED_TIMEOUT);
- if (rc == MEMCACHED_WRITE_FAILURE)
+ if (rc == MEMCACHED_WRITE_FAILURE
|| rc == MEMCACHED_TIMEOUT
)
x--;
}
x--;
}