Merging Trond

[awesomized/libmemcached] / libmemcached / memcached_io.h

diff --git a/libmemcached/memcached_io.h b/libmemcached/memcached_io.h
index 3f991be79013a0945f85acda854206a1e52af3cd..6bcf871b9854c6371c95c85317bddc21541ad85c 100644 (file)
--- a/libmemcached/memcached_io.h
+++ b/libmemcached/memcached_io.h
@@ -1,14 +1,49 @@
 /* Server IO, Not public! */
-#include <memcached.h>
+#include "libmemcached/memcached.h"
 
 #ifndef __MEMCACHED_IO_H__
 #define __MEMCACHED_IO_H__
 
+#define MAX_UDP_DATAGRAM_LENGTH 1400
+#define UDP_DATAGRAM_HEADER_LENGTH 8
+#define UDP_REQUEST_ID_MSG_SIG_DIGITS 10
+#define UDP_REQUEST_ID_THREAD_MASK 0xFFFF << UDP_REQUEST_ID_MSG_SIG_DIGITS
+#define get_udp_datagram_request_id(A) ntohs((A)->request_id)
+#define get_udp_datagram_seq_num(A) ntohs((A)->sequence_number)
+#define get_udp_datagram_num_datagrams(A) ntohs((A)->num_datagrams)
+#define get_msg_num_from_request_id(A) ( (A) & (~(UDP_REQUEST_ID_THREAD_MASK)) )
+#define get_thread_id_from_request_id(A) ( (A) & (UDP_REQUEST_ID_THREAD_MASK) ) >> UDP_REQUEST_ID_MSG_SIG_DIGITS
+#define generate_udp_request_thread_id(A) (A) << UDP_REQUEST_ID_MSG_SIG_DIGITS
+#define UDP_REQUEST_ID_MAX_THREAD_ID get_thread_id_from_request_id(0xFFFF)
+
+struct udp_datagram_header_st {
+  uint16_t request_id;
+  uint16_t sequence_number;
+  uint16_t num_datagrams;
+  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);
-ssize_t memcached_io_read(memcached_server_st *ptr,
-                          void *buffer, size_t length);
-memcached_return memcached_io_close(memcached_server_st *ptr, uint8_t io_death);
+memcached_return memcached_io_read(memcached_server_st *ptr,
+                                   void *buffer, size_t length, ssize_t *nread);
+/* Read a line (terminated by '\n') into the buffer */
+memcached_return memcached_io_readline(memcached_server_st *ptr,
+                                       char *buffer_ptr,
+                                       size_t size);
+memcached_return memcached_io_close(memcached_server_st *ptr);
+/* Read n bytes of data from the server and store them in dta */
+memcached_return memcached_safe_read(memcached_server_st *ptr, 
+                                     void *dta, 
+                                     size_t size);
+/* Read a single response from the server */
+memcached_return memcached_read_one_response(memcached_server_st *ptr,
+                                             char *buffer, size_t buffer_length,
+                                             memcached_result_st *result);
+memcached_return memcached_io_init_udp_header(memcached_server_st *ptr,
+                                              uint16_t thread_id);
+
+memcached_server_st *memcached_io_get_readable_server(memcached_st *memc);
 
-#endif __MEMCACHED_IO_H__
+#endif /* __MEMCACHED_IO_H__ */