#include <libmemcached/common.h>
-memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
+static memcached_return_t _vdo_udp(memcached_instance_st* instance,
+ libmemcached_io_vector_st vector[],
+ const size_t count)
+{
+#ifndef __MINGW32__
+ if (vector[0].buffer or vector[0].length)
+ {
+ 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"));
+ }
+
+ 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;
+#ifdef __APPLE__
+ msg.msg_iovlen= int(count);
+#else
+ msg.msg_iovlen= count;
+#endif
+
+ uint32_t retry= 5;
+ while (--retry)
+ {
+ ssize_t sendmsg_length= ::sendmsg(instance->fd, &msg, 0);
+ if (sendmsg_length > 0)
+ {
+ break;
+ }
+ else if (sendmsg_length < 0)
+ {
+ if (errno == EMSGSIZE)
+ {
+ return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+ }
+
+ return memcached_set_errno(*instance, errno, MEMCACHED_AT);
+ }
+ }
+
+ return MEMCACHED_SUCCESS;
+#else
+ (void)instance;
+ (void)vector;
+ (void)count;
+ return MEMCACHED_FAILURE;
+#endif
+}
+
+memcached_return_t memcached_vdo(memcached_instance_st* instance,
libmemcached_io_vector_st vector[],
const size_t count,
const bool with_flush)
if (memcached_failed(rc= memcached_connect(instance)))
{
WATCHPOINT_ERROR(rc);
- assert_msg(instance->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 Instance showed none.");
return rc;
}
**/
if (memcached_is_udp(instance->root))
{
- if (vector[0].buffer or vector[0].length)
- {
- 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"));
- }
-
- 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;
-
- uint32_t retry= 5;
- while (--retry)
- {
- ssize_t sendmsg_length= ::sendmsg(instance->fd, &msg, 0);
- if (sendmsg_length > 0)
- {
- break;
- }
- else if (sendmsg_length < 0)
- {
- if (errno == EMSGSIZE)
- {
- return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
- }
-
- return memcached_set_errno(*instance, errno, 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++)
- {
- command_length+= vector->length;
+ return _vdo_udp(instance, vector, count);
}
- if (sent_length == -1 or size_t(sent_length) != command_length)
+ bool sent_success= memcached_io_writev(instance, vector, count, with_flush);
+ if (sent_success == false)
{
+ assert(memcached_last_error(instance->root) == MEMCACHED_SUCCESS);
if (memcached_last_error(instance->root) == MEMCACHED_SUCCESS)
{
+ assert(memcached_last_error(instance->root) != MEMCACHED_SUCCESS);
return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
}
else
{
- rc= MEMCACHED_WRITE_FAILURE;
+ rc= memcached_last_error(instance->root);
}
}
else if (memcached_is_replying(instance->root))