Browse Source

chatgui: add shutdown diagnostics — ~DbManager, ~SoundManager, g_shutdown_sentinel

Three diagnostic points covering the gap between ~MainWindow done and CRT exit:
- DbManager: destroyed — confirms local dtors started after ~MainWindow
- SoundManager: static destructor entered — confirms static destruction phase
- main: static destructors done (g_shutdown_sentinel dtor) — confirms ALL statics done

If process hangs, we know exactly which phase failed.
topo_upd
Evgeny 2 months ago
parent
commit
74c6b0d102
  1. 2
      tools/chatgui/db/db_manager.cpp
  2. 9
      tools/chatgui/src/main.cpp
  3. 5
      tools/chatgui/src/sound_manager.cpp

2
tools/chatgui/db/db_manager.cpp

@ -1,5 +1,6 @@
#include "db_manager.h" #include "db_manager.h"
#include "../src/debug_ui.h" #include "../src/debug_ui.h"
#include "../../lib/debug_config.h"
#include <openssl/sha.h> #include <openssl/sha.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <cstring> #include <cstring>
@ -78,6 +79,7 @@ DbManager::~DbManager() {
for (auto it = m_cursors.begin(); it != m_cursors.end(); ++it) for (auto it = m_cursors.begin(); it != m_cursors.end(); ++it)
sqlite3_finalize(it.value()); sqlite3_finalize(it.value());
m_cursors.clear(); m_cursors.clear();
DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "DbManager: destroyed");
} }
sqlite3_stmt* DbManager::prepareOrNull(const char* sql) const { sqlite3_stmt* DbManager::prepareOrNull(const char* sql) const {

9
tools/chatgui/src/main.cpp

@ -10,6 +10,7 @@
#include "../db/db_manager.h" #include "../db/db_manager.h"
#include "../transport/node_config.h" #include "../transport/node_config.h"
#include "../transport/utun_node.h" #include "../transport/utun_node.h"
#include "../../lib/debug_config.h"
#ifdef _WIN32 #ifdef _WIN32
static UtunNode* g_ctrl_node = nullptr; static UtunNode* g_ctrl_node = nullptr;
@ -23,6 +24,12 @@ static BOOL WINAPI console_ctrl_handler(DWORD dwCtrlType) {
} }
#endif #endif
static struct ShutdownSentinel {
~ShutdownSentinel() {
DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "main: static destructors done");
}
} g_shutdown_sentinel;
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
QApplication app(argc, argv); QApplication app(argc, argv);
app.setApplicationName("Chat"); app.setApplicationName("Chat");
@ -98,6 +105,6 @@ int main(int argc, char *argv[]) {
#endif #endif
int ret = app.exec(); int ret = app.exec();
qDebug("main: app.exec() returned %d", ret); DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "main: app.exec() returned %d", ret);
return ret; return ret;
} }

5
tools/chatgui/src/sound_manager.cpp

@ -10,7 +10,10 @@ SoundManager* SoundManager::instance() {
return &s; return &s;
} }
SoundManager::~SoundManager() { shutdown(); } SoundManager::~SoundManager() {
DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "SoundManager: static destructor entered");
shutdown();
}
bool SoundManager::init() { bool SoundManager::init() {
if (m_initialized) return true; if (m_initialized) return true;

Loading…
Cancel
Save