Merge branch 'develop' into topic/RDK-60610

Author: shibu-kv

CHANGELOG.md

@@ -4,11 +4,24 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.8.0](https://github.com/rdkcentral/telemetry/compare/1.7.4...1.8.0)
+
+- RDK-60312: Remove fork calls for curl transactions [`#242`](https://github.com/rdkcentral/telemetry/pull/242)
+- RDK-60533: L1 unit test cases - protocol/rbusMethod and http [`#241`](https://github.com/rdkcentral/telemetry/pull/241)
+- RDKB-63348 : Fix duplicate close calls on file descriptor [`#251`](https://github.com/rdkcentral/telemetry/pull/251)
+- RDK-60519: Adding L1 unit test cases - dcautil & ccspinterface [`#240`](https://github.com/rdkcentral/telemetry/pull/240)
+- RDK-60519: Adding L1 unit test cases for scheduler [`#238`](https://github.com/rdkcentral/telemetry/pull/238)
+- RDK-60304: Adding L1 unit test cases to improve code coverage [`#237`](https://github.com/rdkcentral/telemetry/pull/237)
+- RDK-60303: Adding L1 unit test cases to improve code coverage for protocol/http [`#231`](https://github.com/rdkcentral/telemetry/pull/231)
+
 #### [1.7.4](https://github.com/rdkcentral/telemetry/compare/1.7.3...1.7.4)
 
+> 16 January 2026
+
 - DELIA-69767: Replace popen() to prevent FD closures and improve logging [`#225`](https://github.com/rdkcentral/telemetry/pull/225)
 -  RDK-60072: Adding L1 unit test cases to improve code coverage [`#234`](https://github.com/rdkcentral/telemetry/pull/234)
 - RDK-60072: Adding L1 unit test cases to improve code coverage [`#219`](https://github.com/rdkcentral/telemetry/pull/219)
+- Changelog updates for 1.7.4 release [`f94578f`](https://github.com/rdkcentral/telemetry/commit/f94578fadfd969e832df3d2f1856c6e59ec1a905)
 
 #### [1.7.3](https://github.com/rdkcentral/telemetry/compare/1.7.2...1.7.3)
 

source/Makefile.am

@@ -70,6 +70,17 @@ telemetry2_0_LDFLAGS += -lwebconfig_framework
 telemetry2_0_CFLAGS += -DFEATURE_SUPPORT_WEBCONFIG
 endif
 
+if IS_LIBRDKCONFIG_ENABLED
+telemetry2_0_LDFLAGS += -lrdkconfig
+telemetry2_0_CFLAGS += $(LIBRDKCONFIG_FLAG)
+endif
+
+if IS_LIBRDKCERTSEL_ENABLED
+telemetry2_0_LDFLAGS += -lRdkCertSelector
+telemetry2_0_CFLAGS += $(LIBRDKCERTSEL_FLAG)
+telemetry2_0_CFLAGS += -DENABLE_RDKB_SUPPORT
+endif
+
 if ENABLE_CCSP_SUPPORT
 telemetry2_0_LDFLAGS+=-lccsp_common 
 telemetry2_0_SOURCES += t2ssp/ssp_main.c t2ssp/ssp_action.c t2ssp/ssp_messagebus_interface.c t2ssp/dm_pack_datamodel.c

source/bulkdata/profile.c

@@ -568,7 +568,7 @@ static void* CollectAndReport(void* data)
                             if(n == ETIMEDOUT)
                             {
                                 T2Info("TIMEOUT for maxUploadLatency of profile %s\n", profile->name);
-                                ret = sendReportOverHTTP(httpUrl, jsonReport, NULL);
+                                ret = sendReportOverHTTP(httpUrl, jsonReport);
                             }
                             else
                             {
@@ -605,7 +605,7 @@ static void* CollectAndReport(void* data)
                         }
                         else
                         {
-                            ret = sendReportOverHTTP(httpUrl, jsonReport, NULL);
+                            ret = sendReportOverHTTP(httpUrl, jsonReport);
                         }
                     }
                     else

source/bulkdata/profilexconf.c

@@ -49,7 +49,6 @@ static pthread_mutex_t plMutex; /* TODO - we can remove plMutex most likely but
 static pthread_cond_t reuseThread;
 static bool reportThreadExits = false;
 
-static pid_t xconfReportPid;
 static bool isAbortTriggered = false ;
 static bool isOnDemandReport = false ;
 
@@ -378,7 +377,7 @@ static void* CollectAndReportXconf(void* data)
                 else
                 {
                     T2Debug("Abort upload is not yet set.\n");
-                    ret = sendReportOverHTTP(profile->t2HTTPDest->URL, jsonReport, &xconfReportPid);
+                    ret = sendReportOverHTTP(profile->t2HTTPDest->URL, jsonReport);
                 }
 
 #ifdef PERSIST_LOG_MON_REF
@@ -395,7 +394,6 @@ static void* CollectAndReportXconf(void* data)
                 }
 #endif
 
-                xconfReportPid = -1 ;
                 if(ret == T2ERROR_FAILURE)
                 {
                     if(profile->cachedReportList != NULL && Vector_Size(profile->cachedReportList) >= MAX_CACHED_REPORTS)
@@ -989,50 +987,3 @@ T2ERROR ProfileXConf_storeMarkerEvent(T2Event *eventInfo)
     return T2ERROR_SUCCESS;
 }
 
-
-T2ERROR ProfileXConf_terminateReport()
-{
-
-    T2ERROR ret = T2ERROR_FAILURE;
-
-    pthread_mutex_lock(&plMutex);
-
-    if(!singleProfile)
-    {
-        T2Error("Xconf profile is not set.\n");
-
-        pthread_mutex_unlock(&plMutex);
-
-        return ret;
-    }
-
-    // Check whether any XconfReport is in progress
-    if(singleProfile->reportInProgress)
-    {
-        isAbortTriggered = true;
-        // Check if a child pid is still alive
-        if((xconfReportPid > 0) && !kill(xconfReportPid, 0))
-        {
-            T2Info("Report upload in progress, terminating the forked reporting child : %d \n", xconfReportPid);
-            if(!kill(xconfReportPid, SIGKILL))
-            {
-                ret = T2ERROR_SUCCESS;
-            }
-        }
-        else
-        {
-            T2Info(" Report upload has net yet started, set the abort flag \n");
-            ret = T2ERROR_SUCCESS;
-        }
-    }
-    else
-    {
-        T2Info("No report generation in progress. No further action required for abort.\n");
-    }
-
-    pthread_mutex_unlock(&plMutex);
-
-    return ret;
-
-}
-

source/bulkdata/profilexconf.h

@@ -80,7 +80,6 @@ void    ProfileXConf_updateMarkerComponentMap();
 void    ProfileXConf_notifyTimeout(bool isClearSeekMap, bool isOnDemand);
 T2ERROR ProfileXConf_storeMarkerEvent(T2Event *eventInfo);
 char*   ProfileXconf_getName();
-T2ERROR ProfileXConf_terminateReport();
 
 T2ERROR ReportProfiles_setProfileXConf(ProfileXConf *profile);
 

source/bulkdata/reportprofiles.c

@@ -433,8 +433,8 @@ static void* reportOnDemand(void *input)
     }
     else if(!strncmp(action, ON_DEMAND_ACTION_ABORT, MAX_PROFILENAMES_LENGTH))
     {
-        T2Info("Abort report on demand \n");
-        ProfileXConf_terminateReport();
+        T2Info("Abort report on demand\n");
+        T2Info("Abort of the on-demand report is no longer supported; fork-based report execution and termination have been removed\n");
     }
     else
     {
@@ -704,11 +704,6 @@ T2ERROR ReportProfiles_uninit( )
     {
         getMarkerCompRbusSub(false);    // remove Rbus subscription
     }
-#ifdef LIBRDKCERTSEL_BUILD
-    curlCertSelectorFree();
-#else
-    uninitMtls();
-#endif
     T2ER_Uninit();
     destroyT2MarkerComponentMap();
     uninitScheduler();

source/dcautil/dca.c

@@ -67,7 +67,6 @@ static bool firstreport_after_bootup = false; // the rotated logs check should r
 // Define a struct to hold the file descriptor and size
 typedef struct
 {
-    int fd;
     off_t cf_map_size;
     off_t rf_map_size;
     off_t cf_file_size;
@@ -966,11 +965,6 @@ static void freeFileDescriptor(FileDescriptor* fileDescriptor)
         }
         fileDescriptor->cfaddr = NULL;
         fileDescriptor->rfaddr = NULL;
-        if(fileDescriptor->fd != -1)
-        {
-            close(fileDescriptor->fd);
-            fileDescriptor->fd = -1;
-        }
         free(fileDescriptor);
     }
 }
@@ -1119,7 +1113,6 @@ static FileDescriptor* getFileDeltaInMemMapAndSearch(const int fd, const off_t s
 
                 T2Debug("Log file got rotated. Ignoring invalid mapping\n");
                 close(tmp_fd);
-                close(fd);
                 if(rd != -1)
                 {
                     close(rd);
@@ -1147,13 +1140,11 @@ static FileDescriptor* getFileDeltaInMemMapAndSearch(const int fd, const off_t s
         {
             T2Debug("Log file got rotated. Ignoring invalid mapping\n");
             close(tmp_fd);
-            close(fd);
             return NULL;
         }
         addrrf = NULL;
     }
     close(tmp_fd);
-    close(fd);
 
     if (addrcf == MAP_FAILED)
     {
@@ -1196,7 +1187,6 @@ static FileDescriptor* getFileDeltaInMemMapAndSearch(const int fd, const off_t s
         fileDescriptor->rfaddr = NULL;
     }
     fileDescriptor->cfaddr = addrcf;
-    fileDescriptor->fd = fd;
     fileDescriptor->cf_map_size = main_fsize;
     fileDescriptor->cf_file_size = sb.st_size;
     if(fileDescriptor->rfaddr != NULL)
@@ -1283,12 +1273,6 @@ static int parseMarkerListOptimized(GrepSeekProfile *gsProfile, Vector * ip_vMar
                 prevfile = NULL;
             }
 
-            if (fd != -1)
-            {
-                close(fd);
-                fd = -1;
-            }
-
             if (fileDescriptor != NULL)
             {
                 freeFileDescriptor(fileDescriptor);
@@ -1306,14 +1290,16 @@ static int parseMarkerListOptimized(GrepSeekProfile *gsProfile, Vector * ip_vMar
             }
 
             fileDescriptor = getFileDeltaInMemMapAndSearch(fd, seek_value, logPath, log_file_for_this_iteration, check_rotated_logs);
+
+            if (fd != -1)
+            {
+                close(fd);
+                fd = -1;
+            }
+
             if (fileDescriptor == NULL)
             {
                 T2Error("Failed to get file descriptor for %s\n", log_file_for_this_iteration);
-                if (fd != -1)
-                {
-                    close(fd);
-                    fd = -1;
-                }
                 continue;
             }
         }
@@ -1338,12 +1324,6 @@ static int parseMarkerListOptimized(GrepSeekProfile *gsProfile, Vector * ip_vMar
         prevfile = NULL;
     }
 
-    if (fd != -1)
-    {
-        close(fd);
-        fd = -1;
-    }
-
     if (fileDescriptor != NULL)
     {
         freeFileDescriptor(fileDescriptor);

source/protocol/http/Makefile.am

@@ -20,7 +20,7 @@ AM_CFLAGS =
 
 lib_LTLIBRARIES = libhttp.la
 
-libhttp_la_SOURCES = curlinterface.c
+libhttp_la_SOURCES = curlinterface.c multicurlinterface.c
 libhttp_la_LDFLAGS = -shared -fPIC -lcurl
 if IS_LIBRDKCERTSEL_ENABLED
 libhttp_la_CFLAGS = $(LIBRDKCERTSEL_FLAG)