Merge branch 'initialize_generalinfotable' into 'develop'

Write GeneralInfo table at the beginning

See merge request ems/astdm/modeling.dram/dram.sys.5!39

extensions/apps/traceAnalyzer/data/tracedb.cpp

@@ -290,11 +290,6 @@ ID TraceDB::getTransactionIDFromPhaseID(ID phaseID)
 GeneralInfo TraceDB::getGeneralInfoFromDB()
 {
     QVariant parameter;
-    parameter = getParameterFromTable("NumberOfTransactions", "GeneralInfo");
-    uint64_t numberOfTransactions = parameter.isValid() ? parameter.toULongLong() : 0;
-    parameter = getParameterFromTable("TraceEnd", "GeneralInfo");
-    traceTime traceEnd = parameter.isValid() ? static_cast<traceTime>(parameter.toULongLong()) : 0;
-    parameter = getParameterFromTable("NumberOfRanks", "GeneralInfo");
     unsigned numberOfRanks = parameter.isValid() ? parameter.toUInt() : 1;
     parameter = getParameterFromTable("NumberOfBankgroups", "GeneralInfo");
     unsigned numberOfBankGroups = parameter.isValid() ? parameter.toUInt() : numberOfRanks;
@@ -328,6 +323,8 @@ GeneralInfo TraceDB::getGeneralInfoFromDB()
     bool pseudoChannelMode = parameter.isValid() && parameter.toBool();
 
     uint64_t numberOfPhases = getNumberOfPhases();
+    uint64_t numberOfTransactions = getNumberOfTransactions();
+    auto traceEnd = static_cast<traceTime>(getTraceLength());
 
     QString description = (traces + "\n");
     description += mcconfig + "\n";
@@ -417,6 +414,26 @@ QVariant TraceDB::getParameterFromTable(const std::string& parameter, const std:
     }
 }
 
+uint64_t TraceDB::getTraceLength()
+{
+    QSqlQuery query(database);
+    query.prepare("SELECT MAX(PhaseEnd) FROM Phases");
+    executeQuery(query);
+
+    query.next();
+    return query.value(0).toULongLong();
+}
+
+uint64_t TraceDB::getNumberOfTransactions()
+{
+    QSqlQuery query(database);
+    query.prepare("SELECT COUNT(ID) FROM Transactions");
+    executeQuery(query);
+
+    query.next();
+    return query.value(0).toULongLong();
+}
+
 uint64_t TraceDB::getNumberOfPhases()
 {
     QSqlQuery query(database);
@@ -480,7 +497,7 @@ DependencyInfos TraceDB::getDependencyInfos(DependencyInfos::Type infoType)
             selectTimeDependencyPercentages = QSqlQuery(database);
             if (!selectTimeDependencyPercentages.prepare(queryTexts.selectTimeDependencyPercentages))
                 qDebug() << database.lastError().text();
-                
+
             executeQuery(selectTimeDependencyPercentages);
             return parseDependencyInfos(selectTimeDependencyPercentages, infoType);
         }
@@ -714,4 +731,3 @@ void TraceDB::executeScriptFile(const QString& fileName)
         }
     }
 }
-

extensions/apps/traceAnalyzer/data/tracedb.h

@@ -145,6 +145,8 @@ private:
     void executeScriptFile(const QString& fileName);
     void dropAndCreateTables();
 
+    uint64_t getTraceLength();
+    uint64_t getNumberOfTransactions();
     uint64_t getNumberOfPhases();
     GeneralInfo getGeneralInfoFromDB();
     CommandLengths getCommandLengthsFromDB();
@@ -174,6 +176,3 @@ public:
     }
 };
 #endif // TRACEDB_H
-
-
-