tsocket: remove DGRAM support from tsocket_context

[ira/wip.git] / lib / tsocket / tsocket_writev.c

diff --git a/lib/tsocket/tsocket_writev.c b/lib/tsocket/tsocket_writev.c
index 40b24b102540becd99bec01676e436c5977e0b85..8c5cd40385aa6baace1efa6bb9af76ec5dfcc62c 100644 (file)
--- a/lib/tsocket/tsocket_writev.c
+++ b/lib/tsocket/tsocket_writev.c
@@ -103,6 +103,16 @@ struct tevent_req *tsocket_writev_send(struct tsocket_context *sock,
                goto post;
        }
 
+       /*
+        * this is a fast path, not waiting for the
+        * socket to become explicit writeable gains
+        * about 10%-20% performance in benchmark tests.
+        */
+       tsocket_writev_handler(sock, req);
+       if (!tevent_req_is_in_progress(req)) {
+               goto post;
+       }
+
        talloc_set_destructor(state, tsocket_writev_state_destructor);
 
        ret = tsocket_set_writeable_handler(sock,
@@ -185,3 +195,122 @@ int tsocket_writev_recv(struct tevent_req *req, int *perrno)
        return ret;
 }
 
+struct tsocket_writev_queue_state {
+       /* this structs are owned by the caller */
+       struct {
+               struct tsocket_context *sock;
+               const struct iovec *vector;
+               size_t count;
+       } caller;
+       int ret;
+};
+
+static void tsocket_writev_queue_trigger(struct tevent_req *req,
+                                        void *private_data);
+static void tsocket_writev_queue_done(struct tevent_req *subreq);
+
+/**
+ * @brief Queue a dgram blob for sending through the socket
+ * @param[in] mem_ctx  The memory context for the result
+ * @param[in] sock     The socket to send data through
+ * @param[in] queue    The existing send queue
+ * @param[in] vector   The iovec vector so write
+ * @param[in] count    The size of the vector
+ * @retval             The async request handle
+ *
+ * This function queues a blob for sending to destination through an existing
+ * dgram socket. The async callback is triggered when the whole blob is
+ * delivered to the underlying system socket.
+ *
+ * The caller needs to make sure that all non-scalar input parameters hang
+ * arround for the whole lifetime of the request.
+ */
+struct tevent_req *tsocket_writev_queue_send(TALLOC_CTX *mem_ctx,
+                                            struct tsocket_context *sock,
+                                            struct tevent_queue *queue,
+                                            const struct iovec *vector,
+                                            size_t count)
+{
+       struct tevent_req *req;
+       struct tsocket_writev_queue_state *state;
+       bool ok;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct tsocket_writev_queue_state);
+       if (!req) {
+               return NULL;
+       }
+
+       state->caller.sock      = sock;
+       state->caller.vector    = vector;
+       state->caller.count     = count;
+       state->ret              = -1;
+
+       ok = tevent_queue_add(queue,
+                             sock->event.ctx,
+                             req,
+                             tsocket_writev_queue_trigger,
+                             NULL);
+       if (!ok) {
+               tevent_req_nomem(NULL, req);
+               goto post;
+       }
+
+       return req;
+
+ post:
+       return tevent_req_post(req, sock->event.ctx);
+}
+
+static void tsocket_writev_queue_trigger(struct tevent_req *req,
+                                        void *private_data)
+{
+       struct tsocket_writev_queue_state *state = tevent_req_data(req,
+                                       struct tsocket_writev_queue_state);
+       struct tevent_req *subreq;
+
+       subreq = tsocket_writev_send(state->caller.sock,
+                                    state,
+                                    state->caller.vector,
+                                    state->caller.count);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, tsocket_writev_queue_done ,req);
+}
+
+static void tsocket_writev_queue_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(subreq,
+                                struct tevent_req);
+       struct tsocket_writev_queue_state *state = tevent_req_data(req,
+                                       struct tsocket_writev_queue_state);
+       int ret;
+       int sys_errno;
+
+       ret = tsocket_writev_recv(subreq, &sys_errno);
+       talloc_free(subreq);
+       if (ret == -1) {
+               tevent_req_error(req, sys_errno);
+               return;
+       }
+       state->ret = ret;
+
+       tevent_req_done(req);
+}
+
+int tsocket_writev_queue_recv(struct tevent_req *req, int *perrno)
+{
+       struct tsocket_writev_queue_state *state = tevent_req_data(req,
+                                       struct tsocket_writev_queue_state);
+       int ret;
+
+       ret = tsocket_simple_int_recv(req, perrno);
+       if (ret == 0) {
+               ret = state->ret;
+       }
+
+       tevent_req_received(req);
+       return ret;
+}
+