Changeset 88702 in vbox for trunk/src/VBox

Timestamp:

Apr 26, 2021 10:40:36 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930. Changing the way we handle machines with no log file

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogPage.cpp (modified) (2 diffs)
• UIVMLogPage.h (modified) (2 diffs)
• UIVMLogViewerWidget.cpp (modified) (6 diffs)
• UIVMLogViewerWidget.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.cpp

@@ -40 +40 @@
     , m_iFilteredLineCount(-1)
     , m_iUnfilteredLineCount(-1)
+    , m_iLogFileId(-1)
 {
     prepare();
@@ -341 +342 @@
     m_machineId = machineId;
 }
+
+void UIVMLogPage::setLogFileId(int iLogFileId)
+{
+    m_iLogFileId = iLogFileId;
+}
+
+int UIVMLogPage::logFileId() const
+{
+    return m_iLogFileId;
+}

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.h

@@ -117 +117 @@
     void setMachineId(const QUuid &machineId);
 
+    void setLogFileId(int iLogFileId);
+    int logFileId() const;
+
 private slots:
 
@@ -162 +165 @@
     /** Id of the machine the log shown in this page belongs to. */
     QUuid m_machineId;
+    /** The id we pass to CMachine::ReadLog. Used while refreshing and saving page content. */
+    int m_iLogFileId;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -224 +224 @@
 }
 
