1998-06-11 01:21:14 +02:00
|
|
|
/* GLIB - Library of useful routines for C programming
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
1998-11-01 02:32:59 +01:00
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
/*
|
|
|
|
* MT safe
|
|
|
|
*/
|
|
|
|
|
1998-11-01 02:32:59 +01:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include <config.h>
|
|
|
|
#endif
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "glib.h"
|
|
|
|
|
|
|
|
/* #define ENABLE_MEM_PROFILE */
|
1998-08-19 05:59:20 +02:00
|
|
|
/* #define ENABLE_MEM_PROFILE_EXCLUDES_MEM_CHUNKS */
|
1998-06-11 01:21:14 +02:00
|
|
|
/* #define ENABLE_MEM_CHECK */
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
#define MEM_PROFILE_TABLE_SIZE 8192
|
1998-06-11 01:21:14 +02:00
|
|
|
|
1998-10-06 14:35:30 +02:00
|
|
|
/*
|
|
|
|
* 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().
|
|
|
|
*/
|
|
|
|
|
1998-08-19 05:59:20 +02:00
|
|
|
#if defined(ENABLE_MEM_PROFILE) && defined(ENABLE_MEM_PROFILE_EXCLUDES_MEM_CHUNKS)
|
1998-12-15 06:28:02 +01:00
|
|
|
#define ENTER_MEM_CHUNK_ROUTINE() \
|
|
|
|
g_static_set (allocating_for_mem_chunk, \
|
|
|
|
g_static_get (allocating_for_mem_chunk) + 1)
|
|
|
|
#define ENTER_MEM_CHUNK_ROUTINE() \
|
|
|
|
g_static_set (allocating_for_mem_chunk, \
|
|
|
|
g_static_get (allocating_for_mem_chunk) - 1)
|
1998-08-19 05:59:20 +02:00
|
|
|
#else
|
|
|
|
#define ENTER_MEM_CHUNK_ROUTINE()
|
|
|
|
#define LEAVE_MEM_CHUNK_ROUTINE()
|
|
|
|
#endif
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
|
|
|
|
#define MAX_MEM_AREA 65536L
|
|
|
|
#define MEM_AREA_SIZE 4L
|
|
|
|
|
|
|
|
#if SIZEOF_VOID_P > SIZEOF_LONG
|
|
|
|
#define MEM_ALIGN SIZEOF_VOID_P
|
|
|
|
#else
|
|
|
|
#define MEM_ALIGN SIZEOF_LONG
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct _GFreeAtom GFreeAtom;
|
|
|
|
typedef struct _GMemArea GMemArea;
|
|
|
|
typedef struct _GRealMemChunk GRealMemChunk;
|
|
|
|
|
|
|
|
struct _GFreeAtom
|
|
|
|
{
|
|
|
|
GFreeAtom *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct _GMemArea
|
|
|
|
{
|
|
|
|
GMemArea *next; /* the next mem area */
|
|
|
|
GMemArea *prev; /* the previous mem area */
|
|
|
|
gulong index; /* the current index into the "mem" array */
|
|
|
|
gulong free; /* the number of free bytes in this mem area */
|
|
|
|
gulong allocated; /* the number of atoms allocated from this area */
|
|
|
|
gulong mark; /* is this mem area marked for deletion */
|
|
|
|
gchar mem[MEM_AREA_SIZE]; /* the mem array from which atoms get allocated
|
|
|
|
* the actual size of this array is determined by
|
|
|
|
* the mem chunk "area_size". ANSI says that it
|
|
|
|
* must be declared to be the maximum size it
|
|
|
|
* can possibly be (even though the actual size
|
|
|
|
* may be less).
|
|
|
|
*/
|
|
|
|
};
|
|
|
|
|
|
|
|
struct _GRealMemChunk
|
|
|
|
{
|
|
|
|
gchar *name; /* name of this MemChunk...used for debugging output */
|
|
|
|
gint type; /* the type of MemChunk: ALLOC_ONLY or ALLOC_AND_FREE */
|
|
|
|
gint num_mem_areas; /* the number of memory areas */
|
|
|
|
gint num_marked_areas; /* the number of areas marked for deletion */
|
|
|
|
guint atom_size; /* the size of an atom */
|
|
|
|
gulong area_size; /* the size of a memory area */
|
|
|
|
GMemArea *mem_area; /* the current memory area */
|
|
|
|
GMemArea *mem_areas; /* a list of all the mem areas owned by this chunk */
|
|
|
|
GMemArea *free_mem_area; /* the free area...which is about to be destroyed */
|
|
|
|
GFreeAtom *free_atoms; /* the free atoms list */
|
|
|
|
GTree *mem_tree; /* tree of mem areas sorted by memory address */
|
|
|
|
GRealMemChunk *next; /* pointer to the next chunk */
|
|
|
|
GRealMemChunk *prev; /* pointer to the previous chunk */
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static gulong g_mem_chunk_compute_size (gulong size);
|
|
|
|
static gint g_mem_chunk_area_compare (GMemArea *a,
|
|
|
|
GMemArea *b);
|
|
|
|
static gint g_mem_chunk_area_search (GMemArea *a,
|
|
|
|
gchar *addr);
|
|
|
|
|
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
/* here we can't use StaticMutexes, as they depend upon a working
|
|
|
|
* g_malloc, the same holds true for StaticPrivate */
|
|
|
|
static GMutex* mem_chunks_lock = NULL;
|
1998-06-11 01:21:14 +02:00
|
|
|
static GRealMemChunk *mem_chunks = NULL;
|
|
|
|
|
|
|
|
#ifdef ENABLE_MEM_PROFILE
|
1998-12-15 06:28:02 +01:00
|
|
|
static GMutex* mem_profile_lock;
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
static gulong allocations[MEM_PROFILE_TABLE_SIZE] = { 0 };
|
1998-06-11 01:21:14 +02:00
|
|
|
static gulong allocated_mem = 0;
|
|
|
|
static gulong freed_mem = 0;
|
1998-12-15 06:28:02 +01:00
|
|
|
static GPrivate* allocating_for_mem_chunk = NULL;
|
|
|
|
#define IS_IN_MEM_CHUNK_ROUTINE() \
|
|
|
|
GPOINTER_TO_UINT (g_static_get (allocating_for_mem_chunk))
|
1998-06-11 01:21:14 +02:00
|
|
|
#endif /* ENABLE_MEM_PROFILE */
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef USE_DMALLOC
|
|
|
|
|
|
|
|
gpointer
|
|
|
|
g_malloc (gulong size)
|
|
|
|
{
|
|
|
|
gpointer p;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
|
|
|
|
gulong *t;
|
|
|
|
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (size == 0)
|
|
|
|
return NULL;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
|
|
|
|
size += SIZEOF_LONG;
|
|
|
|
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#ifdef ENABLE_MEM_CHECK
|
|
|
|
size += SIZEOF_LONG;
|
|
|
|
#endif /* ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
p = (gpointer) malloc (size);
|
|
|
|
if (!p)
|
|
|
|
g_error ("could not allocate %ld bytes", size);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#ifdef ENABLE_MEM_CHECK
|
|
|
|
size -= SIZEOF_LONG;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
t = p;
|
|
|
|
p = ((guchar*) p + SIZEOF_LONG);
|
|
|
|
*t = 0;
|
|
|
|
#endif /* ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
|
|
|
|
size -= SIZEOF_LONG;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
t = p;
|
|
|
|
p = ((guchar*) p + SIZEOF_LONG);
|
|
|
|
*t = size;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#ifdef ENABLE_MEM_PROFILE
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_lock (mem_profile_lock);
|
1998-10-06 14:35:30 +02:00
|
|
|
# ifdef ENABLE_MEM_PROFILE_EXCLUDES_MEM_CHUNKS
|
1998-12-15 06:28:02 +01:00
|
|
|
if(!IS_IN_MEM_CHUNK_ROUTINE()) {
|
1998-10-06 14:35:30 +02:00
|
|
|
# endif
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
if (size <= MEM_PROFILE_TABLE_SIZE - 1)
|
1998-08-19 05:59:20 +02:00
|
|
|
allocations[size-1] += 1;
|
|
|
|
else
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
allocations[MEM_PROFILE_TABLE_SIZE - 1] += 1;
|
1998-08-19 05:59:20 +02:00
|
|
|
allocated_mem += size;
|
1998-10-06 14:35:30 +02:00
|
|
|
# ifdef ENABLE_MEM_PROFILE_EXCLUDES_MEM_CHUNKS
|
1998-08-19 05:59:20 +02:00
|
|
|
}
|
1998-10-06 14:35:30 +02:00
|
|
|
# endif
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_unlock (mem_profile_lock);
|
1998-06-11 01:21:14 +02:00
|
|
|
#endif /* ENABLE_MEM_PROFILE */
|
|
|
|
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
gpointer
|
|
|
|
g_malloc0 (gulong size)
|
|
|
|
{
|
|
|
|
gpointer p;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
|
|
|
|
gulong *t;
|
|
|
|
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (size == 0)
|
|
|
|
return NULL;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-10-06 14:35:30 +02:00
|
|
|
#if defined (ENABLE_MEM_PROFILE) || defined (ENABLE_MEM_CHECK)
|
1998-06-11 01:21:14 +02:00
|
|
|
size += SIZEOF_LONG;
|
1998-10-06 14:35:30 +02:00
|
|
|
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#ifdef ENABLE_MEM_CHECK
|
|
|
|
size += SIZEOF_LONG;
|
|
|
|
#endif /* ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
p = (gpointer) calloc (size, 1);
|
|
|
|
if (!p)
|
|
|
|
g_error ("could not allocate %ld bytes", size);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#ifdef ENABLE_MEM_CHECK
|
|
|
|
size -= SIZEOF_LONG;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
t = p;
|
|
|
|
p = ((guchar*) p + SIZEOF_LONG);
|
|
|
|
*t = 0;
|
|
|
|
#endif /* ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
|
|
|
|
size -= SIZEOF_LONG;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
t = p;
|
|
|
|
p = ((guchar*) p + SIZEOF_LONG);
|
|
|
|
*t = size;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-10-06 14:35:30 +02:00
|
|
|
# ifdef ENABLE_MEM_PROFILE
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_lock (mem_profile_lock);
|
1998-10-06 14:35:30 +02:00
|
|
|
# ifdef ENABLE_MEM_PROFILE_EXCLUDES_MEM_CHUNKS
|
1998-12-15 06:28:02 +01:00
|
|
|
if(!IS_IN_MEM_CHUNK_ROUTINE()) {
|
1998-10-06 14:35:30 +02:00
|
|
|
# endif
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
if (size <= (MEM_PROFILE_TABLE_SIZE - 1))
|
1998-08-19 05:59:20 +02:00
|
|
|
allocations[size-1] += 1;
|
|
|
|
else
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
allocations[MEM_PROFILE_TABLE_SIZE - 1] += 1;
|
1998-08-19 05:59:20 +02:00
|
|
|
allocated_mem += size;
|
1998-10-06 14:35:30 +02:00
|
|
|
# ifdef ENABLE_MEM_PROFILE_EXCLUDES_MEM_CHUNKS
|
1998-08-19 05:59:20 +02:00
|
|
|
}
|
1998-10-06 14:35:30 +02:00
|
|
|
# endif
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_unlock (mem_profile_lock);
|
1998-10-06 14:35:30 +02:00
|
|
|
# endif /* ENABLE_MEM_PROFILE */
|
1998-12-15 06:28:02 +01:00
|
|
|
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
gpointer
|
|
|
|
g_realloc (gpointer mem,
|
|
|
|
gulong size)
|
|
|
|
{
|
|
|
|
gpointer p;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
|
|
|
|
gulong *t;
|
|
|
|
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (size == 0)
|
|
|
|
return NULL;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
|
|
|
|
size += SIZEOF_LONG;
|
|
|
|
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#ifdef ENABLE_MEM_CHECK
|
|
|
|
size += SIZEOF_LONG;
|
|
|
|
#endif /* ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (!mem)
|
|
|
|
p = (gpointer) malloc (size);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
|
|
|
|
t = (gulong*) ((guchar*) mem - SIZEOF_LONG);
|
|
|
|
#ifdef ENABLE_MEM_PROFILE
|
1998-12-17 09:02:38 +01:00
|
|
|
g_mutex_lock (mem_profile_lock);
|
1998-06-11 01:21:14 +02:00
|
|
|
freed_mem += *t;
|
1998-12-17 09:02:38 +01:00
|
|
|
g_mutex_unlock (mem_profile_lock);
|
1998-06-11 01:21:14 +02:00
|
|
|
#endif /* ENABLE_MEM_PROFILE */
|
|
|
|
mem = t;
|
|
|
|
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#ifdef ENABLE_MEM_CHECK
|
|
|
|
t = (gulong*) ((guchar*) mem - SIZEOF_LONG);
|
|
|
|
if (*t >= 1)
|
|
|
|
g_warning ("trying to realloc freed memory\n");
|
|
|
|
mem = t;
|
|
|
|
#endif /* ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
p = (gpointer) realloc (mem, size);
|
|
|
|
}
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (!p)
|
1998-10-06 14:35:30 +02:00
|
|
|
g_error ("could not reallocate %lu bytes", (gulong) size);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#ifdef ENABLE_MEM_CHECK
|
|
|
|
size -= SIZEOF_LONG;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
t = p;
|
|
|
|
p = ((guchar*) p + SIZEOF_LONG);
|
|
|
|
*t = 0;
|
|
|
|
#endif /* ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
|
|
|
|
size -= SIZEOF_LONG;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
t = p;
|
|
|
|
p = ((guchar*) p + SIZEOF_LONG);
|
|
|
|
*t = size;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#ifdef ENABLE_MEM_PROFILE
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_lock (mem_profile_lock);
|
1998-08-19 05:59:20 +02:00
|
|
|
#ifdef ENABLE_MEM_PROFILE_EXCLUDES_MEM_CHUNKS
|
1998-12-15 06:28:02 +01:00
|
|
|
if(!IS_IN_MEM_CHUNK_ROUTINE()) {
|
1998-08-19 05:59:20 +02:00
|
|
|
#endif
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
if (size <= (MEM_PROFILE_TABLE_SIZE - 1))
|
1998-08-19 05:59:20 +02:00
|
|
|
allocations[size-1] += 1;
|
|
|
|
else
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
allocations[MEM_PROFILE_TABLE_SIZE - 1] += 1;
|
1998-08-19 05:59:20 +02:00
|
|
|
allocated_mem += size;
|
|
|
|
#ifdef ENABLE_MEM_PROFILE_EXCLUDES_MEM_CHUNKS
|
|
|
|
}
|
|
|
|
#endif
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_unlock (mem_profile_lock);
|
1998-06-11 01:21:14 +02:00
|
|
|
#endif /* ENABLE_MEM_PROFILE */
|
|
|
|
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_free (gpointer mem)
|
|
|
|
{
|
|
|
|
if (mem)
|
|
|
|
{
|
|
|
|
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
|
|
|
|
gulong *t;
|
|
|
|
gulong size;
|
|
|
|
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
|
|
|
|
t = (gulong*) ((guchar*) mem - SIZEOF_LONG);
|
|
|
|
size = *t;
|
1998-12-15 06:28:02 +01:00
|
|
|
#ifdef ENABLE_MEM_PROFILE
|
1998-12-17 09:02:38 +01:00
|
|
|
g_mutex_lock (mem_profile_lock);
|
1998-06-11 01:21:14 +02:00
|
|
|
freed_mem += size;
|
1998-12-17 09:02:38 +01:00
|
|
|
g_mutex_unlock (mem_profile_lock);
|
1998-06-11 01:21:14 +02:00
|
|
|
#endif /* ENABLE_MEM_PROFILE */
|
|
|
|
mem = t;
|
|
|
|
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
#ifdef ENABLE_MEM_CHECK
|
|
|
|
t = (gulong*) ((guchar*) mem - SIZEOF_LONG);
|
|
|
|
if (*t >= 1)
|
|
|
|
g_warning ("freeing previously freed memory\n");
|
|
|
|
*t += 1;
|
|
|
|
mem = t;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
memset ((guchar*) mem + 8, 0, size);
|
|
|
|
#else /* ENABLE_MEM_CHECK */
|
|
|
|
free (mem);
|
|
|
|
#endif /* ENABLE_MEM_CHECK */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* ! USE_DMALLOC */
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
g_mem_profile (void)
|
|
|
|
{
|
|
|
|
#ifdef ENABLE_MEM_PROFILE
|
|
|
|
gint i;
|
1998-12-15 06:28:02 +01:00
|
|
|
gulong local_allocations[MEM_PROFILE_TABLE_SIZE];
|
|
|
|
gulong local_allocated_mem;
|
|
|
|
gulong local_freed_mem;
|
|
|
|
|
1998-12-17 09:02:38 +01:00
|
|
|
g_mutex_lock (mem_profile_lock);
|
1998-12-15 06:28:02 +01:00
|
|
|
for (i = 0; i < (MEM_PROFILE_TABLE_SIZE - 1); i++)
|
|
|
|
local_allocations[i] = allocations[i];
|
|
|
|
local_allocated_mem = allocated_mem;
|
|
|
|
local_freed_mem = freed_mem;
|
1998-12-17 09:02:38 +01:00
|
|
|
g_mutex_unlock (mem_profile_lock);
|
1998-12-15 06:28:02 +01:00
|
|
|
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
for (i = 0; i < (MEM_PROFILE_TABLE_SIZE - 1); i++)
|
1998-12-15 06:28:02 +01:00
|
|
|
if (local_allocations[i] > 0)
|
1998-08-18 05:50:35 +02:00
|
|
|
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO,
|
1998-12-15 06:28:02 +01:00
|
|
|
"%lu allocations of %d bytes\n", local_allocations[i], i + 1);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
if (local_allocations[MEM_PROFILE_TABLE_SIZE - 1] > 0)
|
1998-08-18 05:50:35 +02:00
|
|
|
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO,
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
"%lu allocations of greater than %d bytes\n",
|
1998-12-15 06:28:02 +01:00
|
|
|
local_allocations[MEM_PROFILE_TABLE_SIZE - 1], MEM_PROFILE_TABLE_SIZE - 1);
|
|
|
|
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, "%lu bytes allocated\n", local_allocated_mem);
|
|
|
|
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, "%lu bytes freed\n", local_freed_mem);
|
|
|
|
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, "%lu bytes in use\n", local_allocated_mem - local_freed_mem);
|
1998-06-11 01:21:14 +02:00
|
|
|
#endif /* ENABLE_MEM_PROFILE */
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_mem_check (gpointer mem)
|
|
|
|
{
|
|
|
|
#ifdef ENABLE_MEM_CHECK
|
|
|
|
gulong *t;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
t = (gulong*) ((guchar*) mem - SIZEOF_LONG - SIZEOF_LONG);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (*t >= 1)
|
1998-10-06 14:35:30 +02:00
|
|
|
g_warning ("mem: 0x%08x has been freed %lu times\n", (gulong) mem, *t);
|
1998-06-11 01:21:14 +02:00
|
|
|
#endif /* ENABLE_MEM_CHECK */
|
|
|
|
}
|
|
|
|
|
|
|
|
GMemChunk*
|
|
|
|
g_mem_chunk_new (gchar *name,
|
|
|
|
gint atom_size,
|
|
|
|
gulong area_size,
|
|
|
|
gint type)
|
|
|
|
{
|
|
|
|
GRealMemChunk *mem_chunk;
|
|
|
|
gulong rarea_size;
|
1998-08-19 05:59:20 +02:00
|
|
|
|
|
|
|
ENTER_MEM_CHUNK_ROUTINE();
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
mem_chunk = g_new (struct _GRealMemChunk, 1);
|
|
|
|
mem_chunk->name = name;
|
|
|
|
mem_chunk->type = type;
|
|
|
|
mem_chunk->num_mem_areas = 0;
|
|
|
|
mem_chunk->num_marked_areas = 0;
|
|
|
|
mem_chunk->mem_area = NULL;
|
|
|
|
mem_chunk->free_mem_area = NULL;
|
|
|
|
mem_chunk->free_atoms = NULL;
|
|
|
|
mem_chunk->mem_tree = NULL;
|
|
|
|
mem_chunk->mem_areas = NULL;
|
|
|
|
mem_chunk->atom_size = atom_size;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (mem_chunk->type == G_ALLOC_AND_FREE)
|
|
|
|
mem_chunk->mem_tree = g_tree_new ((GCompareFunc) g_mem_chunk_area_compare);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (mem_chunk->atom_size % MEM_ALIGN)
|
|
|
|
mem_chunk->atom_size += MEM_ALIGN - (mem_chunk->atom_size % MEM_ALIGN);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
mem_chunk->area_size = area_size;
|
|
|
|
if (mem_chunk->area_size > MAX_MEM_AREA)
|
|
|
|
mem_chunk->area_size = MAX_MEM_AREA;
|
|
|
|
while (mem_chunk->area_size < mem_chunk->atom_size)
|
|
|
|
mem_chunk->area_size *= 2;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
rarea_size = mem_chunk->area_size + sizeof (GMemArea) - MEM_AREA_SIZE;
|
|
|
|
rarea_size = g_mem_chunk_compute_size (rarea_size);
|
|
|
|
mem_chunk->area_size = rarea_size - (sizeof (GMemArea) - MEM_AREA_SIZE);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
/*
|
1998-08-18 05:50:35 +02:00
|
|
|
mem_chunk->area_size -= (sizeof (GMemArea) - MEM_AREA_SIZE);
|
|
|
|
if (mem_chunk->area_size < mem_chunk->atom_size)
|
1998-06-11 01:21:14 +02:00
|
|
|
{
|
1998-08-18 05:50:35 +02:00
|
|
|
mem_chunk->area_size = (mem_chunk->area_size + sizeof (GMemArea) - MEM_AREA_SIZE) * 2;
|
|
|
|
mem_chunk->area_size -= (sizeof (GMemArea) - MEM_AREA_SIZE);
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
if (mem_chunk->area_size % mem_chunk->atom_size)
|
1998-06-11 01:21:14 +02:00
|
|
|
mem_chunk->area_size += mem_chunk->atom_size - (mem_chunk->area_size % mem_chunk->atom_size);
|
1998-08-18 05:50:35 +02:00
|
|
|
*/
|
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_lock (mem_chunks_lock);
|
1998-06-11 01:21:14 +02:00
|
|
|
mem_chunk->next = mem_chunks;
|
|
|
|
mem_chunk->prev = NULL;
|
|
|
|
if (mem_chunks)
|
|
|
|
mem_chunks->prev = mem_chunk;
|
|
|
|
mem_chunks = mem_chunk;
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_unlock (mem_chunks_lock);
|
1998-08-19 05:59:20 +02:00
|
|
|
|
|
|
|
LEAVE_MEM_CHUNK_ROUTINE();
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
return ((GMemChunk*) mem_chunk);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_mem_chunk_destroy (GMemChunk *mem_chunk)
|
|
|
|
{
|
|
|
|
GRealMemChunk *rmem_chunk;
|
|
|
|
GMemArea *mem_areas;
|
|
|
|
GMemArea *temp_area;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
g_assert (mem_chunk != NULL);
|
1998-08-19 05:59:20 +02:00
|
|
|
|
|
|
|
ENTER_MEM_CHUNK_ROUTINE();
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
rmem_chunk = (GRealMemChunk*) mem_chunk;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
mem_areas = rmem_chunk->mem_areas;
|
|
|
|
while (mem_areas)
|
|
|
|
{
|
|
|
|
temp_area = mem_areas;
|
|
|
|
mem_areas = mem_areas->next;
|
|
|
|
g_free (temp_area);
|
|
|
|
}
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (rmem_chunk->next)
|
|
|
|
rmem_chunk->next->prev = rmem_chunk->prev;
|
|
|
|
if (rmem_chunk->prev)
|
|
|
|
rmem_chunk->prev->next = rmem_chunk->next;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_lock (mem_chunks_lock);
|
1998-06-11 01:21:14 +02:00
|
|
|
if (rmem_chunk == mem_chunks)
|
|
|
|
mem_chunks = mem_chunks->next;
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_unlock (mem_chunks_lock);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (rmem_chunk->type == G_ALLOC_AND_FREE)
|
|
|
|
g_tree_destroy (rmem_chunk->mem_tree);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
g_free (rmem_chunk);
|
1998-08-19 05:59:20 +02:00
|
|
|
|
|
|
|
LEAVE_MEM_CHUNK_ROUTINE();
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
gpointer
|
|
|
|
g_mem_chunk_alloc (GMemChunk *mem_chunk)
|
|
|
|
{
|
|
|
|
GRealMemChunk *rmem_chunk;
|
|
|
|
GMemArea *temp_area;
|
|
|
|
gpointer mem;
|
1998-08-19 05:59:20 +02:00
|
|
|
|
|
|
|
ENTER_MEM_CHUNK_ROUTINE();
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
g_assert (mem_chunk != NULL);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
rmem_chunk = (GRealMemChunk*) mem_chunk;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
while (rmem_chunk->free_atoms)
|
|
|
|
{
|
|
|
|
/* Get the first piece of memory on the "free_atoms" list.
|
|
|
|
* We can go ahead and destroy the list node we used to keep
|
|
|
|
* track of it with and to update the "free_atoms" list to
|
|
|
|
* point to its next element.
|
|
|
|
*/
|
|
|
|
mem = rmem_chunk->free_atoms;
|
|
|
|
rmem_chunk->free_atoms = rmem_chunk->free_atoms->next;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
/* Determine which area this piece of memory is allocated from */
|
|
|
|
temp_area = g_tree_search (rmem_chunk->mem_tree,
|
|
|
|
(GSearchFunc) g_mem_chunk_area_search,
|
|
|
|
mem);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
/* If the area has been marked, then it is being destroyed.
|
|
|
|
* (ie marked to be destroyed).
|
|
|
|
* We check to see if all of the segments on the free list that
|
|
|
|
* reference this area have been removed. This occurs when
|
|
|
|
* the ammount of free memory is less than the allocatable size.
|
|
|
|
* If the chunk should be freed, then we place it in the "free_mem_area".
|
|
|
|
* This is so we make sure not to free the mem area here and then
|
|
|
|
* allocate it again a few lines down.
|
|
|
|
* If we don't allocate a chunk a few lines down then the "free_mem_area"
|
|
|
|
* will be freed.
|
|
|
|
* If there is already a "free_mem_area" then we'll just free this mem area.
|
|
|
|
*/
|
|
|
|
if (temp_area->mark)
|
|
|
|
{
|
|
|
|
/* Update the "free" memory available in that area */
|
|
|
|
temp_area->free += rmem_chunk->atom_size;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (temp_area->free == rmem_chunk->area_size)
|
|
|
|
{
|
|
|
|
if (temp_area == rmem_chunk->mem_area)
|
|
|
|
rmem_chunk->mem_area = NULL;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (rmem_chunk->free_mem_area)
|
|
|
|
{
|
|
|
|
rmem_chunk->num_mem_areas -= 1;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (temp_area->next)
|
|
|
|
temp_area->next->prev = temp_area->prev;
|
|
|
|
if (temp_area->prev)
|
|
|
|
temp_area->prev->next = temp_area->next;
|
|
|
|
if (temp_area == rmem_chunk->mem_areas)
|
|
|
|
rmem_chunk->mem_areas = rmem_chunk->mem_areas->next;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (rmem_chunk->type == G_ALLOC_AND_FREE)
|
|
|
|
g_tree_remove (rmem_chunk->mem_tree, temp_area);
|
|
|
|
g_free (temp_area);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
rmem_chunk->free_mem_area = temp_area;
|
|
|
|
|
|
|
|
rmem_chunk->num_marked_areas -= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Update the number of allocated atoms count.
|
|
|
|
*/
|
|
|
|
temp_area->allocated += 1;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
/* The area wasn't marked...return the memory
|
|
|
|
*/
|
|
|
|
goto outa_here;
|
|
|
|
}
|
|
|
|
}
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
/* If there isn't a current mem area or the current mem area is out of space
|
|
|
|
* then allocate a new mem area. We'll first check and see if we can use
|
|
|
|
* the "free_mem_area". Otherwise we'll just malloc the mem area.
|
|
|
|
*/
|
|
|
|
if ((!rmem_chunk->mem_area) ||
|
|
|
|
((rmem_chunk->mem_area->index + rmem_chunk->atom_size) > rmem_chunk->area_size))
|
|
|
|
{
|
|
|
|
if (rmem_chunk->free_mem_area)
|
|
|
|
{
|
|
|
|
rmem_chunk->mem_area = rmem_chunk->free_mem_area;
|
|
|
|
rmem_chunk->free_mem_area = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
rmem_chunk->mem_area = (GMemArea*) g_malloc (sizeof (GMemArea) -
|
|
|
|
MEM_AREA_SIZE +
|
|
|
|
rmem_chunk->area_size);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
rmem_chunk->num_mem_areas += 1;
|
|
|
|
rmem_chunk->mem_area->next = rmem_chunk->mem_areas;
|
|
|
|
rmem_chunk->mem_area->prev = NULL;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (rmem_chunk->mem_areas)
|
|
|
|
rmem_chunk->mem_areas->prev = rmem_chunk->mem_area;
|
|
|
|
rmem_chunk->mem_areas = rmem_chunk->mem_area;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (rmem_chunk->type == G_ALLOC_AND_FREE)
|
|
|
|
g_tree_insert (rmem_chunk->mem_tree, rmem_chunk->mem_area, rmem_chunk->mem_area);
|
|
|
|
}
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
rmem_chunk->mem_area->index = 0;
|
|
|
|
rmem_chunk->mem_area->free = rmem_chunk->area_size;
|
|
|
|
rmem_chunk->mem_area->allocated = 0;
|
|
|
|
rmem_chunk->mem_area->mark = 0;
|
|
|
|
}
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
/* Get the memory and modify the state variables appropriately.
|
|
|
|
*/
|
|
|
|
mem = (gpointer) &rmem_chunk->mem_area->mem[rmem_chunk->mem_area->index];
|
|
|
|
rmem_chunk->mem_area->index += rmem_chunk->atom_size;
|
|
|
|
rmem_chunk->mem_area->free -= rmem_chunk->atom_size;
|
|
|
|
rmem_chunk->mem_area->allocated += 1;
|
1998-08-19 05:59:20 +02:00
|
|
|
|
|
|
|
outa_here:
|
|
|
|
|
|
|
|
LEAVE_MEM_CHUNK_ROUTINE();
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
return mem;
|
|
|
|
}
|
|
|
|
|
1998-09-05 08:53:43 +02:00
|
|
|
gpointer
|
|
|
|
g_mem_chunk_alloc0 (GMemChunk *mem_chunk)
|
|
|
|
{
|
|
|
|
gpointer mem;
|
|
|
|
|
|
|
|
mem = g_mem_chunk_alloc (mem_chunk);
|
|
|
|
if (mem)
|
|
|
|
{
|
|
|
|
GRealMemChunk *rmem_chunk = (GRealMemChunk*) mem_chunk;
|
|
|
|
|
|
|
|
memset (mem, 0, rmem_chunk->atom_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
return mem;
|
|
|
|
}
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
void
|
|
|
|
g_mem_chunk_free (GMemChunk *mem_chunk,
|
|
|
|
gpointer mem)
|
|
|
|
{
|
|
|
|
GRealMemChunk *rmem_chunk;
|
|
|
|
GMemArea *temp_area;
|
|
|
|
GFreeAtom *free_atom;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
g_assert (mem_chunk != NULL);
|
|
|
|
g_assert (mem != NULL);
|
1998-08-19 05:59:20 +02:00
|
|
|
|
|
|
|
ENTER_MEM_CHUNK_ROUTINE();
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
rmem_chunk = (GRealMemChunk*) mem_chunk;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
/* Don't do anything if this is an ALLOC_ONLY chunk
|
|
|
|
*/
|
|
|
|
if (rmem_chunk->type == G_ALLOC_AND_FREE)
|
|
|
|
{
|
|
|
|
/* Place the memory on the "free_atoms" list
|
|
|
|
*/
|
|
|
|
free_atom = (GFreeAtom*) mem;
|
|
|
|
free_atom->next = rmem_chunk->free_atoms;
|
|
|
|
rmem_chunk->free_atoms = free_atom;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
temp_area = g_tree_search (rmem_chunk->mem_tree,
|
|
|
|
(GSearchFunc) g_mem_chunk_area_search,
|
|
|
|
mem);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
temp_area->allocated -= 1;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (temp_area->allocated == 0)
|
|
|
|
{
|
|
|
|
temp_area->mark = 1;
|
|
|
|
rmem_chunk->num_marked_areas += 1;
|
|
|
|
}
|
|
|
|
}
|
1998-08-19 05:59:20 +02:00
|
|
|
|
|
|
|
LEAVE_MEM_CHUNK_ROUTINE();
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This doesn't free the free_area if there is one */
|
|
|
|
void
|
|
|
|
g_mem_chunk_clean (GMemChunk *mem_chunk)
|
|
|
|
{
|
|
|
|
GRealMemChunk *rmem_chunk;
|
|
|
|
GMemArea *mem_area;
|
|
|
|
GFreeAtom *prev_free_atom;
|
|
|
|
GFreeAtom *temp_free_atom;
|
|
|
|
gpointer mem;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
g_assert (mem_chunk != NULL);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
rmem_chunk = (GRealMemChunk*) mem_chunk;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (rmem_chunk->type == G_ALLOC_AND_FREE)
|
|
|
|
{
|
|
|
|
prev_free_atom = NULL;
|
|
|
|
temp_free_atom = rmem_chunk->free_atoms;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
while (temp_free_atom)
|
|
|
|
{
|
|
|
|
mem = (gpointer) temp_free_atom;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
mem_area = g_tree_search (rmem_chunk->mem_tree,
|
|
|
|
(GSearchFunc) g_mem_chunk_area_search,
|
|
|
|
mem);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
/* If this mem area is marked for destruction then delete the
|
|
|
|
* area and list node and decrement the free mem.
|
|
|
|
*/
|
|
|
|
if (mem_area->mark)
|
|
|
|
{
|
|
|
|
if (prev_free_atom)
|
|
|
|
prev_free_atom->next = temp_free_atom->next;
|
|
|
|
else
|
|
|
|
rmem_chunk->free_atoms = temp_free_atom->next;
|
|
|
|
temp_free_atom = temp_free_atom->next;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
mem_area->free += rmem_chunk->atom_size;
|
|
|
|
if (mem_area->free == rmem_chunk->area_size)
|
|
|
|
{
|
|
|
|
rmem_chunk->num_mem_areas -= 1;
|
|
|
|
rmem_chunk->num_marked_areas -= 1;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (mem_area->next)
|
|
|
|
mem_area->next->prev = mem_area->prev;
|
|
|
|
if (mem_area->prev)
|
|
|
|
mem_area->prev->next = mem_area->next;
|
|
|
|
if (mem_area == rmem_chunk->mem_areas)
|
|
|
|
rmem_chunk->mem_areas = rmem_chunk->mem_areas->next;
|
|
|
|
if (mem_area == rmem_chunk->mem_area)
|
|
|
|
rmem_chunk->mem_area = NULL;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (rmem_chunk->type == G_ALLOC_AND_FREE)
|
|
|
|
g_tree_remove (rmem_chunk->mem_tree, mem_area);
|
|
|
|
g_free (mem_area);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
prev_free_atom = temp_free_atom;
|
|
|
|
temp_free_atom = temp_free_atom->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_mem_chunk_reset (GMemChunk *mem_chunk)
|
|
|
|
{
|
|
|
|
GRealMemChunk *rmem_chunk;
|
|
|
|
GMemArea *mem_areas;
|
|
|
|
GMemArea *temp_area;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
g_assert (mem_chunk != NULL);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
rmem_chunk = (GRealMemChunk*) mem_chunk;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
mem_areas = rmem_chunk->mem_areas;
|
|
|
|
rmem_chunk->num_mem_areas = 0;
|
|
|
|
rmem_chunk->mem_areas = NULL;
|
|
|
|
rmem_chunk->mem_area = NULL;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
while (mem_areas)
|
|
|
|
{
|
|
|
|
temp_area = mem_areas;
|
|
|
|
mem_areas = mem_areas->next;
|
|
|
|
g_free (temp_area);
|
|
|
|
}
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
rmem_chunk->free_atoms = NULL;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if (rmem_chunk->mem_tree)
|
|
|
|
g_tree_destroy (rmem_chunk->mem_tree);
|
|
|
|
rmem_chunk->mem_tree = g_tree_new ((GCompareFunc) g_mem_chunk_area_compare);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_mem_chunk_print (GMemChunk *mem_chunk)
|
|
|
|
{
|
|
|
|
GRealMemChunk *rmem_chunk;
|
|
|
|
GMemArea *mem_areas;
|
|
|
|
gulong mem;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
g_assert (mem_chunk != NULL);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
rmem_chunk = (GRealMemChunk*) mem_chunk;
|
|
|
|
mem_areas = rmem_chunk->mem_areas;
|
|
|
|
mem = 0;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
while (mem_areas)
|
|
|
|
{
|
|
|
|
mem += rmem_chunk->area_size - mem_areas->free;
|
|
|
|
mem_areas = mem_areas->next;
|
|
|
|
}
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO,
|
|
|
|
"%s: %ld bytes using %d mem areas\n",
|
|
|
|
rmem_chunk->name, mem, rmem_chunk->num_mem_areas);
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_mem_chunk_info (void)
|
|
|
|
{
|
|
|
|
GRealMemChunk *mem_chunk;
|
|
|
|
gint count;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
count = 0;
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_lock (mem_chunks_lock);
|
1998-06-11 01:21:14 +02:00
|
|
|
mem_chunk = mem_chunks;
|
|
|
|
while (mem_chunk)
|
|
|
|
{
|
|
|
|
count += 1;
|
|
|
|
mem_chunk = mem_chunk->next;
|
|
|
|
}
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_unlock (mem_chunks_lock);
|
1998-08-18 05:50:35 +02:00
|
|
|
|
|
|
|
g_log (g_log_domain_glib, G_LOG_LEVEL_INFO, "%d mem chunks\n", count);
|
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_lock (mem_chunks_lock);
|
1998-06-11 01:21:14 +02:00
|
|
|
mem_chunk = mem_chunks;
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_unlock (mem_chunks_lock);
|
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
while (mem_chunk)
|
|
|
|
{
|
|
|
|
g_mem_chunk_print ((GMemChunk*) mem_chunk);
|
|
|
|
mem_chunk = mem_chunk->next;
|
1998-12-15 06:28:02 +01:00
|
|
|
}
|
1998-06-11 01:21:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_blow_chunks (void)
|
|
|
|
{
|
|
|
|
GRealMemChunk *mem_chunk;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_lock (mem_chunks_lock);
|
1998-06-11 01:21:14 +02:00
|
|
|
mem_chunk = mem_chunks;
|
1998-12-15 06:28:02 +01:00
|
|
|
g_mutex_unlock (mem_chunks_lock);
|
1998-06-11 01:21:14 +02:00
|
|
|
while (mem_chunk)
|
|
|
|
{
|
|
|
|
g_mem_chunk_clean ((GMemChunk*) mem_chunk);
|
|
|
|
mem_chunk = mem_chunk->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static gulong
|
|
|
|
g_mem_chunk_compute_size (gulong size)
|
|
|
|
{
|
|
|
|
gulong power_of_2;
|
|
|
|
gulong lower, upper;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
power_of_2 = 16;
|
|
|
|
while (power_of_2 < size)
|
|
|
|
power_of_2 <<= 1;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
lower = power_of_2 >> 1;
|
|
|
|
upper = power_of_2;
|
1998-08-18 05:50:35 +02:00
|
|
|
|
1998-06-11 01:21:14 +02:00
|
|
|
if ((size - lower) < (upper - size))
|
|
|
|
return lower;
|
|
|
|
return upper;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
g_mem_chunk_area_compare (GMemArea *a,
|
|
|
|
GMemArea *b)
|
|
|
|
{
|
|
|
|
return (a->mem - b->mem);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
g_mem_chunk_area_search (GMemArea *a,
|
|
|
|
gchar *addr)
|
|
|
|
{
|
|
|
|
if (a->mem <= addr)
|
|
|
|
{
|
|
|
|
if (addr < &a->mem[a->index])
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
1998-11-24 13:18:22 +01:00
|
|
|
|
|
|
|
/* generic allocators
|
|
|
|
*/
|
|
|
|
struct _GAllocator /* from gmem.c */
|
|
|
|
{
|
|
|
|
gchar *name;
|
|
|
|
guint16 n_preallocs;
|
|
|
|
guint is_unused : 1;
|
|
|
|
guint type : 4;
|
|
|
|
GAllocator *last;
|
|
|
|
GMemChunk *mem_chunk;
|
|
|
|
gpointer dummy; /* implementation specific */
|
|
|
|
};
|
|
|
|
|
|
|
|
GAllocator*
|
|
|
|
g_allocator_new (const gchar *name,
|
|
|
|
guint n_preallocs)
|
|
|
|
{
|
|
|
|
GAllocator *allocator;
|
|
|
|
|
|
|
|
g_return_val_if_fail (name != NULL, NULL);
|
|
|
|
|
|
|
|
allocator = g_new0 (GAllocator, 1);
|
|
|
|
allocator->name = g_strdup (name);
|
|
|
|
allocator->n_preallocs = CLAMP (n_preallocs, 1, 65535);
|
|
|
|
allocator->is_unused = TRUE;
|
|
|
|
allocator->type = 0;
|
|
|
|
allocator->last = NULL;
|
|
|
|
allocator->mem_chunk = NULL;
|
|
|
|
allocator->dummy = NULL;
|
|
|
|
|
|
|
|
return allocator;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_allocator_free (GAllocator *allocator)
|
|
|
|
{
|
|
|
|
g_return_if_fail (allocator != NULL);
|
|
|
|
g_return_if_fail (allocator->is_unused == TRUE);
|
|
|
|
|
|
|
|
g_free (allocator->name);
|
|
|
|
if (allocator->mem_chunk)
|
|
|
|
g_mem_chunk_destroy (allocator->mem_chunk);
|
|
|
|
|
|
|
|
g_free (allocator);
|
|
|
|
}
|
1998-12-15 06:28:02 +01:00
|
|
|
|
|
|
|
void
|
|
|
|
g_mem_init (void)
|
|
|
|
{
|
|
|
|
mem_chunks_lock = g_mutex_new();
|
|
|
|
#ifdef ENABLE_MEM_PROFILE
|
|
|
|
mem_profile_lock = g_mutex_new();
|
|
|
|
allocating_for_mem_chunk = g_private_new(NULL);
|
|
|
|
#endif
|
|
|
|
}
|