fix logger memory issues

Author: Mahdi-zarei

include/ui/mainwindow.h

@@ -60,15 +60,10 @@ namespace Ui {
 QT_END_NAMESPACE
 
 enum class RefreshAnchor {
-    // Re-select the same profiles by id; select nothing if they are gone.
     KeepPlace,
-    // As above, but if all of them were deleted select whatever took their row.
     Removal,
 };
 
-// What the app launches in place of itself once on_menu_exit_triggered() has torn
-// it down. Doubles as get_elevated_permissions()'s reason: on Windows that exits
-// and relaunches elevated with the matching flag.
 enum class ExitReason {
     None,
     RunUpdater,
@@ -85,9 +80,6 @@ class MainWindow : public QMainWindow {
 
     ~MainWindow() override;
 
-    // Runtime Stats panel helpers, read on the UI thread. GetCorePid returns 0
-    // when the core process isn't running; GetRunningConfigName is empty when no
-    // profile is active.
     qint64 GetCorePid();
     QString GetRunningConfigName();
 
@@ -130,11 +122,8 @@ class MainWindow : public QMainWindow {
 
     void UpdateDataView(bool force = false);
 
-    // Pushes the auto-selector snapshot into the data view, toggles the Tools
-    // entry, and refreshes the dialog if it is open.
     void refresh_auto_selector_view();
 
-    // Non-owning: cleared by the dialog's finished() handler.
     class DialogAutoSelector *m_autoSelectorDialog = nullptr;
 
     void setDownloadReport(const DownloadProgressReport& report, bool show);
@@ -213,27 +202,21 @@ private slots:
 
 private:
     Ui::MainWindow *ui;
-    // Monotonic, and invalid while the window is active or was never activated; see trayClickEvent().
     QElapsedTimer sinceWindowDeactivated;
     ProfilesTableModel *profilesTableModel = nullptr;
-    // What the view is attached to: rows from the view or its selection model are
-    // proxy rows, not profilesTableModel rows.
+
     ProfilesFilterProxyModel *profilesFilterModel = nullptr;
     QSystemTrayIcon *tray;
     QMenu *trayMenu = nullptr;    // tray context menu
-    // Tray "Select Server"/"Select Routing" open this small Qt-drawn popup instead of a
-    // submenu, because a tray submenu isn't painted by Qt on Linux (SNI/DBusMenu) or macOS
-    // (native NSMenu) and so can't reliably expand a dynamic list. Recreated on each open.
     QPointer<TrayProfileSelector> traySelector;
     void openTraySelector(bool routing);
     QShortcut *shortcut_esc = new QShortcut(QKeySequence::Cancel, this);
     //
-    // Shared by the test sweeps and the batch profile scans (remove-invalid).
     QThreadPool *parallelCoreCallPool = new QThreadPool(this);
     std::unique_ptr<TestRunner> testRunner;
     //
     Configs_sys::CoreProcess *core_process = nullptr;
-    QMutex coreProcessMutex; // serializes core_process init (DS_cores) vs IPC newConnection (UI)
+    QMutex coreProcessMutex;
     QLocalServer *core_server = nullptr;
     bool rpc_started = false;
     qint64 vpn_pid = 0;
@@ -244,14 +227,8 @@ private slots:
     int icon_status = -1;
     std::shared_ptr<Configs::Profile> running;
     int last_running_profile_id = -1;
-    // True from the moment a profile start is kicked off until it succeeds or
-    // fails; drives the start/stop button's transient "Connecting" state.
     bool m_profileConnecting = false;
-    // True while a profile stop is in progress; drives the "Disconnecting" state.
     bool m_profileDisconnecting = false;
-    // Single-flight guard for the Xray geo-asset (geoip.dat/geosite.dat) download
-    // prompt: a batch test can surface the missing-asset error for many profiles at
-    // once, and we only want one prompt/download. Touched on the UI thread only.
     bool m_xrayGeoAssetBusy = false;
     QString traffic_update_cache;
     qint64 last_test_time = 0;
@@ -272,7 +249,6 @@ private slots:
     SpeedWidget *speedChartWidget;
     //
     // for data view
-    // Repaint throttle, in ms since epoch. Atomic: worker threads drive it too.
     std::atomic<qint64> lastUpdatedMs = QDateTime::currentMSecsSinceEpoch();
     DataViewHtmlGenerator dataViewHtmlGenerator_;
 
@@ -287,7 +263,6 @@ private slots:
 
     QTimer *m_filterRefreshDebounce = nullptr;
 
-    // Only meaningful between a saveProfileFocusState() and its restore.
     bool m_profilesTableHadFocus = false;
     int m_profilesScrollValue = 0;
 
@@ -301,10 +276,10 @@ private slots:
     QWaitCondition logWaiter;
     Qv2ray::ui::SyntaxHighlighter *logHighlighter = nullptr;
 
-    // Immutable snapshot of the log filter fields. The log thread copies these
-    // under logMutex (Qt containers are copy-on-write, so it's O(1)) and then
-    // filters without holding the lock, so producers calling append_log() are
-    // never blocked on the regex/keyword work.
+    QMutex logPendingMutex;
+    QString logPendingText;
+    bool logFlushScheduled = false;
+
     struct LogFilter {
         bool enableInclude = false;
         bool enableExclude = false;
@@ -318,12 +293,13 @@ private slots:
 
     void log_process_loop();
 
+    // UI thread only.
+    void flush_log_batch();
+
     bool should_print_log(const QString &log, const LogFilter &filter);
 
     void updateLogFilterFields();
 
-    // (Re)installs the log syntax highlighter, deleting any previous one so
-    // highlighters don't stack up (and keep re-highlighting) on theme changes.
     void setLogHighlighter(bool darkMode);
 
     void applyProfileFilters();
@@ -353,12 +329,8 @@ private slots:
 
     void handle_import_route(const QString &url);
 
-    // throne://remoteRoute?data=<...> : add one or more remote routing profiles. The data is
-    // (base64 of) a JSON array of {url, auto_update[, name]} objects.
     void handle_add_remote_routes(const QString &url);
 
-    // Routes user-supplied text: throne:// links go to the deeplink handler, the
-    // rest to the subscription/profile importer.
     void import_or_handle_deeplink(const QString &text);
 
     void refresh_proxy_list_column_size();
@@ -369,9 +341,6 @@ private slots:
 
     void parseQrImage(const QPixmap *image);
 
-    // Imports local files picked from the file dialog or dropped on the window.
-    // What each file is gets decided from its bytes, never from its name: config
-    // files arrive as .json, .conf, .txt or with no extension at all.
     void importFromFiles(const QStringList &paths);
 
     void trayClickEvent();
@@ -388,10 +357,6 @@ private slots:
 
     void resizeEvent(QResizeEvent *event) override;
 
-    // Tell the connection lister whether its tab is actually on screen (stats tab
-    // selected, window neither minimized nor hidden to tray) so it can drop to a
-    // relaxed poll cadence when nobody is looking. Recomputed on tab/visibility
-    // changes.
     void syncConnectionViewState();
 
     void dragEnterEvent(QDragEnterEvent *event);
@@ -400,16 +365,10 @@ private slots:
 
     void applyLogBrowserFont();
 
-    // Re-derives the top bar's sizing from the current font and translation, and
-    // raises the window's minimum to whatever the layout actually needs. Called
-    // at startup and on every font change.
     void applyTopBarMetrics();
 
-    // The window minimum the .ui was designed with; applyTopBarMetrics() only ever
-    // grows past this, so a smaller font returns to the designed floor.
     QSize designMinimumSize;
 
-    // Debounced refresh_proxy_list trigger for font/theme/resize events.
     QTimer *m_proxyListRefreshDebounce = nullptr;
     void scheduleProxyListRefresh();
 
@@ -420,15 +379,7 @@ private slots:
     void HotkeyEvent(const QString &key);
 
     void RegisterHiddenMenuShortcuts(bool unregister = false);
-    // Register a QShortcut for every action in `menu` (recursing into submenus),
-    // appending them to hiddenMenuShortcuts. Needed because the menubar is hidden,
-    // so actions reachable only through popup menus get no shortcut on their own.
-    // `claimed` holds the key sequences already handled (either by Qt automatically
-    // or by an earlier call); shortcuts already in it are skipped to avoid the
-    // ambiguous-shortcut conflict that breaks actions shared with other menus.
     void registerMenuShortcuts(QMenu *menu, QSet<QKeySequence> &claimed);
-    // Collect the shortcut key sequences of every action in `menu` (recursing into
-    // submenus) into `out`, without registering anything.
     void collectMenuShortcuts(QMenu *menu, QSet<QKeySequence> &out);
 
     void setActionsData();
@@ -443,29 +394,14 @@ private slots:
 
     bool verify_core_pid(QLocalSocket *socket);
 
-    // Measures the members of an auto selector that have no test result yet
-    // (plus `stale`, whose stored result is known to be out of date) and
-    // rewrites its ranked pool. Blocks — call from a worker thread.
     void rank_auto_selector(const std::shared_ptr<Configs::Profile>& ent, const QList<int>& stale = {});
 
-    // Every running member of the auto selector died: re-rank and restart on
-    // the next batch of good ones.
     void on_auto_selector_exhausted(int profileID);
 
-    // A subscription refresh rewrote the servers of `gid`. Drops ids that no
-    // longer exist from every selector tracking that group, and rebuilds the
-    // running one only if the refresh touched a member it actually built.
-    // `disturbed` holds the profiles the refresh deleted or replaced in place.
     void on_subscription_group_changed(int gid, const QList<int>& disturbed);
 
-    // Guards the re-entrant profile_start used to rank before building.
     bool auto_selector_ranked = false;
 
-    // If `error` reports missing Xray geo assets (geoip.dat / geosite.dat), prompt
-    // once (guarded by m_xrayGeoAssetBusy) and download the missing .dat files in
-    // the background. Shared by profile start and the test paths. `contextName` is
-    // the profile/config name shown in the prompt. Returns true when the error was
-    // a geo-asset error (and thus handled), false otherwise.
     bool handleXrayGeoAssetError(const QString& error, const QString& contextName);
 
     void url_test_current();
@@ -478,8 +414,6 @@ private slots:
 
     void setupConnectionSortMenu();
 
-    // The window's own component, not an outside caller: it drives the data
-    // view, the profile table and the geo-asset prompt while a sweep runs.
     friend class TestRunner;
 
 protected:

src/global/Utils.cpp

@@ -355,18 +355,17 @@ void HideWindow(QWidget *w) {
 }
 
 void runOnUiThread(const std::function<void()> &callback, bool wait) {
-    // any thread. Targets qApp's thread rather than mainwindow's: they are the
-    // same thread, but qApp exists for the whole of main() while mainwindow stays
-    // null until UI_InitMainWindow(). Background work started before that (e.g.
-    // the traffic-stats rollup) can report errors through here, and dereferencing
-    // the null mainwindow crashed the worker thread.
     auto *app = QCoreApplication::instance();
     if (app == nullptr) return;
     auto thread = app->thread();
     if (thread == QThread::currentThread()) {
         callback();
         return;
     }
+    if (!wait) {
+        QMetaObject::invokeMethod(app, callback, Qt::QueuedConnection);
+        return;
+    }
     auto *timer = new QTimer();
     timer->moveToThread(thread);
     timer->setSingleShot(true);

src/ui/mainWindow/mainwindow_log.cpp

@@ -13,6 +13,8 @@
 #include "3rdparty/qv2ray/v2/ui/LogHighlighter.hpp"
 
 namespace {
+    constexpr qsizetype MAX_PENDING_LOG_CHARS = 2 * 1024 * 1024;
+
     // Bypasses QTextEdit::append()'s per-call layout/scroll work, which dominates
     // when the core spams lines; one edit block per batch instead.
     inline void FastAppendTextDocument(const QString &message, QTextDocument *doc) {
@@ -81,26 +83,50 @@ void MainWindow::log_process_loop() {
             }
         }
 
-        if (!batchToPrint.isEmpty()) {
-            QString trimmedBatch = batchToPrint.trimmed();
-            runOnUiThread([trimmedBatch = std::move(trimmedBatch), this] {
-                auto bar = ui->masterLogBrowser->verticalScrollBar();
-                if (Configs::dataManager->settingsRepo->log_auto_scroll) {
-                    FastAppendTextDocument(trimmedBatch, qvLogDocument);
-                    bar->setValue(bar->maximum());
-                } else {
-                    auto layout = qvLogDocument->documentLayout();
-                    // Anchor to the block at the top of the viewport; if the append
-                    // shifts its document-Y, replay the original sub-block offset.
-                    QTextBlock anchorBlock = ui->masterLogBrowser->cursorForPosition(QPoint(0, 0)).block();
-                    int viewportOffset = bar->value() - static_cast<int>(layout->blockBoundingRect(anchorBlock).y());
-                    FastAppendTextDocument(trimmedBatch, qvLogDocument);
-                    if (anchorBlock.isValid()) {
-                        int newY = static_cast<int>(layout->blockBoundingRect(anchorBlock).y());
-                        bar->setValue(newY + viewportOffset);
-                    }
-                }
-            });
+        const QString trimmedBatch = batchToPrint.trimmed();
+        if (trimmedBatch.isEmpty()) continue;
+
+        bool needsPost;
+        {
+            QMutexLocker pendingLocker(&logPendingMutex);
+            if (!logPendingText.isEmpty()) logPendingText += '\n';
+            logPendingText += trimmedBatch;
+            if (logPendingText.size() > MAX_PENDING_LOG_CHARS) {
+                const auto cut = logPendingText.indexOf('\n', logPendingText.size() - MAX_PENDING_LOG_CHARS);
+                logPendingText = cut < 0 ? QString() : logPendingText.mid(cut + 1);
+            }
+            needsPost = !logFlushScheduled;
+            logFlushScheduled = true;
+        }
+        // At most one flush in flight; anything produced meanwhile is picked up by
+        // the flush that is already pending, so the UI event queue cannot grow.
+        if (needsPost) runOnUiThread([this] { flush_log_batch(); });
+    }
+}
+
+void MainWindow::flush_log_batch() {
+    QString batch;
+    {
+        QMutexLocker pendingLocker(&logPendingMutex);
+        batch.swap(logPendingText);
+        logFlushScheduled = false;
+    }
+    if (batch.isEmpty()) return;
+
+    auto bar = ui->masterLogBrowser->verticalScrollBar();
+    if (Configs::dataManager->settingsRepo->log_auto_scroll) {
+        FastAppendTextDocument(batch, qvLogDocument);
+        bar->setValue(bar->maximum());
+    } else {
+        auto layout = qvLogDocument->documentLayout();
+        // Anchor to the block at the top of the viewport; if the append
+        // shifts its document-Y, replay the original sub-block offset.
+        QTextBlock anchorBlock = ui->masterLogBrowser->cursorForPosition(QPoint(0, 0)).block();
+        int viewportOffset = bar->value() - static_cast<int>(layout->blockBoundingRect(anchorBlock).y());
+        FastAppendTextDocument(batch, qvLogDocument);
+        if (anchorBlock.isValid()) {
+            int newY = static_cast<int>(layout->blockBoundingRect(anchorBlock).y());
+            bar->setValue(newY + viewportOffset);
         }
     }
 }
@@ -144,6 +170,11 @@ void MainWindow::on_masterLogBrowser_customContextMenuRequested(const QPoint &po
     auto action_clear = new QAction(this);
     action_clear->setText(tr("Clear"));
     connect(action_clear, &QAction::triggered, this, [=,this] {
+        {
+            // Otherwise a flush already in flight repaints what was just cleared.
+            QMutexLocker pendingLocker(&logPendingMutex);
+            logPendingText.clear();
+        }
         qvLogDocument->clear();
         ui->masterLogBrowser->clear();
     });