Reduce batching counts for sends (#1321) (#1323)

microsoft · Mar 10, 2021 · 1396fca · 1396fca
1 parent 014cfe0
commit 1396fca
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/.azure/azure-pipelines.qns.yml b/.azure/azure-pipelines.qns.yml
@@ -58,7 +58,7 @@ jobs:
         ${{ if eq(variables['Build.Reason'], 'BatchedCI') }}:
           tags: |
             latest
-            v1.1.2.$(Build.BuildId)
+            v1.1.3.$(Build.BuildId)
         ${{ if ne(variables['Build.Reason'], 'BatchedCI') }}:
           tags: custom-$(Build.BuildId)
 - template: .\templates\run-qns.yml

diff --git a/.azure/templates/create-package.yml b/.azure/templates/create-package.yml
@@ -43,5 +43,5 @@ jobs:
       owner: [email protected]
       majorVer: 1
       minorVer: 1
-      patchVer: 2
+      patchVer: 3
       prereleaseVer: $(Build.BuildId)
diff --git a/src/core/quicdef.h b/src/core/quicdef.h
@@ -161,7 +161,7 @@ typedef struct QUIC_PATH QUIC_PATH;
 // FLUSH_SEND operation. The actual number will generally exceed this value up
 // to the limit of the current USO buffer being filled.
 //
-#define QUIC_MAX_DATAGRAMS_PER_SEND             245
+#define QUIC_MAX_DATAGRAMS_PER_SEND             40
 
 //
 // The number of packets we write for a single stream before going to the next

diff --git a/src/inc/msquic.ver b/src/inc/msquic.ver
@@ -20,10 +20,10 @@
 #define VER_LEGALCOPYRIGHT_STR      "\251 Microsoft Corporation."
 #define VER_PRODUCTNAME_STR         "Microsoft\256 QUIC"
 
-#define VER_FILEVERSION             1,1.2.0
-#define VER_FILEVERSION_STR         "1.1.2.0\0"
+#define VER_FILEVERSION             1,1.3.0
+#define VER_FILEVERSION_STR         "1.1.3.0\0"
 
-#define VER_PRODUCTVERSION_STR      "1.1.2." STR(VER_BUILD_ID) STR(VER_SUFFIX) "\0"
+#define VER_PRODUCTVERSION_STR      "1.1.3." STR(VER_BUILD_ID) STR(VER_SUFFIX) "\0"
 
 VS_VERSION_INFO                     VERSIONINFO
 FILEVERSION                         VER_FILEVERSION

diff --git a/src/perf/lib/PerfServer.h b/src/perf/lib/PerfServer.h
@@ -120,7 +120,8 @@ class PerfServer : public PerfBase {
             .SetPeerBidiStreamCount(PERF_DEFAULT_STREAM_COUNT)
             .SetPeerUnidiStreamCount(PERF_DEFAULT_STREAM_COUNT)
             .SetDisconnectTimeoutMs(PERF_DEFAULT_DISCONNECT_TIMEOUT)
-            .SetIdleTimeoutMs(PERF_DEFAULT_IDLE_TIMEOUT)};
+            .SetIdleTimeoutMs(PERF_DEFAULT_IDLE_TIMEOUT)
+            .SetSendBufferingEnabled(false)};
     MsQuicListener Listener {Registration};
     uint16_t Port {PERF_DEFAULT_PORT};
     CXPLAT_EVENT* StopEvent {nullptr};

diff --git a/src/platform/datapath_winkernel.c b/src/platform/datapath_winkernel.c
@@ -82,7 +82,7 @@ typedef enum {
 //
 // The maximum number of UDP datagrams that can be sent with one call.
 //
-#define CXPLAT_MAX_BATCH_SEND                 6
+#define CXPLAT_MAX_BATCH_SEND                 1
 
 //
 // The maximum number of UDP datagrams to preallocate for URO.

diff --git a/src/platform/datapath_winuser.c b/src/platform/datapath_winuser.c
@@ -59,7 +59,7 @@ CxPlatFuzzerRecvMsg(
 //
 // The maximum number of UDP datagrams that can be sent with one call.
 //
-#define CXPLAT_MAX_BATCH_SEND                 7
+#define CXPLAT_MAX_BATCH_SEND                 1
 
 //
 // The maximum UDP receive coalescing payload.