brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Destroy GjsContext before exit

Browse Source 
This will be required in the upcoming version of GJS.

The reference count on ShellGlobal is 2 at this point, because JS holds a
reference due to the "window.global = Shell.Global.get()" line in
ui/environment.js. Therefore, destroy the GjsContext first, then unref
the ShellGlobal object.

Cleaning up ShellGlobal was previously only enabled behind a debug
environment variable, but it should be required now.

https://bugzilla.gnome.org/show_bug.cgi?id=775374
This commit is contained in:
Philip Chimento 2016-12-05 17:31:08 -08:00
parent 56b20ef779
commit 83005e27da
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.c
View File

@ -469,12 +469,9 @@ main (int argc, char **argv)
ecode = meta_run (); ecode = meta_run ();
if (g_getenv ("GNOME_SHELL_ENABLE_CLEANUP")) g_debug ("Doing final cleanup");
{ _shell_global_destroy_gjs_context (shell_global_get ());
g_printerr ("Doing final cleanup...\n"); g_object_unref (shell_global_get ());
g_object_unref (shell_global_get ());
}
g_object_unref (sender); g_object_unref (sender);
return ecode; return ecode;

2
src/shell-global-private.h
View File

@ -11,6 +11,8 @@ void _shell_global_init (const char *first_property_name,
void _shell_global_set_plugin (ShellGlobal *global, void _shell_global_set_plugin (ShellGlobal *global,
MetaPlugin *plugin); MetaPlugin *plugin);
void _shell_global_destroy_gjs_context (ShellGlobal *global);
GjsContext *_shell_global_get_gjs_context (ShellGlobal *global); GjsContext *_shell_global_get_gjs_context (ShellGlobal *global);
gboolean _shell_global_check_xdnd_event (ShellGlobal *global, gboolean _shell_global_check_xdnd_event (ShellGlobal *global,

16
src/shell-global.c
View File

@ -338,7 +338,7 @@ shell_global_finalize (GObject *object)
{ {
ShellGlobal *global = SHELL_GLOBAL (object); ShellGlobal *global = SHELL_GLOBAL (object);
g_object_unref (global->js_context); g_clear_object (&global->js_context);
g_object_unref (global->settings); g_object_unref (global->settings);
the_object = NULL; the_object = NULL;
@ -566,6 +566,20 @@ shell_global_get (void)
return the_object; return the_object;
} }
/**
* _shell_global_destroy_gjs_context: (skip)
* @self: global object
*
* Destroys the GjsContext held by ShellGlobal, in order to break reference
* counting cycles. (The GjsContext holds a reference to ShellGlobal because
* it's available as window.global inside JS.)
*/
void
_shell_global_destroy_gjs_context (ShellGlobal *self)
{
g_clear_object (&self->js_context);
}
static guint32 static guint32
get_current_time_maybe_roundtrip (ShellGlobal *global) get_current_time_maybe_roundtrip (ShellGlobal *global)
{ {