X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fnmem.h;h=1b7327f6d0106c80188f7d2f3ce2ee0c2857c528;hp=601770b613ad776bcbf7bd60754090fe0c252744;hb=a49837cbe6fcbeeb9ce857b0eeb942619ba80b5e;hpb=46ed30d0d83dd1b21e58a4db365a60aefaa5aad8;ds=sidebyside

diff --git a/include/nmem.h b/include/nmem.h
index 601770b..1b7327f 100644
--- a/include/nmem.h
+++ b/include/nmem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -23,12 +23,34 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $log$
+ * $Log: nmem.h,v $
+ * Revision 1.10  1998-10-19 15:24:20  adam
+ * New nmem utility, nmem_transfer, that transfer blocks from one
+ * NMEM to another.
+ *
+ * Revision 1.9  1998/10/13 16:00:17  adam
+ * Implemented nmem_critical_{enter,leave}.
+ *
+ * Revision 1.8  1998/07/20 12:35:59  adam
+ * Added more memory diagnostics (when NMEM_DEBUG is 1).
+ *
+ * Revision 1.7  1997/10/31 12:20:08  adam
+ * Improved memory debugging for xmalloc/nmem.c. References to NMEM
+ * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
+ * Bug fix: missing fclose in data1_read_espec1.
+ *
  */
 
 #ifndef NMEM_H
 #define NMEM_H
 #include <yconfig.h>
+
+#define NMEM_DEBUG 0
+
+#ifndef NMEM_DEBUG
+#define NMEM_DEBUG 0
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -51,11 +73,32 @@ typedef struct nmem_control
 typedef struct nmem_control *NMEM;
 
 YAZ_EXPORT void nmem_reset(NMEM n);
-YAZ_EXPORT void *nmem_malloc(NMEM n, int size);
 YAZ_EXPORT int nmem_total(NMEM n);
+YAZ_EXPORT char *nmem_strdup (NMEM mem, const char *src);
+YAZ_EXPORT void nmem_transfer (NMEM dst, NMEM src);
+
+YAZ_EXPORT void nmem_critical_enter (void);
+YAZ_EXPORT void nmem_critical_leave (void);
+
+#if NMEM_DEBUG
+
+YAZ_EXPORT NMEM nmem_create_f(const char *file, int line);
+YAZ_EXPORT void nmem_destroy_f(const char *file, int line, NMEM n);
+YAZ_EXPORT void *nmem_malloc_f(const char *file, int line, NMEM n, int size);
+#define nmem_create() nmem_create_f(__FILE__, __LINE__)
+#define nmem_destroy(x) nmem_destroy_f(__FILE__, __LINE__, (x))
+#define nmem_malloc(x, y) nmem_malloc_f(__FILE__, __LINE__, (x), (y))
+
+#else
+
 YAZ_EXPORT NMEM nmem_create(void);
 YAZ_EXPORT void nmem_destroy(NMEM n);
+YAZ_EXPORT void *nmem_malloc(NMEM n, int size);
+
+#endif
 
+YAZ_EXPORT void nmem_init (void);
+YAZ_EXPORT void nmem_exit (void);
 #ifdef __cplusplus
 }
 #endif