addStreamProxy、addStreamPusherProxy接口确保线程负载均衡

cmake/checks/atomic_check.cpp

@@ -1,4 +1,4 @@
-#include <atomic>
+#include <atomic>
 
 static int test()
 {

resource.rc

@@ -1,5 +1,5 @@
-#ifdef APSTUDIO_INVOKED
+#ifdef APSTUDIO_INVOKED
-#error This file is not editable by Visual C++.
+#error "This file is not editable by Visual C++."
 #endif //APSTUDIO_INVOKED
 
 #include "winres.h"

server/WebApi.cpp

@@ -1191,25 +1191,27 @@ void installWebApi() {
 
         auto dst_url = allArgs["dst_url"];
         auto retry_count = allArgs["retry_count"].empty() ? -1 : allArgs["retry_count"].as<int>();
-        addStreamPusherProxy(allArgs["schema"],
+        EventPollerPool::Instance().getPoller(false)->async([=](){
-                             allArgs["vhost"],
+            addStreamPusherProxy(allArgs["schema"],
-                             allArgs["app"],
+                                 allArgs["vhost"],
-                             allArgs["stream"],
+                                 allArgs["app"],
-                             allArgs["dst_url"],
+                                 allArgs["stream"],
-                             retry_count,
+                                 allArgs["dst_url"],
-                             allArgs["rtp_type"],
+                                 retry_count,
-                             allArgs["timeout_sec"],
+                                 allArgs["rtp_type"],
-                             args,
+                                 allArgs["timeout_sec"],
-                             [invoker, val, headerOut, dst_url](const SockException &ex, const string &key) mutable {
+                                 args,
-                                 if (ex) {
+                                 [invoker, val, headerOut, dst_url](const SockException &ex, const string &key) mutable {
-                                     val["code"] = API::OtherFailed;
+                                     if (ex) {
-                                     val["msg"] = ex.what();
+                                         val["code"] = API::OtherFailed;
-                                 } else {
+                                         val["msg"] = ex.what();
-                                     val["data"]["key"] = key;
+                                     } else {
-                                     InfoL << "Publish success, please play with player:" << dst_url;
+                                         val["data"]["key"] = key;
-                                 }
+                                         InfoL << "Publish success, please play with player:" << dst_url;
-                                 invoker(200, headerOut, val.toStyledString());
+                                     }
-                             });
+                                     invoker(200, headerOut, val.toStyledString());
+                                 });
+        });
     });
 
     // 关闭推流代理  [AUTO-TRANSLATED:91602b75]
@@ -1258,22 +1260,24 @@ void installWebApi() {
             vhost = allArgs["vhost"];
         }
         auto tuple = MediaTuple { vhost, allArgs["app"], allArgs["stream"], "" };
-        addStreamProxy(tuple,
+        EventPollerPool::Instance().getPoller(false)->async([=]() {
-                       allArgs["url"],
+            addStreamProxy(tuple,
-                       retry_count,
+                           allArgs["url"],
-                       option,
+                           retry_count,
-                       allArgs["rtp_type"],
+                           option,
-                       allArgs["timeout_sec"],
+                           allArgs["rtp_type"],
-                       args,
+                           allArgs["timeout_sec"],
-                       [invoker,val,headerOut](const SockException &ex,const string &key) mutable{
+                           args,
-                           if (ex) {
+                           [invoker,val,headerOut](const SockException &ex,const string &key) mutable{
-                               val["code"] = API::OtherFailed;
+                               if (ex) {
-                               val["msg"] = ex.what();
+                                   val["code"] = API::OtherFailed;
-                           } else {
+                                   val["msg"] = ex.what();
-                               val["data"]["key"] = key;
+                               } else {
-                           }
+                                   val["data"]["key"] = key;
-                           invoker(200, headerOut, val.toStyledString());
+                               }
-                       });
+                               invoker(200, headerOut, val.toStyledString());
+                           });
+        });
     });
 
     // 关闭拉流代理  [AUTO-TRANSLATED:5204f128]

src/Extension/Track.cpp

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
  *
  * This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).