Merge branch 'master' into development/dobby-sync

rdkcentral · Oct 11, 2024 · c322740 · c322740
2 parents d98ed83 + 456ee8d
commit c322740
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/Build Thunder on Linux.yml b/.github/workflows/Build Thunder on Linux.yml
@@ -17,7 +17,7 @@ on:
 
 jobs:
   Thunder:
-    uses: rdkcentral/Thunder/.github/workflows/Linux build template.yml@master
+    uses: rdkcentral/Thunder/.github/workflows/Linux build template.yml@development/actions-pep668-error # change back to master after Actions work again
 
   ThunderInterfaces:
     needs: Thunder

diff --git a/.github/workflows/Linux build template.yml b/.github/workflows/Linux build template.yml
@@ -28,8 +28,10 @@ jobs:
           echo "deb http://archive.ubuntu.com/ubuntu/ jammy-updates main universe restricted multiverse" | sudo tee -a /etc/apt/sources.list
           ${{matrix.architecture == '32' && 'sudo dpkg --add-architecture i386' || ':'}}
           sudo apt-get update
-          sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev ${{matrix.architecture == '32' && 'zlib1g-dev:i386 libssl-dev:i386 libsbc-dev:i386 gcc-11-multilib g++-11-multilib' || 'zlib1g-dev libssl-dev libsbc-dev'}}
-          sudo pip install jsonref
+          sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev ${{matrix.architecture == '32' && 'zlib1g-dev:i386 libssl-dev:i386 libsbc-dev:i386 gcc-13-multilib g++-13-multilib' || 'zlib1g-dev libssl-dev libsbc-dev'}}
+          python3 -m venv venv
+          source venv/bin/activate
+          pip install jsonref
 
 # ----- Checkout & DependsOn regex -----
 # --------- Thunder ----------
@@ -85,6 +87,7 @@ jobs:
 # ----- Installing generators & Options regex -----
     - name: Install generators
       run: |
+        source venv/bin/activate
         ${{matrix.architecture == '32' && 'export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig:$PKG_CONFIG_PATH' || 'PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH'}}
         cmake -G Ninja -S ThunderTools -B ${{matrix.build_type}}/build/ThunderTools \
         -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
@@ -104,6 +107,7 @@ jobs:
 # ----- Building & uploading artifacts -----
     - name: Build Thunder
       run: |
+        source venv/bin/activate
         ${{matrix.architecture == '32' && 'export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig:$PKG_CONFIG_PATH' || 'PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH'}}
         cmake -G Ninja -S Thunder -B ${{matrix.build_type}}/build/Thunder \
         -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \

diff --git a/.github/workflows/Test Thunder.yml b/.github/workflows/Test Thunder.yml
@@ -40,9 +40,10 @@ jobs:
           sudo gem install apt-spy2
           sudo apt-spy2 fix --commit --launchpad --country=US
           sudo apt-get update
-          sudo apt install python3-pip
+          sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev zlib1g-dev libssl-dev libgtest-dev
+          python3 -m venv venv
+          source venv/bin/activate
           pip install jsonref
-          sudo apt install build-essential cmake ninja-build libusb-1.0-0-dev zlib1g-dev libssl-dev libgtest-dev
     
 # ----- Checkout & DependsOn Regex -----
 # -------------- Thunder ---------------
@@ -98,12 +99,14 @@ jobs:
 # ----- Building -----
     - name: Install generators
       run: |
+        source venv/bin/activate
         cmake -G Ninja -S ThunderTools -B ${{matrix.build_type}}/build/ThunderTools \
         -DCMAKE_INSTALL_PREFIX=${{matrix.build_type}}/install/usr
         cmake --build ${{matrix.build_type}}/build/ThunderTools --target install
 
     - name: Build Thunder
       run: |
+        source venv/bin/activate
         cmake -G Ninja -S Thunder -B ${{matrix.build_type}}/build/Thunder \
         -DBINDING="127.0.0.1" \
         -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \

diff --git a/Source/Thunder/PluginServer.h b/Source/Thunder/PluginServer.h
@@ -148,6 +148,8 @@ namespace PluginHost {
             };
 
         public:
+            using Core::WorkerPool::Snapshot;
+
             WorkerPoolImplementation() = delete;
             WorkerPoolImplementation(WorkerPoolImplementation&&) = delete;
             WorkerPoolImplementation(const WorkerPoolImplementation&) = delete;

diff --git a/Source/core/Portability.h b/Source/core/Portability.h
@@ -190,6 +190,7 @@
 #define DISABLE_WARNING_DELETE_INCOMPLETE
 #define DISABLE_WARNING_INCONSISTENT_MISSING_OVERRIDE
 #define DISABLE_WARNING_MAYBE_UNINITIALIZED
+#define DISABLE_WARNING_FREE_NONHEAP_OBJECT
 
 #else
 #define DISABLE_WARNING_CONDITIONAL_EXPRESSION_IS_CONSTANT
@@ -221,6 +222,7 @@
 #define DISABLE_WARNING_DELETE_INCOMPLETE PUSH_WARNING_ARG_("-Wdelete-incomplete")
 #define DISABLE_WARNING_INCONSISTENT_MISSING_OVERRIDE PUSH_WARNING_ARG_("-Winconsistent-missing-override")
 #define DISABLE_WARNING_MAYBE_UNINITIALIZED PUSH_WARNING_ARG_("-Wmaybe-uninitialized")
+#define DISABLE_WARNING_FREE_NONHEAP_OBJECT PUSH_WARNING_ARG_("-Wfree-nonheap-object")
 #endif
 #endif
 

diff --git a/Source/core/Proxy.h b/Source/core/Proxy.h
@@ -94,7 +94,9 @@ namespace Thunder {
                     void* stAllocateBlock)
             {
                 reinterpret_cast<ProxyObject<CONTEXT>*>(stAllocateBlock)->__Destructed();
+PUSH_WARNING(DISABLE_WARNING_FREE_NONHEAP_OBJECT)
                 ::free(stAllocateBlock);
+POP_WARNING()
             }
 
         public:

diff --git a/Source/core/SocketPort.h b/Source/core/SocketPort.h
@@ -276,7 +276,9 @@ namespace Thunder {
                 return (((m_SocketType == LISTEN) || (m_SocketType == STREAM)) ? SOCK_STREAM : ((m_SocketType == DATAGRAM) ? SOCK_DGRAM : (m_SocketType == SEQUENCED ? SOCK_SEQPACKET : SOCK_RAW)));
             }
             uint16_t Events() override;
+PUSH_WARNING(DISABLE_WARNING_OVERLOADED_VIRTUALS)
             void Handle(const uint16_t events) override;
+POP_WARNING()
             bool Closed();
             void Opened();
             void Accepted();