Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid installing emission hook more than once.

Browse Source 
It was possible for an app using a timer, but triggering no events, to
accumulate an unbounded number of hooks, consuming large amounts of CPU time
in processing the hook list.
Fixes #11315.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@62397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-10-13 06:53:16 +00:00
parent 097449e1e8
commit 57e858a992
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/app.cpp
View File

@@ -149,9 +149,11 @@ extern "C"
// One-shot emission hook for "event" signal, to install idle handler.
// This will be called when the "event" signal is issued on any GtkWidget object.
static gboolean
event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)
{
wxapp_install_idle_handler();
bool* hook_installed = (bool*)data;
*hook_installed = false;
// remove hook
return false;
}
@@ -159,12 +161,17 @@ event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
// add emission hook for "event" signal, to re-install idle handler when needed
static inline void wxAddEmissionHook()
{
static bool hook_installed;
GType widgetType = GTK_TYPE_WIDGET;
// if GtkWidget type is loaded
if (g_type_class_peek(widgetType) != NULL)
// if hook not installed and GtkWidget type is loaded
if (!hook_installed && g_type_class_peek(widgetType))
{
guint sig_id = g_signal_lookup("event", widgetType);
g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
static guint sig_id;
if (sig_id == 0)
sig_id = g_signal_lookup("event", widgetType);
hook_installed = true;
g_signal_add_emission_hook(
sig_id, 0, event_emission_hook, &hook_installed, NULL);
}
}