projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Adding new memcached_clone() function
[m6w6/libmemcached]
/
lib
/
memcached_io.c
diff --git
a/lib/memcached_io.c
b/lib/memcached_io.c
index 77541e2ad9d3463e013553a5bc8ed344ef0d61e2..d2c803f3dd690393431a3b3af3a358a45324edf4 100644
(file)
--- a/
lib/memcached_io.c
+++ b/
lib/memcached_io.c
@@
-7,7
+7,7
@@
#include <sys/select.h>
#include <poll.h>
#include <sys/select.h>
#include <poll.h>
-int io_wait(memcached_st *ptr, unsigned int server_key, unsigned read_or_write)
+
static
int io_wait(memcached_st *ptr, unsigned int server_key, unsigned read_or_write)
{
struct pollfd fds[1];
short flags= 0;
{
struct pollfd fds[1];
short flags= 0;
@@
-51,9
+51,9
@@
ssize_t memcached_io_read(memcached_st *ptr, unsigned int server_key,
return -1;
}
return -1;
}
- data_read= re
cv
(ptr->hosts[server_key].fd,
+ data_read= re
ad
(ptr->hosts[server_key].fd,
ptr->read_buffer,
ptr->read_buffer,
- MEMCACHED_MAX_BUFFER
, 0
);
+ MEMCACHED_MAX_BUFFER);
if (data_read == -1)
{
switch (errno)
if (data_read == -1)
{
switch (errno)
@@
-102,7
+102,7
@@
ssize_t memcached_io_write(memcached_st *ptr, unsigned int server_key,
sent_length= memcached_io_flush(ptr, server_key);
sent_length= memcached_io_flush(ptr, server_key);
-
assert
(sent_length == MEMCACHED_MAX_BUFFER);
+
WATCHPOINT_ASSERT
(sent_length == MEMCACHED_MAX_BUFFER);
ptr->write_buffer_offset= 0;
}
}
ptr->write_buffer_offset= 0;
}
}
@@
-119,6
+119,7
@@
ssize_t memcached_io_write(memcached_st *ptr, unsigned int server_key,
ssize_t memcached_io_flush(memcached_st *ptr, unsigned int server_key)
{
size_t sent_length;
ssize_t memcached_io_flush(memcached_st *ptr, unsigned int server_key)
{
size_t sent_length;
+ size_t return_length;
char *write_ptr= ptr->write_buffer;
size_t write_length= ptr->write_buffer_offset;
unsigned int loop= 1;
char *write_ptr= ptr->write_buffer;
size_t write_length= ptr->write_buffer_offset;
unsigned int loop= 1;
@@
-126,6
+127,7
@@
ssize_t memcached_io_flush(memcached_st *ptr, unsigned int server_key)
if (ptr->write_buffer_offset == 0)
return 0;
if (ptr->write_buffer_offset == 0)
return 0;
+ return_length= 0;
while (write_length)
{
if (ptr->flags & MEM_NO_BLOCK)
while (write_length)
{
if (ptr->flags & MEM_NO_BLOCK)
@@
-138,14
+140,16
@@
ssize_t memcached_io_flush(memcached_st *ptr, unsigned int server_key)
}
sent_length= 0;
}
sent_length= 0;
- if ((sent_length= write(ptr->hosts[server_key].fd, write_ptr,
- write_length)) == -1)
+ if ((s
size_t)(s
ent_length= write(ptr->hosts[server_key].fd, write_ptr,
+
write_length)) == -1)
{
switch (errno)
{
case ENOBUFS:
case EAGAIN:
{
switch (errno)
{
case ENOBUFS:
case EAGAIN:
- if (loop < 10)
+ WATCHPOINT;
+ continue;
+ if (loop < 100)
{
loop++;
break;
{
loop++;
break;
@@
-156,16
+160,17
@@
ssize_t memcached_io_flush(memcached_st *ptr, unsigned int server_key)
return -1;
}
}
return -1;
}
}
- else
- {
- write_ptr+= sent_length;
- write_length-= sent_length;
- }
+
+ write_ptr+= sent_length;
+ write_length-= sent_length;
+ return_length+= sent_length;
}
}
+ WATCHPOINT_ASSERT(write_length == 0);
+ WATCHPOINT_ASSERT(return_length == ptr->write_buffer_offset);
ptr->write_buffer_offset= 0;
ptr->write_buffer_offset= 0;
- return
sent
_length;
+ return
return
_length;
}
/*
}
/*