XIONE-14127 WPE_ERR_ProcessCrash with function "__libc_do_syscall"

DELIA-64762: WPE_ERR_ProcessCrash with function__libc_do_syscall connectivity monitor thread termination changed
gururaajar · Mar 25, 2024 · 22afc8f · 22afc8f
1 parent 3f39499
commit 22afc8f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 37 deletions.
diff --git a/Network/Network.h b/Network/Network.h
@@ -254,7 +254,7 @@ namespace WPEFramework {
             static Network *_instance;
             static Network *getInstance() {return _instance;}
             Config config;
-            ConnectivityMonitor& connectivityMonitor = ConnectivityMonitor::getInstance();
+            ConnectivityMonitor connectivityMonitor;
 
         private:
             PluginHost::IShell* m_service;

diff --git a/Network/NetworkConnectivity.cpp b/Network/NetworkConnectivity.cpp
@@ -307,7 +307,7 @@ namespace WPEFramework {
     #if LIBCURL_VERSION_NUM < 0x074200
         int numfds, repeats = 0;
     #endif
-        char *endpoint;
+        char *endpoint = nullptr;
         while (1)
         {
             if (CURLM_OK != (mc = curl_multi_perform(curl_multi_handle, &handles)))
@@ -324,7 +324,7 @@ namespace WPEFramework {
                     curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &endpoint);
                     if (curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &response_code) == CURLE_OK)  {
                         if(curlVerboseEnabled())
-                            LOGINFO("endpoint = <%s> response code <%d>",endpoint, static_cast<int>(response_code));
+                            LOGINFO("endpoint = <%s> http response code <%d>", endpoint, static_cast<int>(response_code));
                         if (HttpStatus_302_Found == response_code) {
                             if ( (curl_easy_getinfo(msg->easy_handle, CURLINFO_REDIRECT_URL, &url) == CURLE_OK) && url != nullptr) {
                                 //LOGWARN("captive portal found !!!");
@@ -333,8 +333,8 @@ namespace WPEFramework {
                         }
                     }
                 }
-                //else
-                //    LOGERR("endpoint = <%s> error = %d (%s)", endpoint, msg->data.result, curl_easy_strerror(msg->data.result));
+                else
+                    LOGERR("endpoint = <%s> curl error = %d (%s)", endpoint, msg->data.result, curl_easy_strerror(msg->data.result));
                 http_responses.push_back(response_code);
             }
             time_earlier = time_now;
@@ -429,7 +429,11 @@ namespace WPEFramework {
                 break;
                 default:
                     InternetConnectionState = NO_INTERNET;
-                    LOGINFO("Internet State: NO_INTERNET Response code: <%d> %.1f%%", static_cast<int>(http_response_code), (percentage*100));
+                    if(http_response_code == -1)
+                        LOGERR("Internet State: NO_INTERNET curl error");
+                    else
+                        LOGWARN("Internet State: NO_INTERNET Received http response code: <%d> %.1f%%", static_cast<int>(http_response_code), percentage * 100);
+                    break;
             }
         }
 
@@ -513,40 +517,40 @@ namespace WPEFramework {
 
     bool ConnectivityMonitor::stopInitialConnectivityMonitoring()
     {
-        if (isMonitorThreadRunning())
+
+        if(isContinuesMonitoringNeeded)
+        {
+            LOGWARN("Continuous Connectivity Monitor is running");
+            return true;
+        }
+        else
         {
-            if(isContinuesMonitoringNeeded)
+            if (!isMonitorThreadRunning())
             {
-                LOGWARN("Continuous Connectivity Monitor is running");
-                return true;
+                LOGWARN("Connectivity monitor not running");
             }
-            else
-            {
-                stopFlag = true;
-                cv_.notify_all();
 
-                if (thread_.joinable()) {
-                    thread_.join();
-                    threadRunning = false;
-                    LOGINFO("Stoping Initial Connectivity Monitor");
-                }
-                else
-                    LOGWARN("thread not joinable !");
+            stopFlag = true;
+            cv_.notify_all();
+
+            if (thread_.joinable())
+            {
+                thread_.join();
+                threadRunning = false;
+                LOGINFO("Stoping Initial Connectivity Monitor");
             }
+            else
+                LOGWARN("thread not joinable !");
         }
-        else
-            LOGWARN("Continuous Connectivity Monitor not running");
 
         return true;
     }
 
     bool ConnectivityMonitor::stopContinuousConnectivityMonitoring()
     {
-        LOGINFO("Entry");
         if (!isMonitorThreadRunning())
         {
             LOGWARN("Connectivity monitor not running");
-            return false;
         }
         cv_.notify_all();
         stopFlag = true;
@@ -595,17 +599,12 @@ namespace WPEFramework {
 
             if(stopFlag)
             {
-                LOGWARN("stopFlag true exiting");
                 threadRunning = false;
                 break;
             }
             //wait for next timout or conditon signal
             std::unique_lock<std::mutex> lock(mutex_);
-            if (cv_.wait_for(lock, std::chrono::seconds(timeout.load())) == std::cv_status::timeout)
-            {
-                LOGINFO("Connectivity monitor thread timeout");
-            }
-            else
+            if (cv_.wait_for(lock, std::chrono::seconds(timeout.load())) != std::cv_status::timeout)
             {
                 if(!stopFlag)
                 {

diff --git a/Network/NetworkConnectivity.h b/Network/NetworkConnectivity.h
@@ -101,11 +101,6 @@ namespace WPEFramework {
 
         class ConnectivityMonitor : public Connectivity {
             public:
-                static ConnectivityMonitor& getInstance() {
-                    static ConnectivityMonitor instance;
-                    return instance;
-                }
-
                 bool isConnectedToInternet(nsm_ipversion ipversion);
                 nsm_internetState getInternetConnectionState(nsm_ipversion ipversion);
                 std::string getCaptivePortalURI();
@@ -119,7 +114,6 @@ namespace WPEFramework {
                 void signalConnectivityMonitor();
                 void resetConnectivityCache() { g_internetState = nsm_internetState::UNKNOWN;}
 
-            private:
                 ConnectivityMonitor() : stopFlag(false), threadRunning(false), isContinuesMonitoringNeeded(false)
                 {
                     setConnectivityMonitorEndpoints(getConnectivityDefaultEndpoints());
@@ -129,6 +123,7 @@ namespace WPEFramework {
                     LOGINFO("~ConnectivityMonitor");
                     stopContinuousConnectivityMonitoring();
                 }
+            private:
 
                 std::vector<std::string> getConnectivityMonitorEndpoints();
                 ConnectivityMonitor(const ConnectivityMonitor&) = delete;