ccan/io: test custom io functions.

[ccan] / ccan / io / io.h

diff --git a/ccan/io/io.h b/ccan/io/io.h
index 9ba46b67b497a93af6c429954a4e3013ba2e4742..72f805244c91ad89c4404703f4b276608339142f 100644 (file)
--- a/ccan/io/io.h
+++ b/ccan/io/io.h
@@ -8,39 +8,6 @@
 
 struct io_conn;
 
 
 struct io_conn;
 

-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;
-};
-
-enum io_result {
-       RESULT_AGAIN,
-       RESULT_FINISHED,
-       RESULT_CLOSE
-};
-
-enum io_state {
-       IO_IO,
-       IO_NEXT, /* eg starting, woken from idle, return from io_break. */
-       IO_IDLE,
-       IO_FINISHED
-};
-

 /**
  * struct io_plan - returned from a setup function.
  *
 /**
  * struct io_plan - returned from a setup function.
  *


@@ -48,45 +15,75 @@ enum io_state {
  */
 struct io_plan {
        int pollflag;
  */
 struct io_plan {
        int pollflag;

-       enum io_state state;
-       enum io_result (*io)(struct io_conn *conn);
+       /* Only NULL if idle. */
+       bool (*io)(int fd, struct io_plan *plan);
+       /* Only NULL if closing. */

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

-               struct io_state_read read;
-               struct io_state_write write;
-               struct io_state_readpart readpart;
-               struct io_state_writepart writepart;
+               struct {
+                       char *buf;
+                       size_t len;
+               } read;
+               struct {
+                       const char *buf;
+                       size_t len;
+               } write;
+               struct {
+                       char *buf;
+                       size_t *lenp;
+               } readpart;
+               struct {
+                       const char *buf;
+                       size_t *lenp;
+               } writepart;
+               struct {
+                       void *p;
+                       size_t len;
+               } ptr_len;
+               struct {
+                       void *p1;
+                       void *p2;
+               } ptr_ptr;
+               struct {
+                       size_t len1;
+                       size_t len2;
+               } len_len;

        } u;
 };
 
        } u;
 };
 

+#ifdef DEBUG
+extern bool io_plan_for_other;
+extern bool (*io_debug)(struct io_conn *conn);
+#define io_plan_other() ((io_plan_for_other = true))
+void io_plan_debug(struct io_plan *plan);
+#else
+#define io_plan_other() (void)0
+static inline void io_plan_debug(struct io_plan *plan) { }
+#endif
+

 /**
  * io_new_conn - create a new connection.
  * @fd: the file descriptor.
 /**
  * io_new_conn - create a new connection.
  * @fd: the file descriptor.

- * @start: the first function to call.
+ * @plan: the first I/O function.

  * @finish: the function to call when it's closed or fails.
  * @finish: the function to call when it's closed or fails.

- * @arg: the argument to both @start and @finish.
+ * @arg: the argument to @finish.

  *
  *

- * This creates a connection which owns @fd.  @start will be called on the
- * next return to io_loop(), and @finish will be called when an I/O operation
+ * This creates a connection which owns @fd.  @plan will be called on the
+ * next io_loop(), and @finish will be called when an I/O operation

  * fails, or you call io_close() on the connection.
  *
  * fails, or you call io_close() on the connection.
  *

- * The @start function must call one of the io queueing functions
- * (eg. io_read, io_write) and return the next function to call once
- * that is done using io_next().  The alternative is to call io_close().
- *

  * Returns NULL on error (and sets errno).
  */
  * Returns NULL on error (and sets errno).
  */

-#define io_new_conn(fd, start, finish, arg)                            \
-       io_new_conn_((fd),                                              \
-                    typesafe_cb_preargs(struct io_plan, void *,        \
-                                        (start), (arg), struct io_conn *), \
-                    typesafe_cb_preargs(void, void *, (finish), (arg), \
-                                        struct io_conn *),             \
-                    (arg))
+#define io_new_conn(fd, plan, finish, arg)                             \
+       (io_plan_other(), io_new_conn_((fd), (plan),                    \
+                                      typesafe_cb_preargs(void, void *, \
+                                                          (finish), (arg), \
+                                                          struct io_conn *), \
+                                      (arg)))

 struct io_conn *io_new_conn_(int fd,
 struct io_conn *io_new_conn_(int fd,

-                            struct io_plan (*start)(struct io_conn *, void *),
+                            struct io_plan plan,

                             void (*finish)(struct io_conn *, void *),
                             void *arg);
 
                             void (*finish)(struct io_conn *, void *),
                             void *arg);
 


