RDK-56621: Update all the power manager plugin clients to new register events

KaleeswaranGnanagurusamy · KaleeswaranGnanagurusamy · commit a1d4d8749f1c · 2025-03-07T19:49:21.000+05:30
diff --git a/HdcpProfile/HdcpProfile.cpp b/HdcpProfile/HdcpProfile.cpp
@@ -117,6 +117,7 @@ namespace WPEFramework
         {
             _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
                                     .withIShell(service)
+                                    .withRetry(25)
                                     .createInterface();
         }
 
diff --git a/HdmiCecSink/HdmiCecSink.cpp b/HdmiCecSink/HdmiCecSink.cpp
@@ -901,6 +901,7 @@ namespace WPEFramework
         {
             _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
                                     .withIShell(service)
+                                    .withRetry(25)
                                     .createInterface();
             registerEventHandlers();
         }
@@ -910,7 +911,7 @@ namespace WPEFramework
 
            if(!_registeredEventHandlers && _powerManagerPlugin) {
                _registeredEventHandlers = true;
-               _powerManagerPlugin->Register(&_pwrMgrNotification);
+               _powerManagerPlugin->Register(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());
            }
        }
 
diff --git a/HdmiCecSink/HdmiCecSink.h b/HdmiCecSink/HdmiCecSink.h
@@ -585,33 +585,35 @@ namespace WPEFramework {
             END_INTERFACE_MAP
 
         private:
-            class PowerManagerNotification : public Exchange::IPowerManager::INotification {
+            class PowerManagerNotification : public Exchange::IPowerManager::IModeChangedNotification {
             private:
                 PowerManagerNotification(const PowerManagerNotification&) = delete;
                 PowerManagerNotification& operator=(const PowerManagerNotification&) = delete;
-            
+
             public:
                 explicit PowerManagerNotification(HdmiCecSink& parent)
                     : _parent(parent)
                 {
                 }
                 ~PowerManagerNotification() override = default;
-            
+
             public:
                 void OnPowerModeChanged(const PowerState &currentState, const PowerState &newState) override
                 {
                     _parent.onPowerModeChanged(currentState, newState);
                 }
-                void OnPowerModePreChange(const PowerState &currentState, const PowerState &newState) override {}
-                void OnDeepSleepTimeout(const int &wakeupTimeout) override {}
-                void OnNetworkStandbyModeChanged(const bool &enabled) override {}
-                void OnThermalModeChanged(const ThermalTemperature &currentThermalLevel, const ThermalTemperature &newThermalLevel, const float &currentTemperature) override {}
-                void OnRebootBegin(const string &rebootReasonCustom, const string &rebootReasonOther, const string &rebootRequestor) override {}
+
+                template <typename INTERFACE>
+                T* baseInterface()
+                {
+                    static_assert(std::is_base_of<T, Notification>(), "base type mismatch");
+                    return static_cast<T*>(this);
+                }
             
                 BEGIN_INTERFACE_MAP(PowerManagerNotification)
-                INTERFACE_ENTRY(Exchange::IPowerManager::INotification)
+                INTERFACE_ENTRY(Exchange::IPowerManager::IModeChangedNotification)
                 END_INTERFACE_MAP
-            
+
             private:
                 HdmiCecSink& _parent;
             };
diff --git a/HdmiCecSource/HdmiCecSource.cpp b/HdmiCecSource/HdmiCecSource.cpp
@@ -519,7 +519,7 @@ namespace WPEFramework
        
            if(!_registeredEventHandlers && _powerManagerPlugin) {
                _registeredEventHandlers = true;
-               _powerManagerPlugin->Register(&_pwrMgrNotification);
+               _powerManagerPlugin->Register(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());
            }
        }
 
@@ -721,6 +721,7 @@ namespace WPEFramework
             LOGINFO("Connect the COM-RPC socket\n");
             _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
                                     .withIShell(service)
+                                    .withRetry(25)
                                     .createInterface();
             registerEventHandlers();
         }
