Feature module start time

core/inc/util.h

@@ -743,9 +743,12 @@ I32 UtilPopulateEXACDataStructFromMQ(C8* rawEXAC, size_t rawEXACsize, EXACData *
 I32 UtilPopulateTRCMDataStructFromMQ(C8* rawTRCM, size_t rawTRCMsize, TRCMData *trcmData);
 I32 UtilPopulateACCMDataStructFromMQ(C8* rawACCM, size_t rawACCMsize, ACCMData *accmData);
 
+struct timeval UtilGetPIDUptime(pid_t pID);
 double UtilGetDistance(double lat1, double lon1, double lat2, double lon2);
 
 
+enum procFields {startTime = 21, vSize = 22};
+
 typedef struct {
   uint64_t timestamp;
   int32_t  latitude;

core/src/journalcontrol.cpp

@@ -134,14 +134,16 @@ void journalcontrol_task(TimeType * GPSTime, GSDType * GSD, LOG_LEVEL logLevel)
 			generateOutputJournal(journals);
 			break;
 
-		case COMM_GETSTATUS:
+        case COMM_GETSTATUS: {
 			std::fill(mqSendBuffer.begin(), mqSendBuffer.end(), 0);
-			snprintf(mqSendBuffer.data(), mqSendBuffer.size(), "%s", MODULE_NAME);
+            unsigned long startTime = UtilGetPIDUptime(getpid()).tv_sec;
+            snprintf(mqSendBuffer.data(), mqSendBuffer.size(), "%s:%lu", MODULE_NAME, startTime);
 			mqSendBuffer.back() = '\0';
 			if (iCommSend(COMM_GETSTATUS_OK, mqSendBuffer.data(), mqSendBuffer.size()) < 0) {
 				LogMessage(LOG_LEVEL_ERROR, "Fatal communication fault when sending status reply");
 			}
 			break;
+        }
 		case COMM_REPLAY:
 			LogMessage(LOG_LEVEL_WARNING, "Replay function out of date");
 			break;

core/src/systemcontrol.c

@@ -2911,11 +2911,8 @@ void appendSysInfoString(char *ControlResponseBuffer, const size_t bufferSize) {
 
 	size_t remainingBufferSpace = bufferSize;
 	struct sysinfo info;
-	char procFilename[100] = { 0 };
-	char stringBuffer[255], statFileBuffer[255];
+	char stringBuffer[255];
 	long hours, minutes, seconds;
-	pid_t pid = 0;
-	FILE *pidstat = NULL;
 
 	// Server uptime
 	sysinfo(&info);
@@ -2928,39 +2925,18 @@ void appendSysInfoString(char *ControlResponseBuffer, const size_t bufferSize) {
 	strncat(ControlResponseBuffer, stringBuffer, remainingBufferSpace - 1);
 	remainingBufferSpace -= strlen(stringBuffer);
 
-	pid = getpid();
-	snprintf(procFilename, sizeof (procFilename), "/proc/%d/stat", pid);
+	unsigned long startTime = UtilGetPIDUptime(getpid()).tv_sec;
 
-	pidstat = fopen(procFilename, "r");
-	if (pidstat == NULL) {
-		LogMessage(LOG_LEVEL_ERROR, "Could not open file %s", procFilename);
-		return;
-	}
-
-	fgets(statFileBuffer, sizeof (statFileBuffer), pidstat);
-	fclose(pidstat);
+	unsigned long long timeAtStart = startTime / (unsigned long long)(sysconf(_SC_CLK_TCK));
+	long serverUptime = (long)((unsigned long long)info.uptime - timeAtStart);
 
-	// Get start time from proc/pid/stat
-	char *token = strtok(statFileBuffer, " ");
-	int statIndex = 0;
 
-	while (token != NULL) {
-		if (statIndex == 21) {	//Get  starttime  %llu from proc file for pid.
-			unsigned long long timeAtStart =
-				strtoull(token, NULL, 10) / (unsigned long long)(sysconf(_SC_CLK_TCK));
-			long serverUptime = (long)((unsigned long long)info.uptime - timeAtStart);
-
-			hours = serverUptime / 3600;
-			minutes = (serverUptime - (3600 * hours)) / 60;
-			seconds = (serverUptime - (3600 * hours) - (minutes * 60));
-			sprintf(stringBuffer, "Server uptime: %ld:%ld:%ld\n", hours, minutes, seconds);
-			strncat(ControlResponseBuffer, stringBuffer, remainingBufferSpace - 1);
-			remainingBufferSpace -= strlen(stringBuffer);
-			break;
-		}
-		token = strtok(NULL, " ");
-		statIndex++;
-	}
+	hours = serverUptime / 3600;
+	minutes = (serverUptime - (3600 * hours)) / 60;
+	seconds = (serverUptime - (3600 * hours) - (minutes * 60));
+	sprintf(stringBuffer, "Server uptime: %ld:%ld:%ld\n", hours, minutes, seconds);
+	strncat(ControlResponseBuffer, stringBuffer, remainingBufferSpace - 1);
+	remainingBufferSpace -= strlen(stringBuffer);
 	//Make it clear that this is placeholder data
 	strncat(ControlResponseBuffer, "Maestro powerlevel: 90001\n", remainingBufferSpace - 1);
 }

core/src/util.c

@@ -3963,6 +3963,52 @@ I32 UtilPopulateACCMDataStructFromMQ(C8 * rawACCM, size_t rawACCMsize, ACCMData
 	return 0;
 }
 
+
+/*!
+ * \brief getPIDuptime reads the proc file of the pid in question and returns start time of the process after boot. In kernels before Linux 2.6, this value was expressed in
+jiffies. Since Linux 2.6, the value is expressed in
+clock ticks (divide by sysconf(_SC_CLK_TCK)).
+ * \param pid the pid in question.
+ * \return The time the process started after system boot.
+ */
+struct timeval UtilGetPIDUptime(pid_t pID) {
+	FILE *pidstat = NULL;
+	struct timeval timeSinceStart;
+	char filename[PATH_MAX] = { 0 };
+	snprintf(filename, sizeof (filename), "/proc/%d/stat", pID);
+
+	pidstat = fopen(filename, "r");
+	if (pidstat == NULL) {
+		LogMessage(LOG_LEVEL_ERROR, "Error: Couldn't open [%s]\n", filename);
+		timeSinceStart.tv_sec = -1;
+		timeSinceStart.tv_usec = -1;
+		return timeSinceStart;
+	}
+
+	char strval1[100] = { 0 };
+	fgets(strval1, 255, pidstat);
+
+	fclose(pidstat);
+	// Get start time from proc/pid/stat
+	char *token = strtok(strval1, " ");
+	int loopCounter = 0;
+
+	char uptime[247];
+
+	while (token != NULL) {
+		if (loopCounter == startTime) {	//Get  starttime  %llu from proc file for pid.
+			sprintf(uptime, "%s", token);
+		}
+		token = strtok(NULL, " ");
+		loopCounter++;
+	}
+
+
+	timeSinceStart.tv_sec = (strtoul(uptime, NULL, 10));
+	return timeSinceStart;
+}
+
+
 /*!
  * \brief UtilgetDistance calculates the distance between two log lat positions usgin haversine formula.
  * \param lat1 Latitude of first coordinate

modules/ScenarioControl/src/main.cpp

@@ -158,12 +158,15 @@ int main()
             LogMessage(LOG_LEVEL_INFO,"Received disconnect command");
             state = UNINITIALIZED;
             break;
-        case COMM_GETSTATUS:
+        case COMM_GETSTATUS: {
+            unsigned long startTime = UtilGetPIDUptime(getpid()).tv_sec;
             memset(mqSendData, 0, sizeof (mqSendData));
-            sprintf(mqSendData, "%s", MODULE_NAME);
+            sprintf(mqSendData, "%s:%lu", MODULE_NAME, startTime);
+
             if (iCommSend(COMM_GETSTATUS_OK, mqSendData, sizeof (mqSendData)) < 0) {
                 LogMessage(LOG_LEVEL_ERROR, "Fatal communication fault when sending GETSTATUS.");
             }
+        }
             break;
         case COMM_GETSTATUS_OK:
             break;

modules/Supervision/src/main.cpp

@@ -162,12 +162,15 @@ int main() {
             break;
         case COMM_OBC_STATE:
             break;
-        case COMM_GETSTATUS:
+        case COMM_GETSTATUS: {
+            unsigned long startTime = UtilGetPIDUptime(getpid()).tv_sec;
             memset(mqSendData, 0, sizeof (mqSendData));
-            sprintf(mqSendData, "%s", MODULE_NAME);
+            sprintf(mqSendData, "%s:%lu", MODULE_NAME, startTime);
+
             if (iCommSend(COMM_GETSTATUS_OK, mqSendData, sizeof (mqSendData)) < 0) {
                 LogMessage(LOG_LEVEL_ERROR, "Fatal communication fault when sending GETSTATUS.");
             }
+        }
             break;
         case COMM_GETSTATUS_OK:
             break;