projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix io_read bug
[awesomized/libmemcached]
/
libmemcached
/
memcached_io.c
diff --git
a/libmemcached/memcached_io.c
b/libmemcached/memcached_io.c
index ddca197260f818de70c5e04e6e60a553479f1b8e..7ed2a403f58563f375c8cd04424308a4de86e0b3 100644
(file)
--- a/
libmemcached/memcached_io.c
+++ b/
libmemcached/memcached_io.c
@@
-112,6
+112,7
@@
ssize_t memcached_io_read(memcached_server_st *ptr,
switch (errno)
{
case EAGAIN:
switch (errno)
{
case EAGAIN:
+ case EINTR:
{
memcached_return rc;
{
memcached_return rc;
@@
-232,7
+233,10
@@
memcached_return memcached_io_close(memcached_server_st *ptr)
#endif
r= close(ptr->fd);
#endif
r= close(ptr->fd);
- WATCHPOINT_ASSERT(r == 0);
+#ifdef HAVE_DEBUG
+ if (r != 0)
+ WATCHPOINT_ERRNO(errno);
+#endif
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
@@
-334,7
+338,8
@@
static ssize_t io_flush(memcached_server_st *ptr,
}
WATCHPOINT_ASSERT(write_length == 0);
}
WATCHPOINT_ASSERT(write_length == 0);
- WATCHPOINT_ASSERT(return_length == ptr->write_buffer_offset);
+ // Need to study this assert() WATCHPOINT_ASSERT(return_length ==
+ // ptr->write_buffer_offset);
ptr->write_buffer_offset= 0;
return return_length;
ptr->write_buffer_offset= 0;
return return_length;