diff --git a/HdmiCecSource/HdmiCecSource.h b/HdmiCecSource/HdmiCecSource.h
@@ -229,7 +229,7 @@ namespace WPEFramework {
             END_INTERFACE_MAP
 
         private:
-            class PowerManagerNotification : public Exchange::IPowerManager::INotification {
+            class PowerManagerNotification : public Exchange::IPowerManager::IModeChangedNotification {
             private:
                 PowerManagerNotification(const PowerManagerNotification&) = delete;
                 PowerManagerNotification& operator=(const PowerManagerNotification&) = delete;
@@ -246,14 +246,16 @@ namespace WPEFramework {
                 {
                     _parent.onPowerModeChanged(currentState, newState);
                 }
-                void OnPowerModePreChange(const PowerState &currentState, const PowerState &newState) override {}
-                void OnDeepSleepTimeout(const int &wakeupTimeout) override {}
-                void OnNetworkStandbyModeChanged(const bool &enabled) override {}
-                void OnThermalModeChanged(const ThermalTemperature &currentThermalLevel, const ThermalTemperature &newThermalLevel, const float &currentTemperature) override {}
-                void OnRebootBegin(const string &rebootReasonCustom, const string &rebootReasonOther, const string &rebootRequestor) override {}
+
+                template <typename INTERFACE>
+                T* baseInterface()
+                {
+                    static_assert(std::is_base_of<T, Notification>(), "base type mismatch");
+                    return static_cast<T*>(this);
+                }
             
                 BEGIN_INTERFACE_MAP(PowerManagerNotification)
-                INTERFACE_ENTRY(Exchange::IPowerManager::INotification)
+                INTERFACE_ENTRY(Exchange::IPowerManager::IModeChangedNotification)
                 END_INTERFACE_MAP
             
             private:
diff --git a/helpers/PluginInterfaceBuilder.h b/helpers/PluginInterfaceBuilder.h
@@ -100,18 +100,29 @@ namespace Plugin {
     {
         WPEFramework::PluginHost::IShell* controller = builder.controller();
         const std::string& callsign = builder.callSign();
+        const int retry_count = builder.retryCount();
+        int count = 0;
+
         if (!controller) {
             LOGERR("Invalid controller");
             return nullptr;
         }
 
-        auto pluginInterface = controller->QueryInterfaceByCallsign<INTERFACE>(callsign.c_str());
+        do {
+            auto pluginInterface = controller->QueryInterfaceByCallsign<INTERFACE>(callsign.c_str());
 
-        if (pluginInterface) {
-            pluginInterface->AddRef();
-        }
+            if (pluginInterface) {
+                pluginInterface->AddRef();
+                return pluginInterface;
+            }
+            else
+            {
+                count++;
+                usleep(200*1000);
+            }
+        }while(count < retry_count);
 
-        return pluginInterface;
+        return nullptr;
     }
 
     template <typename T, typename... Args>
@@ -127,13 +138,15 @@ namespace Plugin {
         PluginHost::IShell* _service;
         uint32_t _version;
         uint32_t _timeout;
+        int _retry_count;
 
     public:
         PluginInterfaceBuilder(const char* callsign)
             : _callsign(callsign)
             , _service(nullptr)
             , _version(static_cast<uint32_t>(~0))
             , _timeout(3000)
+            ,_retry_count(0)
         {
         }
 
@@ -158,6 +171,12 @@ namespace Plugin {
             return *this;
         }
 
+        inline PluginInterfaceBuilder& withRetry(int retryCount)
+        {
+            _retry_count = retryCount;
+            return *this;
+        }
+
         PluginInterfaceRef<INTERFACE> createInterface()
         {
             auto* interface = ::WPEFramework::Plugin::createInterface<INTERFACE>(*this);
@@ -170,6 +189,11 @@ namespace Plugin {
             return std::move(PluginInterfaceRef<INTERFACE>(interface, _service));
         }
 
+        const int retryCount() const
+        {
+            return _callsign;
+        }
+
         const std::string& callSign() const
         {
             return _callsign;
diff --git a/helpers/frontpanel.cpp b/helpers/frontpanel.cpp
@@ -135,6 +135,7 @@ namespace WPEFramework
                 {
                     _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
                                       .withIShell(service)
+                                      .withRetry(25)
                                       .createInterface();
                 }
                 if (!s_instance)

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ namespace WPEFramework`
`117`	`117`	`{`
`118`	`118`	`_powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))`
`119`	`119`	`.withIShell(service)`
	`120`	`+ .withRetry(25)`
`120`	`121`	`.createInterface();`
`121`	`122`	`}`
`122`	`123`
Original file line number	Diff line number	Diff line change
`@@ -901,6 +901,7 @@ namespace WPEFramework`
`901`	`901`	`{`
`902`	`902`	`_powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))`
`903`	`903`	`.withIShell(service)`
	`904`	`+ .withRetry(25)`
`904`	`905`	`.createInterface();`
`905`	`906`	`registerEventHandlers();`
`906`	`907`	`}`
`@@ -910,7 +911,7 @@ namespace WPEFramework`
`910`	`911`
`911`	`912`	`if(!_registeredEventHandlers && _powerManagerPlugin) {`
`912`	`913`	`_registeredEventHandlers = true;`
`913`		`- _powerManagerPlugin->Register(&_pwrMgrNotification);`
	`914`	`+ _powerManagerPlugin->Register(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());`
`914`	`915`	`}`
`915`	`916`	`}`
`916`	`917`
Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ namespace WPEFramework`
`519`	`519`
`520`	`520`	`if(!_registeredEventHandlers && _powerManagerPlugin) {`
`521`	`521`	`_registeredEventHandlers = true;`
`522`		`- _powerManagerPlugin->Register(&_pwrMgrNotification);`
	`522`	`+ _powerManagerPlugin->Register(_pwrMgrNotification.baseInterface<Exchange::IPowerManager::IModeChangedNotification>());`
`523`	`523`	`}`
`524`	`524`	`}`
`525`	`525`
`@@ -721,6 +721,7 @@ namespace WPEFramework`
`721`	`721`	`LOGINFO("Connect the COM-RPC socket\n");`
`722`	`722`	`_powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))`
`723`	`723`	`.withIShell(service)`
	`724`	`+ .withRetry(25)`
`724`	`725`	`.createInterface();`
`725`	`726`	`registerEventHandlers();`
`726`	`727`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ namespace WPEFramework`
`135`	`135`	`{`
`136`	`136`	`_powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))`
`137`	`137`	`.withIShell(service)`
	`138`	`+ .withRetry(25)`
`138`	`139`	`.createInterface();`
`139`	`140`	`}`
`140`	`141`	`if (!s_instance)`