Merge pull request #1311 from Tencent/ft/master/merge2409

2.1 merge to master
Tencent · Sep 2, 2024 · 9ab46e1 · 9ab46e1
2 parents c559159 + c5ba0ed
commit 9ab46e1
Show file tree

Hide file tree

Showing 143 changed files with 8,941 additions and 6,207 deletions.
diff --git a/clang_format_ignore.txt b/clang_format_ignore.txt
@@ -1,9 +1,34 @@
-mars/boost
-mars/googletest
-mars/googlemock
-mars/rapidjson
-mars/log/crypt/micro-ecc-master 
-mars/comm/UWP/zlib
-mars/openssl
-mars/zstd/tests
-samples
+mars/mars/boost
+mars/mars/googletest
+mars/mars/googlemock
+mars/mars/rapidjson
+mars/mars/log/crypt/micro-ecc-master
+mars/mars/comm/UWP/zlib
+mars/mars/openssl
+mars/mars/zstd/tests
+mars/samples
+
+mars-private/mars/mmjpeg
+mars-private/mars/protobuf
+mars-private/mars/cdn/src/proto
+mars-private/mars/cdn/src/protocol
+mars-private/mars/openssl
+mars-private/mars/vfs
+mars-private/mars/smc/src/protobuf
+
+mars-private/mars/andromeda/andromeda.h
+mars-private/mars/andromeda/cronet_android_jni_callback.h
+mars-private/mars/andromeda/cronet_file_task_runer_wrapper.h
+mars-private/mars/andromeda/http_cronet_context_builder.h
+mars-private/mars/andromeda/http_network_estimate_callback.h
+mars-private/mars/andromeda/http_result_callback.h
+mars-private/mars/andromeda/http_with_cronet.h
+
+mars-wechat/mars/webp
+mars-wechat/mars/accessory
+
+build
+cmake_build
+tools
+mmnet
+openssl-build-tools
diff --git a/mars/CMakeLists.txt b/mars/CMakeLists.txt
@@ -24,7 +24,7 @@ add_subdirectory(zstd/build/cmake/lib zstd)
 
 project (mars)
 
-include(comm/CMakeUtils.txt)
+include(comm/utils.cmake)
 
 include_directories(.)
 include_directories(..)

diff --git a/mars/app/CMakeLists.txt b/mars/app/CMakeLists.txt
@@ -5,7 +5,7 @@ message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
 
 project (app)
 
-include(../comm/CMakeUtils.txt)
+include(../comm/utils.cmake)
 include(../comm/CMakeExtraFlags.txt)
 
 include_directories(.)

diff --git a/mars/app/app_manager.cc b/mars/app/app_manager.cc
@@ -10,7 +10,6 @@
 #include "mars/comm/objc/data_protect_attr.h"
 #endif
 
-#include "mars/baseevent/baseprjevent.h"
 #include "mars/comm/dns/dns.h"
 #include "mars/comm/xlogger/xlogger.h"
 
