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

fixed memory offsett when ENABLE_MEM_CHECK is defined and

Browse Source 
Tue Oct  6 14:29:47 1998  Tim Janik  <timj@gtk.org>

        * gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is
        defined and ENABLE_MEM_PROFILE is not (patch from Martin Pool
        <mbp@wistful.humbug.org.au>).
This commit is contained in:
Tim Janik
1998-10-06 12:35:30 +00:00
committed by Tim Janik
parent 9e5fc0f019
commit 823a25beb6
10 changed files with 110 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is
defined and ENABLE_MEM_PROFILE is not (patch from Martin Pool
<mbp@wistful.humbug.org.au>).
Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
* glib.h:

6
ChangeLog.pre-2-0
View File

@@ -1,3 +1,9 @@
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is
defined and ENABLE_MEM_PROFILE is not (patch from Martin Pool
<mbp@wistful.humbug.org.au>).
Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
* glib.h:

6
ChangeLog.pre-2-10
View File

@@ -1,3 +1,9 @@
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is
defined and ENABLE_MEM_PROFILE is not (patch from Martin Pool
<mbp@wistful.humbug.org.au>).
Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
* glib.h:

6
ChangeLog.pre-2-12
View File

@@ -1,3 +1,9 @@
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is
defined and ENABLE_MEM_PROFILE is not (patch from Martin Pool
<mbp@wistful.humbug.org.au>).
Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
* glib.h:

6
ChangeLog.pre-2-2
View File

@@ -1,3 +1,9 @@
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is
defined and ENABLE_MEM_PROFILE is not (patch from Martin Pool
<mbp@wistful.humbug.org.au>).
Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
* glib.h:

6
ChangeLog.pre-2-4
View File

@@ -1,3 +1,9 @@
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is
defined and ENABLE_MEM_PROFILE is not (patch from Martin Pool
<mbp@wistful.humbug.org.au>).
Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
* glib.h:

6
ChangeLog.pre-2-6
View File

@@ -1,3 +1,9 @@
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is
defined and ENABLE_MEM_PROFILE is not (patch from Martin Pool
<mbp@wistful.humbug.org.au>).
Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
* glib.h:

6
ChangeLog.pre-2-8
View File

@@ -1,3 +1,9 @@
Tue Oct 6 14:29:47 1998 Tim Janik <timj@gtk.org>
* gmem.c (g_malloc0): fixed memory offsett when ENABLE_MEM_CHECK is
defined and ENABLE_MEM_PROFILE is not (patch from Martin Pool
<mbp@wistful.humbug.org.au>).
Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
* glib.h:

25
glib/gmem.c
View File

@@ -24,6 +24,23 @@
/* #define ENABLE_MEM_PROFILE_EXCLUDES_MEM_CHUNKS */
/* #define ENABLE_MEM_CHECK */
/*
* This library can check for some attempts to do illegal things to
* memory (ENABLE_MEM_CHECK), and can do profiling
* (ENABLE_MEM_PROFILE). Both features are implemented by storing
* words before the start of the memory chunk.
*
* The first, at offset -2*SIZEOF_LONG, is used only if
* ENABLE_MEM_CHECK is set, and stores 0 after the memory has been
* allocated and 1 when it has been freed. The second, at offset
* -SIZEOF_LONG, is used if either flag is set and stores the size of
* the block.
*
* The MEM_CHECK flag is checked when memory is realloc'd and free'd,
* and it can be explicitly checked before using a block by calling
* g_mem_check().
*/
#if defined(ENABLE_MEM_PROFILE) && defined(ENABLE_MEM_PROFILE_EXCLUDES_MEM_CHUNKS)
#define ENTER_MEM_CHUNK_ROUTINE() allocating_for_mem_chunk++
#define LEAVE_MEM_CHUNK_ROUTINE() allocating_for_mem_chunk--
@@ -184,9 +201,9 @@ g_malloc0 (gulong size)
return NULL;
#ifdef ENABLE_MEM_PROFILE
#if defined (ENABLE_MEM_PROFILE) || defined (ENABLE_MEM_CHECK)
size += SIZEOF_LONG;
#endif /* ENABLE_MEM_PROFILE */
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
#ifdef ENABLE_MEM_CHECK
size += SIZEOF_LONG;
@@ -279,7 +296,7 @@ g_realloc (gpointer mem,
}
if (!p)
g_error ("could not reallocate %ld bytes", size);
g_error ("could not reallocate %lu bytes", (gulong) size);
#ifdef ENABLE_MEM_CHECK
@@ -381,7 +398,7 @@ g_mem_check (gpointer mem)
t = (gulong*) ((guchar*) mem - SIZEOF_LONG - SIZEOF_LONG);
if (*t >= 1)
g_warning ("mem: 0x%08x has been freed: %lu\n", (gulong) mem, *t);
g_warning ("mem: 0x%08x has been freed %lu times\n", (gulong) mem, *t);
#endif /* ENABLE_MEM_CHECK */
}

25
gmem.c
View File

@@ -24,6 +24,23 @@
/* #define ENABLE_MEM_PROFILE_EXCLUDES_MEM_CHUNKS */
/* #define ENABLE_MEM_CHECK */
/*
* This library can check for some attempts to do illegal things to
* memory (ENABLE_MEM_CHECK), and can do profiling
* (ENABLE_MEM_PROFILE). Both features are implemented by storing
* words before the start of the memory chunk.
*
* The first, at offset -2*SIZEOF_LONG, is used only if
* ENABLE_MEM_CHECK is set, and stores 0 after the memory has been
* allocated and 1 when it has been freed. The second, at offset
* -SIZEOF_LONG, is used if either flag is set and stores the size of
* the block.
*
* The MEM_CHECK flag is checked when memory is realloc'd and free'd,
* and it can be explicitly checked before using a block by calling
* g_mem_check().
*/
#if defined(ENABLE_MEM_PROFILE) && defined(ENABLE_MEM_PROFILE_EXCLUDES_MEM_CHUNKS)
#define ENTER_MEM_CHUNK_ROUTINE() allocating_for_mem_chunk++
#define LEAVE_MEM_CHUNK_ROUTINE() allocating_for_mem_chunk--
@@ -184,9 +201,9 @@ g_malloc0 (gulong size)
return NULL;
#ifdef ENABLE_MEM_PROFILE
#if defined (ENABLE_MEM_PROFILE) || defined (ENABLE_MEM_CHECK)
size += SIZEOF_LONG;
#endif /* ENABLE_MEM_PROFILE */
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
#ifdef ENABLE_MEM_CHECK
size += SIZEOF_LONG;
@@ -279,7 +296,7 @@ g_realloc (gpointer mem,
}
if (!p)
g_error ("could not reallocate %ld bytes", size);
g_error ("could not reallocate %lu bytes", (gulong) size);
#ifdef ENABLE_MEM_CHECK
@@ -381,7 +398,7 @@ g_mem_check (gpointer mem)
t = (gulong*) ((guchar*) mem - SIZEOF_LONG - SIZEOF_LONG);
if (*t >= 1)
g_warning ("mem: 0x%08x has been freed: %lu\n", (gulong) mem, *t);
g_warning ("mem: 0x%08x has been freed %lu times\n", (gulong) mem, *t);
#endif /* ENABLE_MEM_CHECK */
}