projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in bug fix for 456080.
[m6w6/libmemcached]
/
libmemcached
/
io.c
diff --git
a/libmemcached/io.c
b/libmemcached/io.c
index 167b3e6b0d7f521aac98f3070e7d53877a54cee9..e94c136f0c5785c9886f8cd18b2884beb5502b6e 100644
(file)
--- a/
libmemcached/io.c
+++ b/
libmemcached/io.c
@@
-105,6
+105,11
@@
static memcached_return_t io_wait(memcached_server_write_instance_st ptr,
return MEMCACHED_FAILURE;
}
return MEMCACHED_FAILURE;
}
+memcached_return_t memcached_io_wait_for_write(memcached_server_write_instance_st ptr)
+{
+ return io_wait(ptr, MEM_WRITE);
+}
+
/**
* Try to fill the input buffer for a server with as much
* data as possible.
/**
* Try to fill the input buffer for a server with as much
* data as possible.
@@
-382,7
+387,6
@@
static ssize_t _io_write(memcached_server_write_instance_st ptr,
should_write= length;
if (ptr->write_buffer_offset + should_write > buffer_end)
{
should_write= length;
if (ptr->write_buffer_offset + should_write > buffer_end)
{
- fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
return -1;
}
}
return -1;
}
}
@@
-425,7
+429,6
@@
static ssize_t _io_write(memcached_server_write_instance_st ptr,
WATCHPOINT_ASSERT(ptr->fd != INVALID_SOCKET);
if (io_flush(ptr, &rc) == -1)
{
WATCHPOINT_ASSERT(ptr->fd != INVALID_SOCKET);
if (io_flush(ptr, &rc) == -1)
{
- fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
return -1;
}
return -1;
}
@@
-577,7
+580,6
@@
static ssize_t io_flush(memcached_server_write_instance_st ptr,
if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_STORED)
{
if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_STORED)
{
- fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
return -1;
}
}
return -1;
}
}
@@
-593,7
+595,6
@@
static ssize_t io_flush(memcached_server_write_instance_st ptr,
// UDP Sanity check, make sure that we are not sending somthing too big
if (ptr->type == MEMCACHED_CONNECTION_UDP && write_length > MAX_UDP_DATAGRAM_LENGTH)
{
// UDP Sanity check, make sure that we are not sending somthing too big
if (ptr->type == MEMCACHED_CONNECTION_UDP && write_length > MAX_UDP_DATAGRAM_LENGTH)
{
- fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
return -1;
}
return -1;
}
@@
-617,6
+618,7
@@
static ssize_t io_flush(memcached_server_write_instance_st ptr,
if (ptr->type == MEMCACHED_CONNECTION_UDP)
increment_udp_message_id(ptr);
if (ptr->type == MEMCACHED_CONNECTION_UDP)
increment_udp_message_id(ptr);
+ WATCHPOINT_ASSERT(ptr->fd != -1);
sent_length= send(ptr->fd, local_write_ptr, write_length, 0);
if (sent_length == SOCKET_ERROR)
{
sent_length= send(ptr->fd, local_write_ptr, write_length, 0);
if (sent_length == SOCKET_ERROR)
{
@@
-651,14
+653,14
@@
static ssize_t io_flush(memcached_server_write_instance_st ptr,
continue;
memcached_quit_server(ptr, true);
continue;
memcached_quit_server(ptr, true);
- fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
return -1;
}
case ENOTCONN:
return -1;
}
case ENOTCONN:
+ case EPIPE:
default:
default:
- fprintf(stderr, "%s:%d (%s)(%s)\n", __FILE__, __LINE__,__func__, strerror(errno));fflush(stdout);
memcached_quit_server(ptr, true);
*error= MEMCACHED_ERRNO;
memcached_quit_server(ptr, true);
*error= MEMCACHED_ERRNO;
+ WATCHPOINT_ASSERT(ptr->fd == -1);
return -1;
}
}
return -1;
}
}
@@
-667,7
+669,6
@@
static ssize_t io_flush(memcached_server_write_instance_st ptr,
(size_t)sent_length != write_length)
{
memcached_quit_server(ptr, true);
(size_t)sent_length != write_length)
{
memcached_quit_server(ptr, true);
- fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
return -1;
}
return -1;
}