/*
- * Copyright (c) 1995-2004, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: nmem.c,v 1.8 2004-12-16 08:59:36 adam Exp $
+ * $Id: nmem.c,v 1.15 2005-04-29 10:36:05 heikki Exp $
*/
/**
#endif
#include <assert.h>
+#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <stddef.h>
#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
#include <yaz/log.h>
#define NMEM_CHUNK (4*1024)
-static int log_level=0;
-static int log_level_initialized=0;
+struct align {
+ char x;
+ union {
+ char c;
+ short s;
+ int i;
+ long l;
+#if HAVE_LONG_LONG
+ long long ll;
+#endif
+ float f;
+ double d;
+ } u;
+};
+
+#define NMEM_ALIGN (offsetof(struct align, u))
+
+static int log_level = 0;
+static int log_level_initialized = 0;
#ifdef WIN32
static CRITICAL_SECTION critical_section;
YAZ_EXPORT void nmem_mutex_create(NMEM_MUTEX *p)
{
- if (!log_level_initialized)
- {
- log_level=yaz_log_module_level("nmem");
- log_level_initialized=1;
- }
-
- NMEM_ENTER;
if (!*p)
{
*p = (NMEM_MUTEX) malloc (sizeof(**p));
pth_mutex_init (&(*p)->m_handle);
#endif
}
- NMEM_LEAVE;
+ if (!log_level_initialized)
+ {
+ log_level_initialized = 1;
+ log_level = yaz_log_module_level("nmem");
+ }
+
}
YAZ_EXPORT void nmem_mutex_enter(NMEM_MUTEX p)
YAZ_EXPORT void nmem_mutex_destroy(NMEM_MUTEX *p)
{
- NMEM_ENTER;
if (*p)
{
#ifdef WIN32
free (*p);
*p = 0;
}
- NMEM_LEAVE;
}
static nmem_block *freelist = NULL; /* "global" freelists */
}
r = p->buf + p->top;
/* align size */
- p->top += (size + (sizeof(long) - 1)) & ~(sizeof(long) - 1);
+ p->top += (size + (NMEM_ALIGN - 1)) & ~(NMEM_ALIGN - 1);
n->total += size;
NMEM_LEAVE;
return r;
#endif
if (!log_level_initialized)
{
- log_level=yaz_log_module_level("nmem");
- log_level_initialized=1;
+ log_level = yaz_log_module_level("nmem");
+ log_level_initialized = 1;
}
NMEM_ENTER;
void nmem_init (void)
{
- if (!log_level_initialized)
- {
- log_level=yaz_log_module_level("nmem");
- log_level_initialized=1;
- }
if (++nmem_init_flag == 1)
{
#ifdef WIN32
InitializeCriticalSection(&critical_section);
#elif YAZ_GNU_THREADS
- yaz_log (log_level, "pth_init"); /* ??? */
pth_init ();
#endif
nmem_active_no = 0;
freelist = NULL;
cfreelist = NULL;
}
+ if (!log_level_initialized)
+ {
+ log_level = yaz_log_module_level("nmem");
+ log_level_initialized = 1;
+ }
}
void nmem_exit (void)