io: io_always, and zero-length operations support.

[ccan] / ccan / io / backend.h

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index bc88c289b7bf412d8d12d46497e1f375616a8e72..e2090ff14068ebe0a34317941bb8efc6f7cb9a0a 100644 (file)
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -3,6 +3,17 @@
 #define CCAN_IO_BACKEND_H
 #include <stdbool.h>
 #include <ccan/timer/timer.h>
 #define CCAN_IO_BACKEND_H
 #include <stdbool.h>
 #include <ccan/timer/timer.h>

+#include <poll.h>
+
+/* A setting for actions to always run (eg. zero-length reads). */
+#define POLLALWAYS (((POLLIN|POLLOUT) + 1) & ~((POLLIN|POLLOUT)))
+
+struct io_alloc {
+       void *(*alloc)(size_t size);
+       void *(*realloc)(void *ptr, size_t size);
+       void (*free)(void *ptr);
+};
+extern struct io_alloc io_alloc;

 
 struct fd {
        int fd;
 
 struct fd {
        int fd;


@@ -10,62 +21,20 @@ struct fd {
        size_t backend_info;
 };
 
        size_t backend_info;
 };
 

-

 /* Listeners create connections. */
 struct io_listener {
        struct fd fd;
 
        /* These are for connections we create. */
 /* Listeners create connections. */
 struct io_listener {
        struct fd fd;
 
        /* These are for connections we create. */

-       struct io_plan *(*next)(struct io_conn *, void *arg);
-       void (*finish)(struct io_conn *, void *arg);
-       void *conn_arg;
-};
-
-enum io_state {
-       /* These wait for something to input */
-       READ,
-       READPART,
-
-       /* These wait for room to output */
-       WRITE,
-       WRITEPART,
-
-       NEXT, /* eg starting, woken from idle, return from io_break. */
-       IDLE,
-       FINISHED,
-       PROCESSING /* We expect them to change this now. */
-};
-
-static inline enum io_state from_ioplan(struct io_plan *op)
-{
-       return (enum io_state)(long)op;
-}
-
-struct io_state_read {
-       char *buf;
-       size_t len;
-};
-
-struct io_state_write {
-       const char *buf;
-       size_t len;
-};
-
-struct io_state_readpart {
-       char *buf;
-       size_t *lenp;
-};
-
-struct io_state_writepart {
-       const char *buf;
-       size_t *lenp;
+       void (*init)(int fd, void *arg);
+       void *arg;

 };
 
 struct io_timeout {
        struct timer timer;
        struct io_conn *conn;
 
 };
 
 struct io_timeout {
        struct timer timer;
        struct io_conn *conn;
 

-       struct io_plan *(*next)(struct io_conn *, void *arg);
+       struct io_plan (*next)(struct io_conn *, void *arg);

        void *next_arg;
 };
 
        void *next_arg;
 };
 


@@ -73,23 +42,13 @@ struct io_timeout {
 struct io_conn {
        struct fd fd;
 
 struct io_conn {
        struct fd fd;
 

-       struct io_plan *(*next)(struct io_conn *, void *arg);
-       void *next_arg;
-

        void (*finish)(struct io_conn *, void *arg);
        void *finish_arg;
 
        struct io_conn *duplex;
        struct io_timeout *timeout;
 
        void (*finish)(struct io_conn *, void *arg);
        void *finish_arg;
 
        struct io_conn *duplex;
        struct io_timeout *timeout;
 

-       int pollflag; /* 0, POLLIN or POLLOUT */
-       enum io_state state;
-       union {
-               struct io_state_read read;
-               struct io_state_write write;
-               struct io_state_readpart readpart;
-               struct io_state_writepart writepart;
-       } u;
+       struct io_plan plan;

 };
 
 static inline bool timeout_active(const struct io_conn *conn)
 };
 
 static inline bool timeout_active(const struct io_conn *conn)


@@ -99,13 +58,43 @@ static inline bool timeout_active(const struct io_conn *conn)
 
 extern void *io_loop_return;
 
 
 extern void *io_loop_return;
 

+#ifdef DEBUG
+extern struct io_conn *current;
+static inline void set_current(struct io_conn *conn)
+{
+       current = conn;
+}
+static inline bool doing_debug_on(struct io_conn *conn)
+{
+       return io_debug_conn && io_debug_conn(conn);
+}
+static inline bool doing_debug(void)
+{
+       return io_debug_conn;
+}
+#else
+static inline void set_current(struct io_conn *conn)
+{
+}
+static inline bool doing_debug_on(struct io_conn *conn)
+{
+       return false;
+}
+static inline bool doing_debug(void)
+{
+       return false;
+}
+#endif
+

 bool add_listener(struct io_listener *l);
 bool add_conn(struct io_conn *c);
 bool add_duplex(struct io_conn *c);
 void del_listener(struct io_listener *l);
 bool add_listener(struct io_listener *l);
 bool add_conn(struct io_conn *c);
 bool add_duplex(struct io_conn *c);
 void del_listener(struct io_listener *l);

-void backend_set_state(struct io_conn *conn, struct io_plan *op);
+void backend_plan_changed(struct io_conn *conn);

 void backend_add_timeout(struct io_conn *conn, struct timespec ts);
 void backend_del_timeout(struct io_conn *conn);
 void backend_add_timeout(struct io_conn *conn, struct timespec ts);
 void backend_del_timeout(struct io_conn *conn);

+void backend_del_conn(struct io_conn *conn);

 
 

-struct io_plan *do_ready(struct io_conn *conn);
+void io_ready(struct io_conn *conn);
+void *do_io_loop(struct io_conn **ready);

 #endif /* CCAN_IO_BACKEND_H */
 #endif /* CCAN_IO_BACKEND_H */