Attachment #426486 for bug #575614

View | Details | Raw Unified | Return to bug 575614
Collapse All | Expand All

Lines 233-239 glib_init (void) Link Here

(-)a/glib/glib-init.c (-1 lines)
233	{	233	{
234	g_messages_prefixed_init ();	234	g_messages_prefixed_init ();
235	g_debug_init ();	235	g_debug_init ();
236	g_quark_init ();
237	}	236	}
238		237
239	#if defined (G_OS_WIN32)	238	#if defined (G_OS_WIN32)

Lines 25-32 Link Here

(-)a/glib/glib-init.h (-2 lines)
25	extern GLogLevelFlags g_log_always_fatal;	25	extern GLogLevelFlags g_log_always_fatal;
26	extern GLogLevelFlags g_log_msg_prefix;	26	extern GLogLevelFlags g_log_msg_prefix;
27		27
28	void g_quark_init (void);
29
30	#ifdef G_OS_WIN32	28	#ifdef G_OS_WIN32
31	#include <windows.h>	29	#include <windows.h>
32		30




#include "gthread.h"
#include "gtestutils.h"
#include "glib_trace.h"
#include "glib-init.h"

#define QUARK_BLOCK_SIZE         2048
#define QUARK_STRING_BLOCK_SIZE (4096 - sizeof (gsize))

static gchar         *quark_block = NULL;
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
 * @title: Quarks

    return 0;

  G_LOCK (quark_global);
  if (quark_ht)
    quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
  G_UNLOCK (quark_global);
  
  return quark;
}


{
  GQuark quark = 0;

  if (quark_ht)
    quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));

  if (!quark)
    {

       */
      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;
  g_atomic_pointer_set (&quarks[quark], string);
- 

Return to bug 575614

Lines 40-46 Link Here

(-)a/glib/gquark.c (-15 / +12 lines)
40	#include "gthread.h"	40	#include "gthread.h"
41	#include "gtestutils.h"	41	#include "gtestutils.h"
42	#include "glib_trace.h"	42	#include "glib_trace.h"
43	#include "glib-init.h"
44		43
45	#define QUARK_BLOCK_SIZE 2048	44	#define QUARK_BLOCK_SIZE 2048
46	#define QUARK_STRING_BLOCK_SIZE (4096 - sizeof (gsize))	45	#define QUARK_STRING_BLOCK_SIZE (4096 - sizeof (gsize))
Lines 54-69 static gint quark_seq_id = 0; Link Here
54	static gchar *quark_block = NULL;	53	static gchar *quark_block = NULL;
55	static gint quark_block_offset = 0;	54	static gint quark_block_offset = 0;
56		55
57	void
58	g_quark_init (void)
59	{
60	g_assert (quark_seq_id == 0);
61	quark_ht = g_hash_table_new (g_str_hash, g_str_equal);
62	quarks = g_new (gchar*, QUARK_BLOCK_SIZE);
63	quarks[0] = NULL;
64	quark_seq_id = 1;
65	}
66
67	/**	56	/**
68	* SECTION:quarks	57	* SECTION:quarks
69	* @title: Quarks	58	* @title: Quarks
Lines 138-146 g_quark_try_string (const gchar *string) Link Here
138	return 0;	127	return 0;
139		128
140	G_LOCK (quark_global);	129	G_LOCK (quark_global);
141	quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));	130	if (quark_ht)
		131	quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
142	G_UNLOCK (quark_global);	132	G_UNLOCK (quark_global);
143		133
144	return quark;	134	return quark;
145	}	135	}
146		136
Lines 179-185 quark_from_string (const gchar *string, Link Here
179	{	169	{
180	GQuark quark = 0;	170	GQuark quark = 0;
181		171
182	quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));	172	if (quark_ht)
		173	quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
183		174
184	if (!quark)	175	if (!quark)
185	{	176	{
Lines 292-297 quark_new (gchar *string) Link Here
292	*/	283	*/
293	g_atomic_pointer_set (&quarks, quarks_new);	284	g_atomic_pointer_set (&quarks, quarks_new);
294	}	285	}
		286	if (!quark_ht)
		287	{
		288	g_assert (quark_seq_id == 0);
		289	quark_ht = g_hash_table_new (g_str_hash, g_str_equal);
		290	quarks[quark_seq_id] = NULL;
		291	g_atomic_int_inc (&quark_seq_id);
		292	}
295		293
296	quark = quark_seq_id;	294	quark = quark_seq_id;
297	g_atomic_pointer_set (&quarks[quark], string);	295	g_atomic_pointer_set (&quarks[quark], string);
298	-