From 3b54fbbc60c40f74b9930d572e9439b5de45d1e1 Mon Sep 17 00:00:00 2001
From: Margret Jaison <mjaison.ext@libertyglobal.com>
Date: Wed, 27 Mar 2024 16:12:12 +0530
Subject: [PATCH] RDKDEV-1014:OMWAPPI-1545-XDialServer-patches-2401_sprint

---
 server/plat/rtcache.cpp | 17 +++++++++++++++++
 server/plat/rtcache.hpp |  3 +++
 server/plat/rtdial.cpp  | 12 ++++++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/server/plat/rtcache.cpp b/server/plat/rtcache.cpp
index 59ce5deb..9a7478f4 100644
--- a/server/plat/rtcache.cpp
+++ b/server/plat/rtcache.cpp
@@ -60,6 +60,7 @@ void rtAppStatusCache :: setAppCacheId(const char *app_name,std::string id)
 
 rtError rtAppStatusCache::UpdateAppStatusCache(rtValue app_status)
 {
+     const auto now = std::chrono::steady_clock::now();
      printf("RTCACHE : %s\n",__FUNCTION__);
 
       rtError err;
@@ -77,6 +78,10 @@ rtError rtAppStatusCache::UpdateAppStatusCache(rtValue app_status)
 
       err = ObjectCache->insert(id,temp);
       notifyStateChanged(App_name);
+      if (err == RT_OK) {
+          err = ObjectCache->markUnevictable(id, true);
+          last_updated[id] = now;
+      }
       return err;
 }
 
@@ -131,3 +136,15 @@ bool rtAppStatusCache::doIdExist(std::string id)
     printf("True\n");
     return true;
 }
+
+std::chrono::milliseconds rtAppStatusCache::getUpdateAge(const char *app_name)
+{
+     const auto now = std::chrono::steady_clock::now();
+     std::string id = getAppCacheId(app_name);
+     auto it = last_updated.find(id);
+     if (it != last_updated.end()) {
+          return std::chrono::duration_cast<std::chrono::milliseconds>(now - it->second);
+     } else {
+          return std::chrono::milliseconds::max();
+     }
+}
diff --git a/server/plat/rtcache.hpp b/server/plat/rtcache.hpp
index c42cbb8d..14049c10 100644
--- a/server/plat/rtcache.hpp
+++ b/server/plat/rtcache.hpp
@@ -53,6 +53,8 @@ class rtAppStatusCache : public rtObject
     StateChangedCallbackHandle registerStateChangedCallback(StateChangedCallback callback);
     void unregisterStateChangedCallback(StateChangedCallbackHandle callbackId);
 
+    std::chrono::milliseconds getUpdateAge(const char *app_name);
+
 private:
 
     void notifyStateChanged(std::string& id);
@@ -63,6 +65,7 @@ class rtAppStatusCache : public rtObject
     StateChangedCallbackHandle next_handle = 0;
     std::map<StateChangedCallbackHandle, StateChangedCallback> state_changed_listeners;
     std::mutex state_changed_listeners_mutex;
+    std::map<std::string, std::chrono::steady_clock::time_point> last_updated;
 };
 
 #endif
diff --git a/server/plat/rtdial.cpp b/server/plat/rtdial.cpp
index dbd429b9..0486c308 100644
--- a/server/plat/rtdial.cpp
+++ b/server/plat/rtdial.cpp
@@ -706,17 +706,25 @@ int gdial_os_application_state(const char *app_name, int instance_id, GDialAppSt
 }
 
 static bool await_application_state_update(const char *app_name) {
+    using namespace std::chrono;
     static int xdial_wait_for_rtremote_state_response_ms = -1;
     if (xdial_wait_for_rtremote_state_response_ms == -1) {
         const char* waitstr = getenv("XDIAL_WAIT_FOR_RTREMOTE_STATE_RESPONSE_MS");
         xdial_wait_for_rtremote_state_response_ms = waitstr ? atoi(waitstr) : 0;
     }
+    static auto xdial_max_state_value_age = milliseconds::max();
+    if (xdial_max_state_value_age == milliseconds::max()) {
+        const char* str = getenv("XDIAL_MAX_STATE_VALUE_AGE_MS");
+        xdial_max_state_value_age = milliseconds(str ? atoi(str) : 0);
+    }
+    // do not poll for the state update if currently held value is younger than XDIAL_MAX_STATE_VALUE_AGE_MS
+    if (xdial_max_state_value_age > milliseconds(0) && AppCache->getUpdateAge(app_name) < xdial_max_state_value_age) {
+        return false;
+    }
     std::atomic_bool updated {false};
     if (xdial_wait_for_rtremote_state_response_ms > 0) {
         // the cached status could be wrong; rtremote state update request has already been launched
         // so lets give it some time & report the updated value, if possible
-        using namespace std::chrono;
-
         auto handlerid = AppCache->registerStateChangedCallback([&](const std::string& application){
             if (application == app_name) {
                 updated = true;