aboutsummaryrefslogtreecommitdiffstats
path: root/wireshark-qt.cpp
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2018-01-13 13:21:09 +0100
committerAnders Broman <a.broman58@gmail.com>2018-01-13 13:45:58 +0000
commit98f41223981f667deeae57aea200c12d6e108900 (patch)
tree2c78d1f2198a6b884a740e6e00363714518bdcbf /wireshark-qt.cpp
parent55553f1a38d6e016affcacd0d406aedbb77692b2 (diff)
Qt: Put all startup time logs in DEBUG_STARTUP_TIME
Change-Id: I545674ecae45458860627f8cf430b6fa524274fd Reviewed-on: https://code.wireshark.org/review/25299 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wireshark-qt.cpp')
-rw-r--r--wireshark-qt.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index 05d9400565..d8703a99c7 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -388,10 +388,10 @@ int main(int argc, char *qt_argv[])
#ifdef HAVE_LIBPCAP
int caps_queries = 0;
#endif
- /* Start time in microseconds*/
- guint64 start_time = g_get_monotonic_time();
#ifdef DEBUG_STARTUP_TIME
- /* At least on Windows there is a problem with the loging as the preferences is taken
+ /* Start time in microseconds */
+ guint64 start_time = g_get_monotonic_time();
+ /* At least on Windows there is a problem with the logging as the preferences is taken
* into account and the preferences are loaded pretty late in the startup process.
*/
prefs.console_log_level = DEBUG_STARTUP_TIME_LOGLEVEL;
@@ -696,7 +696,9 @@ int main(int argc, char *qt_argv[])
splash_update(RA_EXTCAP, NULL, NULL);
extcap_register_preferences();
splash_update(RA_PREFERENCES, NULL, NULL);
+#ifdef DEBUG_STARTUP_TIME
g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "Calling module preferences, elapsed time %" G_GUINT64_FORMAT " us \n", g_get_monotonic_time() - start_time);
+#endif
global_commandline_info.prefs_p = ws_app.readConfigurationFiles(false);
@@ -861,7 +863,9 @@ int main(int argc, char *qt_argv[])
#endif /* HAVE_LIBPCAP */
wsApp->allSystemsGo();
+#ifdef DEBUG_STARTUP_TIME
g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "Wireshark is up and ready to go, elapsed time %" G_GUINT64_FORMAT "us \n", g_get_monotonic_time() - start_time);
+#endif
SimpleDialog::displayQueuedMessages(main_w);
/* User could specify filename, or display filter, or both */