Fix process container build (#1650)

Co-authored-by: MFransen69 <39826971+MFransen69@users.noreply.github.com>
rdkcentral · Jun 18, 2024 · 2d91420 · 2d91420
1 parent 431ba5a
commit 2d91420
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 44 deletions.
diff --git a/Source/Thunder/Config.h b/Source/Thunder/Config.h
@@ -392,7 +392,7 @@ namespace PluginHost {
                 ProcessContainerConfig& operator=(ProcessContainerConfig&& move) noexcept
                 {
                     if (this != &move) {
-                        Logging = std::move(move.Logging;
+                        Logging = std::move(move.Logging);
                     }
                     return (*this);
                 }

diff --git a/Source/com/Communicator.cpp b/Source/com/Communicator.cpp
@@ -22,10 +22,6 @@
 #include <limits>
 #include <memory>
 
-#ifdef PROCESSCONTAINERS_ENABLED
-#include "ProcessInfo.h"
-#endif
-
 namespace Thunder {
 namespace RPC {
 

diff --git a/Source/com/Communicator.h b/Source/com/Communicator.h
@@ -32,7 +32,7 @@
 
 
 #ifdef PROCESSCONTAINERS_ENABLED
-#include "../processcontainers/ProcessContainer.h"
+#include <processcontainers/ProcessContainer.h>
 #endif
 
 

diff --git a/Source/extensions/processcontainers/Messaging.h b/Source/extensions/processcontainers/Messaging.h
@@ -21,7 +21,6 @@
 
 #include "Module.h"
 
-#include "../messaging/messaging.h"
 
 namespace Thunder {
 namespace ProcessContainers {

diff --git a/Source/extensions/processcontainers/Module.h b/Source/extensions/processcontainers/Module.h
@@ -24,6 +24,7 @@
 #endif
 
 #include <core/core.h>
+#include <messaging/messaging.h>
 
 #if defined(__WINDOWS__) && defined(CONTAINERS_EXPORTS)
 #undef EXTERNAL

diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWC.cpp b/Source/extensions/processcontainers/implementations/AWCImplementation/AWC.cpp
@@ -43,7 +43,7 @@ AWCListener::AWCListener(AWCStateChangeNotifier * notifier)
     : _notifier(notifier)
 {}
 
-void AWCListener::notifyWindowChange(int window_id, awc::AWCClient::awc_window_state_t window_state, unsigned int pid)
+void AWCListener::notifyWindowChange(int window_id VARIABLE_IS_NOT_USED, awc::AWCClient::awc_window_state_t window_state VARIABLE_IS_NOT_USED, unsigned int pid VARIABLE_IS_NOT_USED)
 {
     // intentionally left empty
 }

diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp b/Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp
@@ -33,7 +33,7 @@ struct AWCProcessorInfo : public BaseRefCount<IProcessorInfo> {
         return 0;
     }
 
-    uint64_t CoreUsage(uint32_t coreNum) const
+    uint64_t CoreUsage(uint32_t coreNum VARIABLE_IS_NOT_USED) const
     {
         return 0;
     }

diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp b/Source/extensions/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp
@@ -151,7 +151,7 @@ bool AWCProxyContainer::Start(const string &command, IStringIterator &params)
 
 /* provided timeout is not used. Thunder provides 0ms timeout by default
  * and if this function returns false next Stop() will be retried after 10s */
-bool AWCProxyContainer::Stop(const uint32_t timeout /*ms*/)
+bool AWCProxyContainer::Stop(const uint32_t timeout /*ms*/ VARIABLE_IS_NOT_USED)
 {
     if(!IsRunning())
     {

diff --git a/...ce/extensions/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp b/...ce/extensions/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp
@@ -16,8 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "CRunImplementation.h"
-#include "JSON.h"
 #include <thread>
 
 namespace Thunder {
@@ -31,7 +31,7 @@ namespace ProcessContainers {
         return cRunContainerAdministrator;
     }
 
-    IContainer* CRunContainerAdministrator::Container(const string& id, IStringIterator& searchpaths, const string& logpath, const string& configuration)
+    IContainer* CRunContainerAdministrator::Container(const string& id, IStringIterator& searchpaths, const string& logpath, const string& configuration VARIABLE_IS_NOT_USED)
     {
         searchpaths.Reset(0);
         while (searchpaths.Next()) {
@@ -61,7 +61,7 @@ namespace ProcessContainers {
     {
     }
 
-    void CRunContainerAdministrator::Logging(const string& logPath, const string& loggingOptions)
+    void CRunContainerAdministrator::Logging(const string& logPath VARIABLE_IS_NOT_USED, const string& loggingOptions VARIABLE_IS_NOT_USED)
     {
         // Only container-scope logging
     }
@@ -101,7 +101,7 @@ namespace ProcessContainers {
             Core::Directory(logPath.c_str()).CreatePath();
 
             libcrun_error_t error = nullptr;
-            int ret = init_logging(&_context.output_handler, &_context.output_handler_arg, _name.c_str(), (logPath + "/container.log").c_str(), &error);
+            int ret = libcrun_init_logging(&_context.output_handler, &_context.output_handler_arg, _name.c_str(), (logPath + "/container.log").c_str(), &error);
             if (ret != 0) {
                 TRACE_L1("Cannot initialize logging of container \"%s\" in directory %s\n. Error %d: %s", _name.c_str(), logPath.c_str(), error->status, error->msg);
             }
@@ -225,7 +225,7 @@ namespace ProcessContainers {
         return result;
     }
 
-    bool CRunContainer::Stop(const uint32_t timeout /*ms*/)
+    bool CRunContainer::Stop(const uint32_t timeout /*ms*/ VARIABLE_IS_NOT_USED)
     {
         bool result = true;
         libcrun_error_t error = nullptr;

diff --git a/Source/extensions/processcontainers/implementations/CRunImplementation/CRunImplementation.h b/Source/extensions/processcontainers/implementations/CRunImplementation/CRunImplementation.h
@@ -24,13 +24,18 @@
 #include "processcontainers/common/BaseRefCount.h"
 #include "processcontainers/common/CGroupContainerInfo.h"
 
+
+PUSH_WARNING(DISABLE_WARNING_PEDANTIC)
+
 extern "C" {
 #include <crun/container.h>
 #include <crun/error.h>
 #include <crun/status.h>
 #include <crun/utils.h>
 }
 
+POP_WARNING()
+
 namespace Thunder {
 namespace ProcessContainers {
 

diff --git a/.../extensions/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp b/.../extensions/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp
@@ -22,7 +22,6 @@
 #include <Dobby/IpcService/IpcFactory.h>
 #include <fstream>
 #include <thread>
-#include <json/value.h>
 
 namespace Thunder {
 
@@ -36,7 +35,7 @@ namespace ProcessContainers {
         return dobbyContainerAdministrator;
     }
 
-    IContainer* DobbyContainerAdministrator::Container(const string& id, IStringIterator& searchpaths, const string& logpath, const string& configuration)
+    IContainer* DobbyContainerAdministrator::Container(const string& id, IStringIterator& searchpaths, const string& logpath, const string& configuration VARIABLE_IS_NOT_USED)
     {
         searchpaths.Reset(0);
         while (searchpaths.Next()) {
@@ -97,7 +96,7 @@ namespace ProcessContainers {
     {
     }
 
-    void DobbyContainerAdministrator::Logging(const string& logPath, const string& loggingOptions)
+    void DobbyContainerAdministrator::Logging(const string& logPath VARIABLE_IS_NOT_USED, const string& loggingOptions VARIABLE_IS_NOT_USED)
     {
         // Only container-scope logging
     }
@@ -173,7 +172,7 @@ namespace ProcessContainers {
         return result;
     }
 
-    void DobbyContainerAdministrator::containerStopCallback(int32_t cd, const std::string& containerId,
+    void DobbyContainerAdministrator::containerStopCallback(int32_t cd VARIABLE_IS_NOT_USED, const std::string& containerId,
         IDobbyProxyEvents::ContainerState state,
         const void* params)
     {
@@ -390,7 +389,7 @@ namespace ProcessContainers {
         return result;
     }
 
-    bool DobbyContainer::Stop(const uint32_t timeout /*ms*/)
+    bool DobbyContainer::Stop(const uint32_t timeout /*ms*/ VARIABLE_IS_NOT_USED)
     {
         // TODO: add timeout support
         bool result = false;

diff --git a/Source/extensions/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp b/Source/extensions/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp
@@ -132,24 +132,6 @@ namespace ProcessContainers {
         return _interfaces.at(_current).addresses[id];
     }
 
-    LXCContainer::Config::ConfigItem::ConfigItem(const ConfigItem& copy)
-        : Core::JSON::Container()
-        , Key(copy.Key)
-        , Value(copy.Value)
-    {
-        Add(_T("key"), &Key);
-        Add(_T("value"), &Value);
-    }
-
-    LXCContainer::Config::ConfigItem::ConfigItem(ConfigItem&& move)
-        : Core::JSON::Container()
-        , Key(std::move(move.Key))
-        , Value(std::move(move.Value))
-    {
-        Add(_T("key"), &Key);
-        Add(_T("value"), &Value);
-    }
-
     LXCContainer::Config::Config()
         : Core::JSON::Container()
         , ConsoleLogging("0")
@@ -369,7 +351,7 @@ namespace ProcessContainers {
         return result;
     }
 
-    bool LXCContainer::Stop(const uint32_t timeout /*ms*/)
+    bool LXCContainer::Stop(const uint32_t timeout VARIABLE_IS_NOT_USED /*ms*/)
     {
         bool result = true;
 
@@ -410,7 +392,7 @@ namespace ProcessContainers {
     uint32_t LXCContainer::Release() const
     {
         uint32_t lxcresult = lxc_container_put(_lxcContainer);
-        uint32_t retVal = BaseRefCount<IContainer>::Release();
+        uint32_t retval = BaseRefCount<IContainer>::Release();
 
         ASSERT((retval != Thunder::Core::ERROR_DESTRUCTION_SUCCEEDED) || (lxcresult == 1)); // if 1 is returned, lxc also released the container
         return retval;

diff --git a/Source/extensions/processcontainers/implementations/LXCImplementation/LXCImplementation.h b/Source/extensions/processcontainers/implementations/LXCImplementation/LXCImplementation.h
@@ -69,12 +69,40 @@ namespace ProcessContainers {
                 ConfigItem& operator=(ConfigItem&&) = delete;
                 ConfigItem& operator=(const ConfigItem&) = delete;
 
-                ConfigItem(ConfigItem&& move);
-                ConfigItem(const ConfigItem& copy);
-                ConfigItem();
-
                 ~ConfigItem() override = default;
 
+                ConfigItem()
+                    : Core::JSON::Container()
+                    , Key()
+                    , Value()
+                {
+                    Init();
+                }
+
+                ConfigItem(const ConfigItem& copy)
+                    : Core::JSON::Container()
+                    , Key(copy.Key)
+                    , Value(copy.Value)
+                {
+                    Init();
+                }
+
+                ConfigItem(ConfigItem&& move)
+                    : Core::JSON::Container()
+                    , Key(std::move(move.Key))
+                    , Value(std::move(move.Value))
+                {
+                    Init();
+                }
+
+            private:
+                void Init()
+                {
+                    Add(_T("key"), &Key);
+                    Add(_T("value"), &Value);
+                }
+
+            public:
                 Core::JSON::String Key;
                 Core::JSON::String Value;
             };