@@ -51,7 +50,7 @@ mars::comm::ProxyInfo AppManager::GetProxyInfo(const std::string& _host) {
     }
 
     if (!slproxymutex_.try_lock_for(std::chrono::milliseconds(500))) {
-        return mars::comm::ProxyInfo();
+        return {};
     }
 
     if (slproxycount_ < 3 || 5 * 1000 > gettickspan(slproxytimetick_)) {
@@ -65,7 +64,7 @@ mars::comm::ProxyInfo AppManager::GetProxyInfo(const std::string& _host) {
         return proxy_info_;
     }
 
-    return mars::comm::ProxyInfo();
+    return {};
 }
 
 std::string AppManager::GetAppFilePath() {

diff --git a/mars/baseevent/CMakeLists.txt b/mars/baseevent/CMakeLists.txt
@@ -5,7 +5,7 @@ message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
 
 project (baseevent)
 
-include(../comm/CMakeUtils.txt)
+include(../comm/utils.cmake)
 include(../comm/CMakeExtraFlags.txt)
 
 

diff --git a/mars/baseevent/base_logic.h b/mars/baseevent/base_logic.h
@@ -22,10 +22,13 @@
 
 #include <stdint.h>
 
+#include <string>
+
 namespace mars {
 namespace baseevent {
 void OnCreate();
 void OnInitBeforeOnCreate(int _encoder_status);
+void OnInitBeforeOnCreateV2(int _encoder_status, std::string _encoder_name);
 void OnDestroy();
 void OnSingalCrash(int _sig);
 void OnExceptionCrash();

diff --git a/mars/baseevent/baseprjevent.h b/mars/baseevent/baseprjevent.h
@@ -24,6 +24,8 @@
 
 extern boost::signals2::signal<void()>& GetSignalOnCreate();
 extern boost::signals2::signal<void(int _encoder_version)>& GetSignalOnInitBeforeOnCreate();
+extern boost::signals2::signal<void(int _encoder_version, std::string _encoder_name)>&
+GetSignalOnInitBeforeOnCreateV2();
 extern boost::signals2::signal<void()>& GetSignalOnDestroy();
 extern boost::signals2::signal<void(int _sig)>& GetSignalOnSingalCrash();
 extern boost::signals2::signal<void()>& GetSignalOnExceptionCrash();

diff --git a/mars/baseevent/src/baseprj.cc b/mars/baseevent/src/baseprj.cc
@@ -37,6 +37,10 @@ void OnInitBeforeOnCreate(int _encoder_status) {
     GetSignalOnInitBeforeOnCreate()(_encoder_status);
 }
 
+void OnInitBeforeOnCreateV2(int _encoder_status, std::string _encoder_name) {
+    GetSignalOnInitBeforeOnCreateV2()(_encoder_status, _encoder_name);
+}
+
 void OnDestroy() {
     GetSignalOnDestroy()();
 }

diff --git a/mars/baseevent/src/baseprjevent.cc b/mars/baseevent/src/baseprjevent.cc
@@ -29,6 +29,11 @@ boost::signals2::signal<void(int _encoder_version)>& GetSignalOnInitBeforeOnCrea
     return SignalOnInitBeforeOnCreate;
 }
 
+boost::signals2::signal<void(int _encoder_version, std::string _encoder_name)>& GetSignalOnInitBeforeOnCreateV2() {
+    static boost::signals2::signal<void(int _encoder_version, std::string _encoder_name)> SignalOnInitBeforeOnCreateV2;
+    return SignalOnInitBeforeOnCreateV2;
+}
+
 boost::signals2::signal<void()>& GetSignalOnDestroy() {
     static boost::signals2::signal<void()> SignalOnDestroy;
     return SignalOnDestroy;

diff --git a/mars/boost/CMakeLists.txt b/mars/boost/CMakeLists.txt
@@ -6,7 +6,7 @@ add_compile_options(-w) # 屏蔽所有编译警告
 
 project (mars-boost)
 
-include(../comm/CMakeUtils.txt)
+include(../comm/utils.cmake)
 
 include_directories(.)
 include_directories(..)

diff --git a/mars/boot/CMakeLists.txt b/mars/boot/CMakeLists.txt
@@ -5,7 +5,7 @@ message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
 
 project(boot)
 
-include(../comm/CMakeUtils.txt)
+include(../comm/utils.cmake)
 include(../comm/CMakeExtraFlags.txt)
 
 include_directories(.)

diff --git a/mars/boot/context.h b/mars/boot/context.h
@@ -5,11 +5,12 @@
 #ifndef MMNET_BASE_CONTEXT_H
 #define MMNET_BASE_CONTEXT_H
 
+#include <atomic>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <vector>
-#include <atomic>
 
 #include "base_manager.h"
 
@@ -97,6 +98,11 @@ class Context {
     static std::atomic<int> s_context_index;
 };
 
+template <class... Args>
+std::shared_ptr<Context> make_context_ptr(Args&&... args) {
+    return std::shared_ptr<Context>(Context::CreateContext(std::forward<Args>(args)...), Context::DestroyContext);
+}
+
 }  // namespace boot
 }  // namespace mars
 

diff --git a/mars/comm/CMakeLists.txt b/mars/comm/CMakeLists.txt
@@ -5,13 +5,14 @@ message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
 
 project (comm)
 
-include(CMakeUtils.txt)
+include(utils.cmake)
 include(CMakeExtraFlags.txt)
 
 include_directories(.)
 include_directories(..)
 include_directories(../..)
 include_directories(../openssl/include)
+include_directories(alarm)
 include_directories(assert)
 include_directories(corepattern)
 include_directories(crypt)
@@ -27,6 +28,9 @@ include_directories(owl)
 file(GLOB SELF_TEMP_SRC_FILES RELATIVE ${PROJECT_SOURCE_DIR} *.cc *.c *.h)
 list(APPEND SELF_SRC_FILES ${SELF_TEMP_SRC_FILES})
 
+file(GLOB SELF_TEMP_SRC_FILES RELATIVE ${PROJECT_SOURCE_DIR} alarm/*.cc alarm/*.h)
+source_group(assert FILES ${SELF_TEMP_SRC_FILES})
+list(APPEND SELF_SRC_FILES ${SELF_TEMP_SRC_FILES})
 
 file(GLOB SELF_TEMP_SRC_FILES RELATIVE ${PROJECT_SOURCE_DIR} assert/*.c assert/*.h)
 source_group(assert FILES ${SELF_TEMP_SRC_FILES})

diff --git a/mars/comm/alarm.cc b/mars/comm/alarm.cc
@@ -19,11 +19,14 @@
 
 #include "comm/alarm.h"
 
+#include "alarm/alarm_manager.h"
 #include "comm/assert/__assert.h"
 #include "comm/platform_comm.h"
 #include "comm/thread/lock.h"
 #include "comm/time_utils.h"
 
+using namespace mars::alarm;
+
 namespace mars {
 namespace comm {
 
@@ -58,7 +61,14 @@ bool Alarm::Start(int _after, bool _needWake) {
 
 #ifdef ANDROID
 
-    if (_needWake && !startAlarm(type_, (int64_t)seq, _after)) {
+    bool ret = false;
+    if (context_ && context_->GetManager<AlarmManager>()
+        && context_->GetManager<AlarmManager>()->IsAlarmCallbackSet()) {
+        ret = context_->GetManager<AlarmManager>()->StartAlarm(type_, (int64_t)seq, _after);
+    } else {
+        ret = startAlarm(type_, (int64_t)seq, _after);
+    }
+    if (_needWake && !ret) {
         xerror2(TSF "startAlarm error, id:%0, after:%1, seq:%2", (uintptr_t)this, _after, seq);
         MessageQueue::CancelMessage(broadcast_msg_id_);
         broadcast_msg_id_ = MessageQueue::KNullPost;
@@ -96,7 +106,15 @@ bool Alarm::Cancel() {
 
 #ifdef ANDROID
 
-    if (!stopAlarm((int64_t)seq_)) {
+    bool ret = false;
+    if (context_ && context_->GetManager<AlarmManager>()
+        && context_->GetManager<AlarmManager>()->IsAlarmCallbackSet()) {
+        ret = context_->GetManager<AlarmManager>()->StopAlarm((int64_t)seq_);
+    } else {
+        ret = stopAlarm((int64_t)seq_);
+    }
+
+    if (!ret) {
         xwarn2(TSF "stopAlarm error, id:%0, seq:%1", (uintptr_t)this, seq_);
         status_ = kCancel;
         endtime_ = gettickcount();
@@ -186,11 +204,21 @@ void Alarm::OnAlarm(const MessageQueue::MessagePost_t& _id, MessageQueue::Messag
             return;
         }
 
-        stopAlarm(seq_);
-
+        // stopAlarm(seq_);
         if (startAlarm(type_, (int64_t)seq_, missTime))
             return;
 
+        if (context_ && context_->GetManager<AlarmManager>()
+            && context_->GetManager<AlarmManager>()->IsAlarmCallbackSet()) {
+            context_->GetManager<AlarmManager>()->StopAlarm(seq_);
+            if (context_->GetManager<AlarmManager>()->StartAlarm(type_, (int64_t)seq_, missTime))
+                return;
+        } else {
+            stopAlarm(seq_);
+            if (startAlarm(type_, (int64_t)seq_, missTime))
+                return;
+        }
+
         xerror2(TSF "startAlarm err, continue") >> group;
     }
 

diff --git a/mars/comm/alarm.h b/mars/comm/alarm.h
@@ -22,6 +22,7 @@
 
 #include <boost/bind.hpp>
 
+#include "boot/context.h"
 #include "comm/xlogger/xlogger.h"
 #include "messagequeue/message_queue.h"
 
@@ -52,8 +53,9 @@ class Alarm {
 
  public:
     template <class T>
-    explicit Alarm(const T& _op, bool _inthread = true)
-    : target_(detail::transform(_op))
+    explicit Alarm(const T& _op, bool _inthread = true, mars::boot::Context* _context = nullptr)
+    : context_(_context)
+    , target_(detail::transform(_op))
     , reg_async_(MessageQueue::InstallAsyncHandler(MessageQueue::GetDefMessageQueue()))
     , broadcast_msg_id_(MessageQueue::KNullPost)
     , runthread_(boost::bind(&Alarm::__Run, this), "alarm")
@@ -73,8 +75,9 @@ class Alarm {
     }
 
     template <class T>
-    explicit Alarm(const T& _op, const MessageQueue::MessageQueue_t& _id)
-    : target_(detail::transform(_op))
+    explicit Alarm(const T& _op, const MessageQueue::MessageQueue_t& _id, mars::boot::Context* _context = nullptr)
+    : context_(_context)
+    , target_(detail::transform(_op))
     , reg_async_(MessageQueue::InstallAsyncHandler(_id))
     , broadcast_msg_id_(MessageQueue::KNullPost)
     , runthread_(boost::bind(&Alarm::__Run, this), "alarm")
@@ -132,6 +135,7 @@ class Alarm {
     virtual void __Run();
 
  private:
+    mars::boot::Context* context_;
     Runnable* target_;
     MessageQueue::ScopeRegister reg_async_;
     MessageQueue::MessagePost_t broadcast_msg_id_;

diff --git a/mars/comm/alarm/CMakeLists.txt b/mars/comm/alarm/CMakeLists.txt
@@ -0,0 +1,42 @@
+cmake_minimum_required (VERSION 3.6)
+
+set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}" CACHE PATH "Installation directory" FORCE)
+message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
+
+project (alarm)
+
+include(../comm/CMakeUtils.txt)
+include(../comm/CMakeExtraFlags.txt)
+
+include_directories(.)
+include_directories(src)
+include_directories(..)
+include_directories(../..)
+include_directories(../comm)
+include_directories(../../..)
+include_directories(../boot)
+
+file(GLOB SELF_TEMP_SRC_FILES RELATIVE ${PROJECT_SOURCE_DIR} *.cc *.h)
+list(APPEND SELF_SRC_FILES ${SELF_TEMP_SRC_FILES})
+
+file(GLOB SELF_TEMP_SRC_FILES RELATIVE ${PROJECT_SOURCE_DIR} src/*.cc src/*.h)
+source_group(src FILES ${SELF_TEMP_SRC_FILES})
+list(APPEND SELF_SRC_FILES ${SELF_TEMP_SRC_FILES})
+
+
+if(MSVC)
+    add_definitions(/FI"../../comm/projdef.h")
+    include_directories(../comm/windows)
+elseif(ANDROID)
+    if(NOT CPP_CALL_BACK)
+        file(GLOB SELF_ANDROID_SRC_FILES RELATIVE ${PROJECT_SOURCE_DIR} jni/*.cc)
+    endif()
+    if(NATIVE_CALLBACK)
+        message("applogic native callback")
+        add_definitions(-DNATIVE_CALLBACK)
+    endif()
+
+    list(APPEND SELF_SRC_FILES ${SELF_ANDROID_SRC_FILES})
+endif()
+
+BuildWithUnitTest("${PROJECT_NAME}" "${SELF_SRC_FILES}")