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

turned detection of too late g_thread_init() calls into a warning. this is

Browse Source 
Fri Dec 29 13:28:07 2006  Tim Janik  <timj@imendio.com>

        * glib/gslice.c: turned detection of too late g_thread_init() calls
        into a warning. this is a temporary work-around for some head-room
        to fix affected programs, memory corruption still occours regardless.
This commit is contained in:
Tim Janik 2006-12-29 12:29:55 +00:00 committed by Tim Janik
parent d7b7c44e40
commit 0f9cf7898b
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Dec 29 13:28:07 2006 Tim Janik <timj@imendio.com>
* glib/gslice.c: turned detection of too late g_thread_init() calls
into a warning. this is a temporary work-around for some head-room
to fix affected programs, memory corruption still occours regardless.
2006-12-29 Matthias Clasen <mclasen@redhat.com> 2006-12-29 Matthias Clasen <mclasen@redhat.com>
* tests/gobject/Makefile.am: * tests/gobject/Makefile.am:

18
glib/gslice.c
View File

@ -42,6 +42,9 @@
#include <process.h> #include <process.h>
#endif #endif
#include <stdio.h> /* fputs/fprintf */
/* the GSlice allocator is split up into 4 layers, roughly modelled after the slab /* the GSlice allocator is split up into 4 layers, roughly modelled after the slab
* allocator and magazine extensions as outlined in: * allocator and magazine extensions as outlined in:
* + [Bonwick94] Jeff Bonwick, The slab allocator: An object-caching kernel * + [Bonwick94] Jeff Bonwick, The slab allocator: An object-caching kernel
@ -370,8 +373,17 @@ _g_slice_thread_init_nomessage (void)
{ {
/* we may not use g_error() or friends here */ /* we may not use g_error() or friends here */
if (sys_page_size) if (sys_page_size)
mem_error ("g_thread_init() must be called before GSlice is used, memory corrupted..."); {
g_slice_init_nomessage(); /* mem_error ("g_thread_init() must be called before GSlice is used, memory corrupted..."); */
fputs ("\n***MEMORY-WARNING***: ", stderr);
const char *pname = g_get_prgname();
fprintf (stderr, "%s[%u]: GSlice: ", pname ? pname : "", getpid());
fputs ("g_thread_init() must be called before all other GLib functions; "
"memory corruption due to late invocation of g_thread_init() has been detected; "
"this program is likely to crash, leak or unexpectedly abort soon...\n", stderr);
}
if (!sys_page_size)
g_slice_init_nomessage();
private_thread_memory = g_private_new (private_thread_memory_cleanup); private_thread_memory = g_private_new (private_thread_memory_cleanup);
allocator->magazine_mutex = g_mutex_new(); allocator->magazine_mutex = g_mutex_new();
allocator->slab_mutex = g_mutex_new(); allocator->slab_mutex = g_mutex_new();
@ -1135,8 +1147,6 @@ allocator_memfree (gsize memsize,
#endif #endif
} }
#include <stdio.h>
static void static void
mem_error (const char *format, mem_error (const char *format,
...) ...)