Changeset 862 for trunk/server/lib/tsocket/tsocket_helpers.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_helpers.c (modified) (3 diffs)

trunk/server/lib/tsocket/tsocket_helpers.c

@@ -213 +213 @@
         size_t i;
         struct tevent_req *subreq;
+        bool optimize = false;
+        bool save_optimize = false;
+
+        if (state->count > 0) {
+                /*
+                 * This is not the first time we asked for a vector,
+                 * which means parts of the pdu already arrived.
+                 *
+                 * In this case it make sense to enable
+                 * a syscall/performance optimization if the
+                 * low level tstream implementation supports it.
+                 */
+                optimize = true;
+        }
 
         TALLOC_FREE(state->vector);
@@ -256 +270 @@
         }
 
+        if (optimize) {
+                /*
+                 * If the low level stream is a bsd socket
+                 * we will get syscall optimization.
+                 *
+                 * If it is not a bsd socket
+                 * tstream_bsd_optimize_readv() just returns.
+                 */
+                save_optimize = tstream_bsd_optimize_readv(state->caller.stream,
+                                                           true);
+        }
         subreq = tstream_readv_send(state,
                                     state->caller.ev,
@@ -261 +286 @@
                                     state->vector,
                                     state->count);
+        if (optimize) {
+                tstream_bsd_optimize_readv(state->caller.stream,
+                                           save_optimize);
+        }
         if (tevent_req_nomem(subreq, req)) {
                 return;