projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-188
[awesomized/libmemcached]
/
libmemcached
/
io.cc
diff --git
a/libmemcached/io.cc
b/libmemcached/io.cc
index 8cee0178711eeff6587cc8ded3ae226bfa79c2fa..6d9cad9a51f3e815e56e959ee3814b609bcd4681 100644
(file)
--- a/
libmemcached/io.cc
+++ b/
libmemcached/io.cc
@@
-82,7
+82,7
@@
static bool repack_input_buffer(org::libmemcached::Instance* ptr)
if ((nr= ::recv(ptr->fd,
ptr->read_ptr + ptr->read_data_length,
MEMCACHED_MAX_BUFFER - ptr->read_data_length,
if ((nr= ::recv(ptr->fd,
ptr->read_ptr + ptr->read_data_length,
MEMCACHED_MAX_BUFFER - ptr->read_data_length,
- MSG_
DONTWAIT|MSG_
NOSIGNAL)) <= 0)
+ MSG_NOSIGNAL)) <= 0)
{
if (nr == 0)
{
{
if (nr == 0)
{
@@
-337,11
+337,11
@@
static bool io_flush(org::libmemcached::Instance* ptr,
int flags;
if (with_flush)
{
int flags;
if (with_flush)
{
- flags= MSG_NOSIGNAL
|MSG_DONTWAIT
;
+ flags= MSG_NOSIGNAL;
}
else
{
}
else
{
- flags= MSG_NOSIGNAL|MSG_
DONTWAIT|MSG_
MORE;
+ flags= MSG_NOSIGNAL|MSG_MORE;
}
ssize_t sent_length= ::send(ptr->fd, local_write_ptr, write_length, flags);
}
ssize_t sent_length= ::send(ptr->fd, local_write_ptr, write_length, flags);
@@
-419,7
+419,7
@@
static memcached_return_t _io_fill(org::libmemcached::Instance* ptr)
ssize_t data_read;
do
{
ssize_t data_read;
do
{
- data_read= ::recv(ptr->fd, ptr->read_buffer, MEMCACHED_MAX_BUFFER, MSG_
DONTWAIT|MSG_
NOSIGNAL);
+ data_read= ::recv(ptr->fd, ptr->read_buffer, MEMCACHED_MAX_BUFFER, MSG_NOSIGNAL);
if (data_read == SOCKET_ERROR)
{
switch (get_socket_errno())
if (data_read == SOCKET_ERROR)
{
switch (get_socket_errno())
@@
-557,7
+557,7
@@
memcached_return_t memcached_io_slurp(org::libmemcached::Instance* ptr)
char buffer[MEMCACHED_MAX_BUFFER];
do
{
char buffer[MEMCACHED_MAX_BUFFER];
do
{
- data_read= ::recv(ptr->fd, ptr->read_buffer, sizeof(buffer), MSG_
DONTWAIT|MSG_
NOSIGNAL);
+ data_read= ::recv(ptr->fd, ptr->read_buffer, sizeof(buffer), MSG_NOSIGNAL);
if (data_read == SOCKET_ERROR)
{
switch (get_socket_errno())
if (data_read == SOCKET_ERROR)
{
switch (get_socket_errno())
@@
-727,7
+727,7
@@
void memcached_io_close(org::libmemcached::Instance* ptr)
ptr->fd= INVALID_SOCKET;
}
ptr->fd= INVALID_SOCKET;
}
-org::libmemcached::Instance* memcached_io_get_readable_server(memcached_st *memc)
+org::libmemcached::Instance* memcached_io_get_readable_server(memcached_st *memc
, memcached_return_t&
)
{
#define MAX_SERVERS_TO_POLL 100
struct pollfd fds[MAX_SERVERS_TO_POLL];
{
#define MAX_SERVERS_TO_POLL 100
struct pollfd fds[MAX_SERVERS_TO_POLL];