+QString UIVMLogViewerWidget::readLogFile(CMachine &comMachine, int iLogFileId)
+{
+    QString strLogFileContent;
+    ULONG uOffset = 0;
+
+    while (true)
+    {
+        QVector<BYTE> data = comMachine.ReadLog(iLogFileId, uOffset, _1M);
+        if (data.size() == 0)
+            break;
+        strLogFileContent.append(QString::fromUtf8((char*)data.data(), data.size()));
+        uOffset += data.size();
+        /* Don't read futher if we have reached the allowed size limit: */
+        if (uOffset >= uAllowedLogSize)
+        {
+            strLogFileContent.append("\n=========Log file has been truncated as it is too large.======");
+            break;
+        }
+    }
+    return strLogFileContent;
+}
+
 QFont UIVMLogViewerWidget::currentFont() const
 {
@@ -249 +271 @@
 void UIVMLogViewerWidget::sltRefresh()
 {
-    // if (!m_pTabWidget)
-    //     return;
-    // /* Disconnect this connection to avoid initial signals during page creation/deletion: */
+    if (!m_pTabWidget)
+        return;
+
+    UIVMLogPage *pCurrentPage = currentLogPage();
+    if (!pCurrentPage)
+        return;
+
+    CMachine comMachine = uiCommon().virtualBox().FindMachine(pCurrentPage->machineId().toString());
+    if (comMachine.isNull())
+        return;
+
+
+
+
+    /* Disconnect this connection to avoid initial signals during page creation/deletion: */
     // disconnect(m_pTabWidget, &QITabWidget::currentChanged, m_pFilterPanel, &UIVMLogViewerFilterPanel::applyFilter);
     // disconnect(m_pTabWidget, &QITabWidget::currentChanged, this, &UIVMLogViewerWidget::sltTabIndexChange);
@@ -563 +597 @@
     retranslateUi();
 
-    /* Reading log files: */
-    sltRefresh();
     /* Setup escape shortcut: */
     manageEscapeShortCut();
@@ -864 +896 @@
 
 void UIVMLogViewerWidget::createLogPage(const QString &strFileName, const QString &strMachineName,
-                                        const QUuid &machineId,
-                                        const QString &strLogContent, bool noLogsToShow /* = false */)
+                                        const QUuid &machineId, int iLogFileId,
+                                        const QString &strLogContent, bool noLogsToShow)
 {
     if (!m_pTabWidget)
@@ -881 +913 @@
         pLogPage->setCurrentFont(m_font);
         pLogPage->setMachineId(machineId);
+        pLogPage->setLogFileId(iLogFileId);
         /* Set the file name only if we really have log file to read. */
         if (!noLogsToShow)
             pLogPage->setLogFileName(strFileName);
 
-        /* Add page-container to viewer-container: */
+        /* Add page-container to viewer-container in stacked mode (manager UI case): */
         bool fTitleWithMachineName = m_enmEmbedding == EmbedTo_Stack;
         QString strTabTitle;
@@ -934 +967 @@
 }
 
-bool UIVMLogViewerWidget::createLogViewerPages(const QVector<QUuid> &machineList)
-{
-    bool noLogsToShow = false;
-
-    QString strDummyTabText;
-    /* check if the machine is valid: */
-    // if (m_comMachine.isNull())
-    // {
-    //     noLogsToShow = true;
-    //     strDummyTabText = QString(tr("<p><b>No machine</b> is currently selected or the selected machine is not valid. "
-    //                                  "Please select a Virtual Machine to see its logs"));
-    // }
-
+void UIVMLogViewerWidget::createLogViewerPages(const QVector<QUuid> &machineList)
+{
     const CSystemProperties &sys = uiCommon().virtualBox().GetSystemProperties();
     unsigned cMaxLogs = sys.GetLogHistoryCount() + 1 /*VBox.log*/ + 1 /*VBoxHardening.log*/; /** @todo Add api for getting total possible log count! */
-    //bool logFileRead = false;
     foreach (const QUuid &machineId, machineList)
     {
         CMachine comMachine = uiCommon().virtualBox().FindMachine(machineId.toString());
-
         if (comMachine.isNull())
             continue;
-        for (unsigned i = 0; i < cMaxLogs && !noLogsToShow; ++i)
-        {
-            /* Query the log file name for index i: */
-            QString strFileName = comMachine.QueryLogFilename(i);
-            if (!strFileName.isEmpty())
+        bool fNoLogFileForMachine = true;
+
+        QUuid uMachineId = comMachine.GetId();
+        QString strMachineName = comMachine.GetName();
+        for (unsigned iLogFileId = 0; iLogFileId < cMaxLogs; ++iLogFileId)
+        {
+            QString strLogContent = readLogFile(comMachine, iLogFileId);
+            if (!strLogContent.isEmpty())
             {
-                /* Try to read the log file with the index i: */
-                ULONG uOffset = 0;
-                QString strText;
-                while (true)
-                {
-                    QVector<BYTE> data = comMachine.ReadLog(i, uOffset, _1M);
-                    if (data.size() == 0)
-                        break;
-                    strText.append(QString::fromUtf8((char*)data.data(), data.size()));
-                    uOffset += data.size();
-                    /* Don't read futher if we have reached the allowed size limit: */
-                    if (uOffset >= uAllowedLogSize)
-                    {
-                        strText.append("\n=========Log file has been truncated as it is too large.======");
-                        break;
-                    }
-                }
-                /* Anything read at all? */
-                if (uOffset > 0)
-                {
-                    //logFileRead = true;
-                    createLogPage(strFileName, comMachine.GetName(), comMachine.GetId(), strText);
-                }
+                fNoLogFileForMachine = false;
+                createLogPage(comMachine.QueryLogFilename(iLogFileId),
+                              strMachineName, uMachineId, iLogFileId,
+                              strLogContent, false);
             }
         }
-    }
-    // if (!noLogsToShow && !logFileRead)
-    // {
-    //     noLogsToShow = true;
-    //     // strDummyTabText = QString(tr("<p>No log files found. Press the "
-    //     //                              "<b>Refresh</b> button to rescan the log folder "
-    //     //                              "<nobr><b>%1</b></nobr>.</p>")
-    //     //                              .arg(m_comMachine.GetLogFolder()));
-    // }
-
-    /* if noLogsToShow then ceate a single log page with an error message: */
-    // if (noLogsToShow)
-    // {
-    //     createLogPage("No Logs", strDummyTabText, noLogsToShow);
-    // }
-    return noLogsToShow;
+        if (fNoLogFileForMachine)
+        {
+            QString strDummyTabText = QString(tr("<p>No log files for the machine %1 found. Press the "
+                                                 "<b>Rescan</b> button to rescan the log folder "
+                                                 "<nobr><b>%2</b></nobr>.</p>")
+                                              .arg(strMachineName).arg(comMachine.GetLogFolder()));
+            createLogPage(tr("NoLogFile"), strMachineName, uMachineId, -1 /* iLogFileId */, strDummyTabText, true);
+        }
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -97 +97 @@
     void sltSaveOptions();
 
-    /** Handles refresh action triggering. */
+    /** Rereads the log file shown in the current tab. */
     void sltRefresh();
     /** Handles save action triggering. */
@@ -172 +172 @@
     /** Returns the newly created log-page using @a strPage filename. */
     void createLogPage(const QString &strFileName, const QString &strMachineName,
-                       const QUuid &machineId,
-                       const QString &strLogContent, bool noLogsToShow = false);
+                       const QUuid &machineId, int iLogFileId,
+                       const QString &strLogContent, bool noLogsToShow);
 
     const UIVMLogPage *currentLogPage() const;
@@ -180 +180 @@
     UIVMLogPage *logPage(int iIndex);
 
-    /** Attempts to read the logs through the API, returns true if there exists any logs, false otherwise.
-     *  @p machineList is the list of machine whose log should be read. */
-    bool createLogViewerPages(const QVector<QUuid> &machineList);
+    void createLogViewerPages(const QVector<QUuid> &machineList);
     /** Removes the log pages/tabs that shows logs of the machines from @p machineList. */
     void removeLogViewerPages(const QVector<QUuid> &machineList);
@@ -198 +196 @@
     void updateMachineSelectionMenu();
     void setMachines(const QVector<QUuid> &machineIDs);
+    /** Returns the content of the ith log file of @comMachine or possibly an empty string */
+    QString readLogFile(CMachine &comMachine, int iLogFileId);
 
     /** Holds the widget's embedding type. */