Small updates/wins around non-block IO

[m6w6/libmemcached] / libmemcached / io.h

diff --git a/libmemcached/io.h b/libmemcached/io.h
index 2929aacec6e748cb2bc8061f6b894ea579bbdbb1..3014582341bfcef525c3d2f738c9e8a415890d8a 100644 (file)
--- a/libmemcached/io.h
+++ b/libmemcached/io.h
@@ -9,17 +9,17 @@
  *
  */
 
-#ifndef LIBMEMCACHED_MEMCACHED_IO_H
-#define LIBMEMCACHED_MEMCACHED_IO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __LIBMEMCACHED_IO_H__
+#define __LIBMEMCACHED_IO_H__
 
 #if defined(BUILDING_LIBMEMCACHED)
 
 #include "libmemcached/memcached.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MAX_UDP_DATAGRAM_LENGTH 1400
 #define UDP_DATAGRAM_HEADER_LENGTH 8
 #define UDP_REQUEST_ID_MSG_SIG_DIGITS 10
@@ -40,33 +40,54 @@ struct udp_datagram_header_st
   uint16_t reserved;
 };
 
-ssize_t memcached_io_write(memcached_server_st *ptr,
-                           const void *buffer, size_t length, char with_flush);
-void memcached_io_reset(memcached_server_st *ptr);
-memcached_return_t memcached_io_read(memcached_server_st *ptr,
+struct __write_vector_st
+{
+  size_t length;
+  const void *buffer;
+};
+
+LIBMEMCACHED_LOCAL
+ssize_t memcached_io_writev(memcached_server_write_instance_st ptr,
+                            const struct __write_vector_st *vector,
+                            size_t number_of, bool with_flush);
+
+LIBMEMCACHED_LOCAL
+ssize_t memcached_io_write(memcached_server_write_instance_st ptr,
+                           const void *buffer, size_t length, bool with_flush);
+
+LIBMEMCACHED_LOCAL
+void memcached_io_reset(memcached_server_write_instance_st ptr);
+
+LIBMEMCACHED_LOCAL
+memcached_return_t memcached_io_read(memcached_server_write_instance_st ptr,
                                      void *buffer, size_t length, ssize_t *nread);
+
 /* Read a line (terminated by '\n') into the buffer */
-memcached_return_t memcached_io_readline(memcached_server_st *ptr,
+LIBMEMCACHED_LOCAL
+memcached_return_t memcached_io_readline(memcached_server_write_instance_st ptr,
                                          char *buffer_ptr,
                                          size_t size);
-memcached_return_t memcached_io_close(memcached_server_st *ptr);
+
+LIBMEMCACHED_LOCAL
+memcached_return_t memcached_io_close(memcached_server_write_instance_st ptr);
+
 /* Read n bytes of data from the server and store them in dta */
-memcached_return_t memcached_safe_read(memcached_server_st *ptr,
+LIBMEMCACHED_LOCAL
+memcached_return_t memcached_safe_read(memcached_server_write_instance_st ptr,
                                        void *dta,
                                        size_t size);
-/* Read a single response from the server */
-memcached_return_t memcached_read_one_response(memcached_server_st *ptr,
-                                               char *buffer, size_t buffer_length,
-                                               memcached_result_st *result);
-memcached_return_t memcached_io_init_udp_header(memcached_server_st *ptr,
-                                                uint16_t thread_id);
 
-memcached_server_st *memcached_io_get_readable_server(memcached_st *memc);
+LIBMEMCACHED_LOCAL
+memcached_return_t memcached_io_init_udp_header(memcached_server_write_instance_st ptr,
+                                                uint16_t thread_id);
 
-#endif /* BUILDING_LIBMEMCACHED */
+LIBMEMCACHED_LOCAL
+memcached_server_write_instance_st memcached_io_get_readable_server(memcached_st *memc);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* LIBMEMCACHED_MEMCACHED_IO_H */
+#endif /* BUILDING_LIBMEMCACHED */
+
+#endif /* __LIBMEMCACHED_IO_H__ */