Merge branch 'master' into scheduler_doc

rdkcentral · Jan 31, 2024 · cddf988 · cddf988
2 parents 65d1d18 + ef74813
commit cddf988
Show file tree

Hide file tree

Showing 24 changed files with 155 additions and 134 deletions.
diff --git a/Source/WPEFramework/ExampleConfigAll.json b/Source/WPEFramework/ExampleConfigAll.json
@@ -154,7 +154,7 @@
       "callsign":"Browser",
       "locator":"libbrowser.so",
       "classname":"Browser",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration":
       {
         "fullscreen":true,

diff --git a/Source/WPEFramework/ExampleConfigLinux.json b/Source/WPEFramework/ExampleConfigLinux.json
@@ -43,7 +43,7 @@
       "callsign": "Monitor",
       "locator": "libmonitor.so",
       "classname": "Monitor",
-      "startmode": "activated",
+      "startmode": "Activated",
       "configuration": {
         "observables": [
           {

diff --git a/Source/WPEFramework/ExampleConfigWindows.json b/Source/WPEFramework/ExampleConfigWindows.json
@@ -67,7 +67,7 @@
       "callsign": "Cobalt",
       "locator": "liboutofprocessplugin.so",
       "classname": "OutOfProcessPlugin",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "url": "http://netflix.com/tv",
         "sleep": "1",
@@ -82,7 +82,7 @@
       "callsign": "TestPlugin",
       "locator": "libTestPlugin.so",
       "classname": "TestPlugin",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "root": {
           "mode": "Local"
@@ -93,7 +93,7 @@
       "callsign": "Doofah",
       "locator": "libDoofah.so",
       "classname": "Doofah",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "connector": {
           "port": "\\\\.\\COM14"
@@ -105,7 +105,7 @@
       "callsign": "calculator",
       "locator": "librustbridge.so",
       "classname": "RustBridge",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "module": "calculator.dll",
         "root": {
@@ -117,7 +117,7 @@
       "callsign": "Provisioning",
       "locator": "libProvisioning.so",
       "classname": "Provisioning",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "provisionpath": "127.0.0.1:7777"
       }
@@ -126,7 +126,7 @@
       "callsign": "BridgeLink",
       "locator": "libBridgeLink.so",
       "classname": "BridgeLink",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "source": "192.168.11.24:62000",
         "retries": 255,
@@ -137,13 +137,13 @@
       "callsign": "Butler",
       "locator": "libButler.so",
       "classname": "Butler",
-      "startmode": "activated"
+      "startmode": "Activated"
     },
     {
       "callsign": "ZigbeeControl",
       "locator": "libZigbeeControl.so",
       "classname": "ZigbeeControl",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "port": "\\\\.\\COM4",
         "watchdog": 1442,
@@ -154,7 +154,7 @@
       "callsign": "ZWaveControl",
       "locator": "libZWaveControl.so",
       "classname": "ZWaveControl",
-      "startmode": "activated",
+      "startmode": "Activated",
       "configuration": {
         "port": "\\\\.\\COM4",
         "key":  "ba:09:87:65:43:21:de:ad:be:ef:12:34:56:78:90:ab"
@@ -164,7 +164,7 @@
       "callsign": "MQTTBroker",
       "locator": "libMQTTBroker.so",
       "classname": "MQTTBroker",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "port": "1883",
         "binding": "0.0.0.0",
@@ -175,7 +175,7 @@
       "callsign": "WebBridge",
       "locator": "libWebBridge.so",
       "classname": "WebBridge",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "context": "added"
       }
@@ -184,22 +184,22 @@
       "callsign": "QuizzMaster",
       "locator": "libQuizzMaster.so",
       "classname": "QuizzMaster",
-      "startmode": "deactivated"
+      "startmode": "Deactivated"
     },
     {
       "callsign": "StateController",
       "locator": "libStateController.so",
       "classname": "StateController",
-      "startmode": "deactivated"
+      "startmode": "Deactivated"
     },
     {
       "callsign": "SimpleCOMRPCPluginServer",
       "locator": "libSimpleCOMRPCPluginServer.so",
       "classname": "SimpleCOMRPCPluginServer",
-      "startmode": "deactivated"
+      "startmode": "Deactivated"
     },
     {
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "callsign": "VirtualControl",
       "classname": "VirtualControl",
       "locator": "libVirtualControl.so",
@@ -281,13 +281,13 @@
       }
     },
     {
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "callsign": "RuleEngine",
       "classname": "RuleEngine",
       "locator": "libRuleEngine.so"
     },
     {
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "callsign": "CloudRelay",
       "classname": "CloudRelay",
       "locator": "libCloudRelay.so",
@@ -315,7 +315,7 @@
       "callsign": "IOControl",
       "locator": "libIOControl.so",
       "classname": "IOControl",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "port": "\\\\.\\COM24",
         "pins": [
@@ -362,7 +362,7 @@
       "callsign": "OneWireControl",
       "locator": "libOneWireControl.so",
       "classname": "OneWireControl",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "port": "\\\\.\\COM24",
         "devices": [
@@ -378,7 +378,7 @@
       "callsign": "I2CControl",
       "locator": "libI2CControl.so",
       "classname": "I2CControl",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "port": "\\\\.\\COM24",
         "devices": [
@@ -395,7 +395,7 @@
       "callsign": "OutOfProcessPlugin",
       "locator": "libOutOfProcessPlugin.so",
       "classname": "OutOfProcessPlugin",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "url": "http://netflix.com/tv",
         "sleep": "5",
@@ -410,13 +410,13 @@
       "callsign": "JSONRPCPlugin",
       "locator": "libJSONRPCPlugin.so",
       "classname": "JSONRPCPlugin",
-      "startmode": "deactivated"
+      "startmode": "Deactivated"
     },
     {
       "callsign": "OpenCDMi",
       "locator": "libOpenCDMi.so",
       "classname": "OCDM",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "connector": "127.0.0.1:7912",
         "root": {
@@ -428,7 +428,7 @@
       "callsign": "Monitor",
       "locator": "libMonitor.so",
       "classname": "Monitor",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "observables": [
           {
@@ -454,7 +454,7 @@
       "callsign": "WebServer",
       "locator": "libWebServer.so",
       "classname": "WebServer",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "communicator": "127.0.0.1:2349",
       "configuration": {
         "port": 8080,
@@ -468,7 +468,7 @@
       "callsign": "DeviceInfo",
       "locator": "libdeviceinfo.so",
       "classname": "DeviceInfo",
-      "startmode": "activated",
+      "startmode": "Activated",
       "configuration": {
         "location": "external",
         "identifier": "internal",
@@ -482,7 +482,7 @@
       "callsign": "TimeSync",
       "locator": "libtimesync.so",
       "classname": "TimeSync",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "interval": 30,
         "retries": 20,
@@ -499,7 +499,7 @@
       "callsign": "LocationSync",
       "locator": "liblocationsync.so",
       "classname": "LocationSync",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "interval": 30,
         "retries": 20,
@@ -510,7 +510,7 @@
       "callsign": "BackOffice",
       "locator": "libbackoffice.so",
       "classname": "BackOffice",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "server": "ws.metrological.com",
         "port": 80,
@@ -525,14 +525,14 @@
       "callsign": "Dictionary",
       "locator": "libdictionary.so",
       "classname": "Dictionary",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "communicator": "127.0.0.1:5522"
     },
     {
       "callsign": "DIALServer",
       "locator": "libdialserver.so",
       "classname": "DIALServer",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "name": "ExploraUltra",
         "model": "Generic Platform",
@@ -565,19 +565,19 @@
       "callsign": "MessageControl",
       "locator": "libmessagecontrol.so",
       "classname": "MessageControl",
-      "startmode": "activated"
+      "startmode": "Activated"
     },
     {
       "callsign": "TraceControl",
       "locator": "libtracecontrol.so",
       "classname": "TraceControl",
-      "startmode": "deactivated"
+      "startmode": "Deactivated"
     },
     {
       "callsign": "RemoteControl",
       "locator": "libremotecontrol.so",
       "classname": "RemoteControl",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "mapfile": "ir-remote.json"
       }
@@ -586,15 +586,15 @@
       "callsign": "DNSServer",
       "locator": "libDNSServer.so",
       "classname": "DNSServer",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "bind": "0.0.0.0:53",
         "multicast": "224.0.0.251:5353",
         "server": [ "192.168.1.250:53", "8.8.8.8:53" ]
       }
     },
     {
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "callsign": "WebKitBrowser",
       "classname": "OutOfProcessPlugin",
       "locator": "libOutOfProcessPlugin.so",
@@ -611,7 +611,7 @@
       }
     },
     {
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "callsign": "Netflix",
       "classname": "OutOfProcessTest",
       "locator": "liboutofprocesstest.so",
@@ -625,7 +625,7 @@
       "callsign": "YouTube",
       "locator": "liboutofprocesstest.so",
       "classname": "OutOfProcessTest",
-      "startmode": "deactivated",
+      "startmode": "Deactivated",
       "configuration": {
         "outofprocess": false,
         "url": "http://youtube.com/tv",

diff --git a/Source/WPEFramework/PluginServer.h b/Source/WPEFramework/PluginServer.h
@@ -2288,9 +2288,10 @@ namespace PluginHost {
                 {
                     return (new RemoteInstantiation(parent, comms, connector));
                 }
-                void AddRef() const override
+                uint32_t AddRef() const override
                 {
                     Core::InterlockedIncrement(_refCount);
+                    return (Core::ERROR_NONE);
                 }
                 uint32_t Release() const override
                 {

diff --git a/Source/com/Administrator.cpp b/Source/com/Administrator.cpp
@@ -344,21 +344,21 @@ namespace RPC {
         if (remotes != _channelReferenceMap.end()) {
             std::list<RecoverySet>::iterator loop(remotes->second.begin());
             while (loop != remotes->second.end()) {
-                uint32_t result = Core::ERROR_NONE;
 
-                // We will release on behalf of the other side :-)
-                do {
-                    Core::IUnknown* iface = loop->Unknown();
+                Core::IUnknown* iface = loop->Unknown();
+                ASSERT(iface != nullptr);
 
-                    ASSERT(iface != nullptr);
+                if ((iface != nullptr) && (loop->IsComposit() == false)) {
 
-                    if (iface != nullptr) {
+                    uint32_t result;
+
+                    // We will release on behalf of the other side :-)
+                    do {
                         result = iface->Release();
-                    }
-                } while ((loop->Decrement()) && (result == Core::ERROR_NONE));
+                    } while ((loop->Decrement(1)) && (result == Core::ERROR_NONE));
+                }
 
                 ASSERT (loop->Flushed() == true);
-
                 loop++;
             }
             _channelReferenceMap.erase(remotes);