Merge pull request #155 from Countly/cmake-update

Cmake update

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 26.1.1
+- Updated CMake minimum required version to use the range format with upper the end of `3.31`.
+- Hardened mutex handling against exceptions.
+
 ## 26.1.0
 - ! Minor breaking change ! SDK Behavior Settings is now enabled by default. Changes made on SDK Manager > SDK Behavior Settings on your server will affect SDK behavior directly.
 

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.0...3.31)
 
 # Acquire countly version from constant
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/include/countly/constants.hpp COUNTLY_HPP_CONTENTS)
@@ -119,6 +119,7 @@ if(COUNTLY_BUILD_TESTS)
     ${CMAKE_CURRENT_SOURCE_DIR}/tests/request.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tests/config.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tests/immediate_stop.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/tests/mutex_exception_safety.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tests/sbs.cpp)
 
     target_compile_options(countly-tests PRIVATE -g)

include/countly.hpp

@@ -313,6 +313,14 @@ class Countly : public cly::CountlyDelegates {
    */
   std::vector<std::string> debugReturnStateOfEQ();
 
+  /**
+   * Injects a raw (possibly malformed) string directly into the in-memory event
+   * queue, bypassing serialization. Used only by the mutex exception-safety test
+   * to force a parse failure inside the locked section of updateSession().
+   * Warning: This method is for debugging purposes, and it is going to be removed in the future.
+   */
+  void debugInjectRawEvent(const std::string &raw);
+
   /**
    * This function should not be used as it will be removed in a future release.
    * It is currently added as a temporary workaround.
@@ -331,6 +339,8 @@ class Countly : public cly::CountlyDelegates {
 
   inline void clearRequestQueue() {
     if (is_sdk_initialized) {
+      // serialize storage access with the background processQueue thread
+      std::lock_guard<std::mutex> lk(*mutex);
       requestModule->clearRequestQueue();
     }
   }

include/countly/constants.hpp

@@ -13,7 +13,7 @@
 #include <string>
 
 #define COUNTLY_SDK_NAME "cpp-native-unknown"
-#define COUNTLY_SDK_VERSION "26.1.0"
+#define COUNTLY_SDK_VERSION "26.1.1"
 #define COUNTLY_POST_THRESHOLD 2000
 #define COUNTLY_KEEPALIVE_INTERVAL 3000
 #define COUNTLY_MAX_EVENTS_DEFAULT 200