@@ -243,9 +240,9 @@ bool io_timeout_(struct io_conn *conn, struct timespec ts,
 /**
  * io_duplex - split an fd into two connections.
  * @conn: a connection.
 /**
  * io_duplex - split an fd into two connections.
  * @conn: a connection.

- * @start: the first function to call.
+ * @plan: the first I/O function to call.

  * @finish: the function to call when it's closed or fails.
  * @finish: the function to call when it's closed or fails.

- * @arg: the argument to both @start and @finish.
+ * @arg: the argument to @finish.

  *
  * Sometimes you want to be able to simultaneously read and write on a
  * single fd, but io forces a linear call sequence.  The solition is
  *
  * Sometimes you want to be able to simultaneously read and write on a
  * single fd, but io forces a linear call sequence.  The solition is


@@ -254,56 +251,41 @@ bool io_timeout_(struct io_conn *conn, struct timespec ts,
  *
  * You must io_close() both of them to close the fd.
  */
  *
  * You must io_close() both of them to close the fd.
  */

-#define io_duplex(conn, start, finish, arg)                            \
-       io_duplex_((conn),                                              \
-                  typesafe_cb_preargs(struct io_plan, void *,          \
-                                      (start), (arg), struct io_conn *), \
-                  typesafe_cb_preargs(void, void *, (finish), (arg),   \
-                                      struct io_conn *),               \
-                  (arg))
+#define io_duplex(conn, plan, finish, arg)                             \
+       (io_plan_other(), io_duplex_((conn), (plan),                    \
+                                    typesafe_cb_preargs(void, void *,  \
+                                                        (finish), (arg), \
+                                                        struct io_conn *), \
+                                    (arg)))

 
 struct io_conn *io_duplex_(struct io_conn *conn,
 
 struct io_conn *io_duplex_(struct io_conn *conn,

-                          struct io_plan (*start)(struct io_conn *, void *),
+                          struct io_plan plan,

                           void (*finish)(struct io_conn *, void *),
                           void *arg);
 
 /**
                           void (*finish)(struct io_conn *, void *),
                           void *arg);
 
 /**

- * io_wake - wake up and idle connection.
+ * io_wake - wake up an idle connection.

  * @conn: an idle connection.
  * @conn: an idle connection.

- * @fn: the next function to call once queued IO is complete.
- * @arg: the argument to @next.
+ * @plan: the next I/O function for @conn.

  *
  *

- * This makes @conn run its @next function the next time around the
- * io_loop().
+ * This makes @conn do I/O the next time around the io_loop().

  */
  */

-#define io_wake(conn, fn, arg)                                         \
-       io_wake_((conn),                                                \
-                typesafe_cb_preargs(struct io_plan, void *,            \
-                                    (fn), (arg), struct io_conn *),    \
-                (arg))
-void io_wake_(struct io_conn *conn,
-             struct io_plan (*fn)(struct io_conn *, void *), void *arg);
+#define io_wake(conn, plan) (io_plan_other(), io_wake_((conn), (plan)))
+void io_wake_(struct io_conn *conn, struct io_plan plan);

 
 /**
  * io_break - return from io_loop()
  * @ret: non-NULL value to return from io_loop().
 
 /**
  * io_break - return from io_loop()
  * @ret: non-NULL value to return from io_loop().

- * @cb: function to call once on return
- * @arg: @cb argument
+ * @plan: I/O to perform on return (if any)

  *
  * This breaks out of the io_loop.  As soon as the current @next
  * function returns, any io_closed()'d connections will have their
  * finish callbacks called, then io_loop() with return with @ret.
  *
  *
  * This breaks out of the io_loop.  As soon as the current @next
  * function returns, any io_closed()'d connections will have their
  * finish callbacks called, then io_loop() with return with @ret.
  *

- * If io_loop() is called again, then @cb will be called.
+ * If io_loop() is called again, then @plan will be carried out.

  */
  */

-#define io_break(ret, fn, arg)                                         \
-       io_break_((ret),                                                \
-                 typesafe_cb_preargs(struct io_plan, void *,           \
-                                     (fn), (arg), struct io_conn *),   \
-                 (arg))
-struct io_plan io_break_(void *ret,
-                        struct io_plan (*fn)(struct io_conn *, void *),
-                        void *arg);
+#define io_break(ret, plan) (io_plan_other(), io_break_((ret), (plan)))
+struct io_plan io_break_(void *ret, struct io_plan plan);

 
 /* FIXME: io_recvfrom/io_sendto */
 
 
 /* FIXME: io_recvfrom/io_sendto */