#include <libmemcached/common.h>
-memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
- const struct libmemcached_io_vector_st *vector,
+memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
+ libmemcached_io_vector_st vector[],
const size_t count,
const bool with_flush)
{
memcached_return_t rc;
- WATCHPOINT_ASSERT(count);
- WATCHPOINT_ASSERT(vector);
+ assert_msg(vector, "Invalid vector passed");
- if (memcached_failed(rc= memcached_connect(ptr)))
+ if (memcached_failed(rc= memcached_connect(instance)))
{
WATCHPOINT_ERROR(rc);
- assert_msg(ptr->error_messages, "memcached_connect() returned an error but the memcached_server_write_instance_st showed none.");
+ assert_msg(instance->error_messages, "memcached_connect() returned an error but the memcached_server_write_instance_st showed none.");
return rc;
}
** before they start writing, if there is any data in buffer, clear it out,
** otherwise we might get a partial write.
**/
- if (memcached_is_udp(ptr->root) and with_flush and ptr->write_buffer_offset > UDP_DATAGRAM_HEADER_LENGTH)
+ if (memcached_is_udp(instance->root))
{
- if (memcached_io_write(ptr) == false)
+ if (vector[0].buffer or vector[0].length)
{
- memcached_io_reset(ptr);
- return memcached_set_error(*ptr, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+ return memcached_set_error(*instance->root, MEMCACHED_NOT_SUPPORTED, MEMCACHED_AT,
+ memcached_literal_param("UDP messages was attempted, but vector was not setup for it"));
}
- }
- ssize_t sent_length= memcached_io_writev(ptr, vector, count, with_flush);
+ struct msghdr msg;
+ memset(&msg, 0, sizeof(msg));
+
+ increment_udp_message_id(instance);
+ vector[0].buffer= instance->write_buffer;
+ vector[0].length= UDP_DATAGRAM_HEADER_LENGTH;
+
+ msg.msg_iov= (struct iovec*)vector;
+ msg.msg_iovlen= count;
+
+ if (::sendmsg(instance->fd, &msg, 0) < 1)
+ {
+ return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+ }
+
+ return MEMCACHED_SUCCESS;
+ }
+ ssize_t sent_length= memcached_io_writev(instance, vector, count, with_flush);
size_t command_length= 0;
for (uint32_t x= 0; x < count; ++x, vector++)
{
WATCHPOINT_ERROR(rc);
WATCHPOINT_ERRNO(errno);
}
- else if ((ptr->root->flags.no_reply) == 0)
+ else if (memcached_is_replying(instance->root))
{
- memcached_server_response_increment(ptr);
+ memcached_server_response_increment(instance);
}
return rc;