Changeset 862 for trunk/server/lib/tsocket/tsocket_bsd.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/tsocket/tsocket_bsd.c (modified) (7 diffs)

trunk/server/lib/tsocket/tsocket_bsd.c

@@ -655 +655 @@
         void *event_ptr;
         struct tevent_fd *fde;
+        bool optimize_recvfrom;
 
         void *readable_private;
@@ -661 +662 @@
         void (*writeable_handler)(void *private_data);
 };
+
+bool tdgram_bsd_optimize_recvfrom(struct tdgram_context *dgram,
+                                  bool on)
+{
+        struct tdgram_bsd *bsds =
+                talloc_get_type(_tdgram_context_data(dgram),
+                struct tdgram_bsd);
+        bool old;
+
+        if (bsds == NULL) {
+                /* not a bsd socket */
+                return false;
+        }
+
+        old = bsds->optimize_recvfrom;
+        bsds->optimize_recvfrom = on;
+
+        return old;
+}
 
 static void tdgram_bsd_fde_handler(struct tevent_context *ev,
@@ -838 +858 @@
         }
 
+
         /*
          * this is a fast path, not waiting for the
@@ -843 +864 @@
          * about 10%-20% performance in benchmark tests.
          */
-        tdgram_bsd_recvfrom_handler(req);
-        if (!tevent_req_is_in_progress(req)) {
-                goto post;
+        if (bsds->optimize_recvfrom) {
+                /*
+                 * We only do the optimization on
+                 * recvfrom if the caller asked for it.
+                 *
+                 * This is needed because in most cases
+                 * we preferr to flush send buffers before
+                 * receiving incoming requests.
+                 */
+                tdgram_bsd_recvfrom_handler(req);
+                if (!tevent_req_is_in_progress(req)) {
+                        goto post;
+                }
         }
 
@@ -1401 +1432 @@
         void *event_ptr;
         struct tevent_fd *fde;
+        bool optimize_readv;
 
         void *readable_private;
@@ -1407 +1439 @@
         void (*writeable_handler)(void *private_data);
 };
+
+bool tstream_bsd_optimize_readv(struct tstream_context *stream,
+                                bool on)
+{
+        struct tstream_bsd *bsds =
+                talloc_get_type(_tstream_context_data(stream),
+                struct tstream_bsd);
+        bool old;
+
+        if (bsds == NULL) {
+                /* not a bsd socket */
+                return false;
+        }
+
+        old = bsds->optimize_readv;
+        bsds->optimize_readv = on;
+
+        return old;
+}
 
 static void tstream_bsd_fde_handler(struct tevent_context *ev,
@@ -1620 +1671 @@
          * about 10%-20% performance in benchmark tests.
          */
-        tstream_bsd_readv_handler(req);
-        if (!tevent_req_is_in_progress(req)) {
-                goto post;
+        if (bsds->optimize_readv) {
+                /*
+                 * We only do the optimization on
+                 * readv if the caller asked for it.
+                 *
+                 * This is needed because in most cases
+                 * we preferr to flush send buffers before
+                 * receiving incoming requests.
+                 */
+                tstream_bsd_readv_handler(req);
+                if (!tevent_req_is_in_progress(req)) {
+                        goto post;
+                }
         }