#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 timespec timer;
+ timer.tv_sec= 1;
+ timer.tv_nsec= 0;
if (read_or_write)
flags= POLLOUT | POLLERR;
else
fds[0].fd= ptr->hosts[server_key].fd;
fds[0].events= flags;
- if (poll(fds, 1, -1) < 0)
+ if (poll(fds, 1, ptr->poll_timeout) < 0)
return MEMCACHED_FAILURE;
return MEMCACHED_SUCCESS;
while (length)
{
- if (!ptr->read_buffer_length)
+ if (!ptr->hosts[server_key].read_buffer_length)
{
size_t data_read;
}
data_read= read(ptr->hosts[server_key].fd,
- ptr->read_buffer,
+ ptr->hosts[server_key].read_buffer,
MEMCACHED_MAX_BUFFER);
if (data_read == -1)
{
break;
default:
{
- ptr->my_errno= errno;
+ ptr->cached_errno= errno;
return -1;
}
}
/* If zero, just keep looping */
}
- ptr->read_buffer_length= data_read;
- ptr->read_ptr= ptr->read_buffer;
+ ptr->hosts[server_key].read_buffer_length= data_read;
+ ptr->hosts[server_key].read_ptr= ptr->hosts[server_key].read_buffer;
}
- *buffer_ptr= *ptr->read_ptr;
+ *buffer_ptr= *ptr->hosts[server_key].read_ptr;
length--;
- ptr->read_ptr++;
- ptr->read_buffer_length--;
+ ptr->hosts[server_key].read_ptr++;
+ ptr->hosts[server_key].read_buffer_length--;
buffer_ptr++;
}
for (x= 0; x < length; x++)
{
- ptr->write_buffer[ptr->write_buffer_offset]= buffer[x];
- ptr->write_buffer_offset++;
-
- if (ptr->write_buffer_offset == MEMCACHED_MAX_BUFFER)
+ if (ptr->hosts[server_key].write_ptr == 0)
+ ptr->hosts[server_key].write_ptr= ptr->hosts[server_key].write_buffer;
+ WATCHPOINT_ASSERT(ptr->hosts[server_key].write_ptr);
+ *ptr->hosts[server_key].write_ptr= buffer[x];
+ ptr->hosts[server_key].write_ptr++;
+ ptr->hosts[server_key].write_buffer_offset++;
+
+ if (ptr->hosts[server_key].write_buffer_offset == MEMCACHED_MAX_BUFFER)
{
size_t sent_length;
sent_length= memcached_io_flush(ptr, server_key);
WATCHPOINT_ASSERT(sent_length == MEMCACHED_MAX_BUFFER);
- ptr->write_buffer_offset= 0;
+ ptr->hosts[server_key].write_ptr= ptr->hosts[server_key].write_buffer;
+ ptr->hosts[server_key].write_buffer_offset= 0;
}
}
{
size_t sent_length;
size_t return_length;
- char *write_ptr= ptr->write_buffer;
- size_t write_length= ptr->write_buffer_offset;
+ char *write_ptr= ptr->hosts[server_key].write_buffer;
+ size_t write_length= ptr->hosts[server_key].write_buffer_offset;
unsigned int loop= 1;
- if (ptr->write_buffer_offset == 0)
+ if (ptr->hosts[server_key].write_buffer_offset == 0)
return 0;
return_length= 0;
}
sent_length= 0;
- if ((ssize_t)(sent_length= write(ptr->hosts[server_key].fd, write_ptr,
- write_length)) == -1)
+ if (ptr->hosts[server_key].type == MEMCACHED_CONNECTION_UDP)
+ {
+ sent_length= sendto(ptr->hosts[server_key].fd,
+ write_ptr, write_length, 0,
+ (struct sockaddr *)&ptr->hosts[server_key].address_info->ai_addr,
+ sizeof(struct sockaddr));
+ }
+ else
{
- switch (errno)
+ if ((ssize_t)(sent_length= write(ptr->hosts[server_key].fd, write_ptr,
+ write_length)) == -1)
{
- case ENOBUFS:
- case EAGAIN:
- WATCHPOINT;
- continue;
- if (loop < 100)
+ switch (errno)
{
- loop++;
- break;
+ case ENOBUFS:
+ case EAGAIN:
+ WATCHPOINT;
+ continue;
+ if (loop < 100)
+ {
+ loop++;
+ break;
+ }
+ /* Yes, we want to fall through */
+ default:
+ ptr->cached_errno= errno;
+ return -1;
}
- /* Yes, we want to fall through */
- default:
- ptr->my_errno= errno;
- return -1;
}
}
}
WATCHPOINT_ASSERT(write_length == 0);
- WATCHPOINT_ASSERT(return_length == ptr->write_buffer_offset);
- ptr->write_buffer_offset= 0;
+ WATCHPOINT_ASSERT(return_length == ptr->hosts[server_key].write_buffer_offset);
+ ptr->hosts[server_key].write_ptr= ptr->hosts[server_key].write_buffer;
+ ptr->hosts[server_key].write_buffer_offset= 0;
return return_length;
}
*/
void memcached_io_reset(memcached_st *ptr, unsigned int server_key)
{
- ptr->write_buffer_offset= 0;
+ ptr->hosts[server_key].write_ptr= ptr->hosts[server_key].write_buffer;
+ ptr->hosts[server_key].write_buffer_offset= 0;
memcached_quit(ptr);
}