luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-15 12:08:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move quark initialization to a constructor

Browse Source 
This removes a branch from the very frequently called
quark functions.
This commit is contained in:
Matthias Clasen 2015-09-11 23:59:27 -04:00
parent 627854fee1
commit 2fe992b099
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glib/glib-init.c
View File

@ -233,6 +233,7 @@ glib_init (void)
{ {
g_messages_prefixed_init (); g_messages_prefixed_init ();
g_debug_init (); g_debug_init ();
g_quark_init ();
} }
#if defined (G_OS_WIN32) #if defined (G_OS_WIN32)

2
glib/glib-init.h
View File

@ -25,6 +25,8 @@
extern GLogLevelFlags g_log_always_fatal; extern GLogLevelFlags g_log_always_fatal;
extern GLogLevelFlags g_log_msg_prefix; extern GLogLevelFlags g_log_msg_prefix;
void g_quark_init (void);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <windows.h> #include <windows.h>

26
glib/gquark.c
View File

@ -40,6 +40,7 @@
#include "gthread.h" #include "gthread.h"
#include "gtestutils.h" #include "gtestutils.h"
#include "glib_trace.h" #include "glib_trace.h"
#include "glib-init.h"
#define QUARK_BLOCK_SIZE 2048 #define QUARK_BLOCK_SIZE 2048
#define QUARK_STRING_BLOCK_SIZE (4096 - sizeof (gsize)) #define QUARK_STRING_BLOCK_SIZE (4096 - sizeof (gsize))
@ -53,6 +54,16 @@ static gint quark_seq_id = 0;
static gchar *quark_block = NULL; static gchar *quark_block = NULL;
static gint quark_block_offset = 0; static gint quark_block_offset = 0;
void
g_quark_init (void)
{
g_assert (quark_seq_id == 0);
quark_ht = g_hash_table_new (g_str_hash, g_str_equal);
quarks = g_new (gchar*, QUARK_BLOCK_SIZE);
quarks[0] = NULL;
quark_seq_id = 1;
}
/** /**
* SECTION:quarks * SECTION:quarks
* @title: Quarks * @title: Quarks
@ -127,10 +138,9 @@ g_quark_try_string (const gchar *string)
return 0; return 0;
G_LOCK (quark_global); G_LOCK (quark_global);
if (quark_ht) quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
G_UNLOCK (quark_global); G_UNLOCK (quark_global);
return quark; return quark;
} }
@ -169,8 +179,7 @@ quark_from_string (const gchar *string,
{ {
GQuark quark = 0; GQuark quark = 0;
if (quark_ht) quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
if (!quark) if (!quark)
{ {
@ -283,13 +292,6 @@ quark_new (gchar *string)
*/ */
g_atomic_pointer_set (&quarks, quarks_new); g_atomic_pointer_set (&quarks, quarks_new);
} }
if (!quark_ht)
{
g_assert (quark_seq_id == 0);
quark_ht = g_hash_table_new (g_str_hash, g_str_equal);
quarks[quark_seq_id] = NULL;
g_atomic_int_inc (&quark_seq_id);
}
quark = quark_seq_id; quark = quark_seq_id;
g_atomic_pointer_set (&quarks[quark], string); g_atomic_pointer_set (&quarks[quark], string);