Merge pull request #1701 from CastagnaIT/replace_atomic

Replaced std::atomic<struct> with mutex

Author: CastagnaIT

CMakeLists.txt

@@ -34,10 +34,6 @@ else()
   add_definitions(-D__STDC_FORMAT_MACROS)
 endif()
 
-if(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
-  list(APPEND DEPLIBS "atomic")
-endif()
-
 # Sources to build
 # (use add_dir_sources function to add source/header files from the CMakeLists files of subdirectories)
 add_subdirectory(src)

src/CompResources.h

@@ -59,13 +59,21 @@ class ATTR_DLL_LOCAL CCompResources
    * \brief Get the current screen info.
    * \return The screen info.
    */
-  ScreenInfo GetScreenInfo() const { return m_screenInfo.load(); }
+  const ScreenInfo& GetScreenInfo()
+  {
+    std::lock_guard<std::mutex> lock(m_screenInfoMutex);
+    return m_screenInfo;
+  }
 
   /*!
    * \brief Set the screen info.
    * \param screenInfo The scren info
    */
-  void SetScreenInfo(const ScreenInfo& screenInfo) { m_screenInfo = screenInfo; }
+  void SetScreenInfo(const ScreenInfo& screenInfo)
+  {
+    std::lock_guard<std::mutex> lock(m_screenInfoMutex);
+    m_screenInfo = screenInfo;
+  }
 
   /*!
    * \brief Cookies that can be shared along with HTTP requests.
@@ -87,7 +95,8 @@ class ATTR_DLL_LOCAL CCompResources
   const adaptive::AdaptiveTree& GetTree() const { return *m_tree; }
 
 private:
-  std::atomic<ScreenInfo> m_screenInfo;
+  ScreenInfo m_screenInfo;
+  std::mutex m_screenInfoMutex;
   std::unordered_set<UTILS::CURL::Cookie> m_cookies;
   std::mutex m_cookiesMutex;
   adaptive::AdaptiveTree* m_tree{nullptr};

src/common/Chooser.cpp

@@ -88,7 +88,7 @@ CHOOSER::IRepresentationChooser::IRepresentationChooser()
 
 void CHOOSER::IRepresentationChooser::OnUpdateScreenRes()
 {
-  const auto sInfo = CSrvBroker::GetResources().GetScreenInfo();
+  const auto& sInfo = CSrvBroker::GetResources().GetScreenInfo();
 
   LOG::Log(LOGINFO,
            "[Repr. chooser] Resolution set: %dx%d, max allowed: %dx%d, Adjust refresh rate: %i",

src/test/CMakeLists.txt

@@ -53,11 +53,7 @@ add_executable(${BINARY}
     ../utils/XMLUtils.cpp
     )
 
-if(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
-  SET(ADD_LINK_LIBS "atomic")
-endif()
-
-target_link_libraries(${BINARY} PRIVATE ${BENTO4_LIBRARIES} ${PUGIXML_LIBRARIES} ${GTEST_LIBRARIES} Threads::Threads ${CMAKE_DL_LIBS} ${ADD_LINK_LIBS})
+target_link_libraries(${BINARY} PRIVATE ${BENTO4_LIBRARIES} ${PUGIXML_LIBRARIES} ${GTEST_LIBRARIES} Threads::Threads ${CMAKE_DL_LIBS})
 
 set(TEST_DATA_DIR "${CMAKE_SOURCE_DIR}/src/test/manifests")
 add_test(NAME manifest_tests COMMAND ${BINARY} "${TEST_DATA_DIR}")