diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-06-24 16:48:23 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-26 06:22:46 +0000 |
| commit | 4addfc67b4cd35601d5f9c5ce134f23ea145934a (patch) | |
| tree | af753108eb5c8f1d600aefded360dd3aa8408b5c /ui/gtk | |
| parent | 60cdee9e307c15928a542adc547f27fd752c4837 (diff) | |
Add an RA_INTERFACES register action.
Add RA_INTERFACES between RA_PREFERENCES and RA_CONFIGURATION. Wireshark
was spending a suspiciously long time loading module preferences here.
(Now we just need to find out why that section of the code is slow.)
Change-Id: Iecbe55e8e10c8844bcb151a13e383cb13a3f6eb1
Reviewed-on: https://code.wireshark.org/review/16133
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/about_dlg.c | 7 | ||||
| -rw-r--r-- | ui/gtk/main.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index aee4b171d2..b7b3bb1000 100644 --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c @@ -233,6 +233,9 @@ splash_update(register_action_e action, const char *message, gpointer client_dat case RA_PREFERENCES: action_msg = "Loading module preferences ..."; break; + case RA_INTERFACES: + action_msg = "Finding local interfaces ..."; + break; case RA_CONFIGURATION: action_msg = "Loading configuration files ..."; break; @@ -245,10 +248,10 @@ splash_update(register_action_e action, const char *message, gpointer client_dat } if(ul_count == 0) { /* get the count of dissectors */ - ul_count = register_count() + 6; /* additional 6 for: + ul_count = register_count() + 7; /* additional 7 for: dissectors, listeners, registering plugins, handingoff plugins, - preferences and configuration */ + preferences, interfaces and configuration */ #ifdef HAVE_LUA ul_count += wslua_count_plugins (); /* get count of lua plugins */ #endif diff --git a/ui/gtk/main.c b/ui/gtk/main.c index e7d37df5cd..623b092493 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -2361,6 +2361,8 @@ main(int argc, char *argv[]) commandline_other_options(argc, argv, &commandline_info, TRUE); #ifdef HAVE_LIBPCAP + splash_update(RA_INTERFACES, NULL, (gpointer)splash_win); + fill_in_local_interfaces(main_window_update); if (commandline_info.start_capture || commandline_info.list_link_layer_types) { |