luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gmessages: use g_atomic_pointer to access handlers for g_print()/g_printerr()

Browse Source 
It seems unnecessary to use the mutex to get/set a single pointer.
This commit is contained in:
Thomas Haller 2023-02-06 18:00:29 +01:00
parent 4177164fd2
commit 4d7f66f214
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
glib/gmessages.c
View File

@ -3310,14 +3310,8 @@ g_log_default_handler (const gchar *log_domain,
GPrintFunc GPrintFunc
g_set_print_handler (GPrintFunc func) g_set_print_handler (GPrintFunc func)
{ {
GPrintFunc old_print_func; return g_atomic_pointer_exchange (&glib_print_func,
func ? func : g_default_print_func);
g_mutex_lock (&g_messages_lock);
old_print_func = glib_print_func;
glib_print_func = func ? func : g_default_print_func;
g_mutex_unlock (&g_messages_lock);
return old_print_func;
} }
static void static void
@ -3414,10 +3408,7 @@ g_print (const gchar *format,
string = format_string (format, args, &free_me); string = format_string (format, args, &free_me);
va_end (args); va_end (args);
g_mutex_lock (&g_messages_lock); local_glib_print_func = g_atomic_pointer_get (&glib_print_func);
local_glib_print_func = glib_print_func;
g_mutex_unlock (&g_messages_lock);
local_glib_print_func (string); local_glib_print_func (string);
g_free (free_me); g_free (free_me);
} }
@ -3448,14 +3439,8 @@ g_print (const gchar *format,
GPrintFunc GPrintFunc
g_set_printerr_handler (GPrintFunc func) g_set_printerr_handler (GPrintFunc func)
{ {
GPrintFunc old_printerr_func; return g_atomic_pointer_exchange (&glib_printerr_func,
func ? func : g_default_printerr_func);
g_mutex_lock (&g_messages_lock);
old_printerr_func = glib_printerr_func;
glib_printerr_func = func ? func : g_default_printerr_func;
g_mutex_unlock (&g_messages_lock);
return old_printerr_func;
} }
/** /**
@ -3487,10 +3472,7 @@ g_printerr (const gchar *format,
string = format_string (format, args, &free_me); string = format_string (format, args, &free_me);
va_end (args); va_end (args);
g_mutex_lock (&g_messages_lock); local_glib_printerr_func = g_atomic_pointer_get (&glib_printerr_func);
local_glib_printerr_func = glib_printerr_func;
g_mutex_unlock (&g_messages_lock);
local_glib_printerr_func (string); local_glib_printerr_func (string);
g_free (free_me); g_free (free_me);
} }