#include <libmemcached/common.h>
-memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
+memcached_return_t memcached_vdo(org::libmemcached::Instance* 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))
{
+#ifndef __MINGW32__
if (vector[0].buffer or vector[0].length)
{
return memcached_set_error(*instance->root, MEMCACHED_NOT_SUPPORTED, MEMCACHED_AT,
vector[0].length= UDP_DATAGRAM_HEADER_LENGTH;
msg.msg_iov= (struct iovec*)vector;
+#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+ msg.msg_iovlen= int(count);
+#else
msg.msg_iovlen= count;
+#endif
uint32_t retry= 5;
while (--retry)
return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
}
- perror(__func__);
return memcached_set_errno(*instance, errno, MEMCACHED_AT);
}
}
return MEMCACHED_SUCCESS;
+#else
+ return MEMCACHED_FAILURE;
+#endif
}
- 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++)
+ bool sent_success= memcached_io_writev(instance, vector, count, with_flush);
+ if (sent_success == false)
{
- command_length+= vector->length;
- }
-
- if (sent_length == -1 or size_t(sent_length) != command_length)
- {
- rc= MEMCACHED_WRITE_FAILURE;
- WATCHPOINT_ERROR(rc);
- WATCHPOINT_ERRNO(errno);
+ if (memcached_last_error(instance->root) == MEMCACHED_SUCCESS)
+ {
+ return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+ }
+ else
+ {
+ rc= MEMCACHED_WRITE_FAILURE;
+ }
}
else if (memcached_is_replying(instance->root))
{