X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_mem.c;h=2ec348a7368949a34ba1dd81256b38f877ea6c3a;hp=e57730a32ccadcf0b077998475229524c0568102;hb=c71d717ada2a9ef730d527f161eb5ba9aa641a9f;hpb=892f7f56860a1ee8e8d816eeaec0387c54c1a0a7

diff --git a/odr/odr_mem.c b/odr/odr_mem.c
index e57730a..2ec348a 100644
--- a/odr/odr_mem.c
+++ b/odr/odr_mem.c
@@ -1,95 +1,109 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: odr_mem.c,v $
- * Revision 1.2  1995-03-17 10:17:52  quinn
- * Added memory management.
- *
- * Revision 1.1  1995/03/14  10:27:40  quinn
- * Modified makefile to use common lib
- * Beginning to add memory management to odr
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
  *
+ * $Id: odr_mem.c,v 1.23 2003-03-18 13:34:35 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
-#include <odr.h>
+#include "odr-priv.h"
+#include <yaz/xmalloc.h>
 
-#define ODR_MEM_CHUNK (10*1024)
+/* ------------------------ NIBBLE MEMORY ---------------------- */
 
-typedef struct odr_memblock
+/*
+ * Extract the memory control block from o.
+ */
+NMEM odr_extract_mem(ODR o)
 {
-    char *buf;
-    int size;
-    int top;
-    struct odr_memblock *next;
-} odr_memblock;
+    NMEM r = o->mem;
 
-static odr_memblock *freelist = 0;
+    o->mem = 0;
+    return r;
+}
 
-static void free_block(odr_memblock *p)
+void *odr_malloc(ODR o, int size)
 {
-    p->next = freelist;
-    freelist = p;
+    if (o && !o->mem)
+	o->mem = nmem_create();
+    return nmem_malloc(o ? o->mem : 0, size);
 }
 
-static odr_memblock *get_block(int size)
+char *odr_strdup(ODR o, const char *str)
 {
-    odr_memblock *r, *l;
+    return nmem_strdup(o->mem, str);
+}
 
-    for (r = freelist, l = 0; r; l = r, r = r->next)
-    	if (r->size >= size)
-	    break;
-    if (r)
-    	if (l)
-	    l->next = r->next;
-	else
-	    freelist = r->next;
-    else
-    {
-    	int get = ODR_MEM_CHUNK;
+char *odr_strdupn(ODR o, const char *str, size_t n)
+{
+    return nmem_strdupn(o->mem, str, n);
+}
 
-	if (get < size)
-	    get = size;
-	if (!(r = malloc(sizeof(*r))))
-	    return 0;
-	if (!(r->buf = malloc(r->size = get)))
-	    return 0;
-    }
-    r->top = 0;
-    return r;
+int *odr_intdup(ODR o, int v)
+{
+    return nmem_intdup(o->mem, v);
 }
 
-void odr_release_mem(odr_memblock *p)
+int odr_total(ODR o)
 {
-    odr_memblock *t;
+    return o->mem ? nmem_total(o->mem) : 0;
+}
+
+/* ---------- memory management for data encoding ----------*/
+
+
+int odr_grow_block(ODR b, int min_bytes)
+{
+    int togrow;
+
+    if (!b->can_grow)
+    	return -1;
+    if (!b->size)
+    	togrow = 1024;
+    else
+    	togrow = b->size;
+    if (togrow < min_bytes)
+    	togrow = min_bytes;
+    if (b->size && !(b->buf =
+		     (unsigned char *) xrealloc(b->buf, b->size += togrow)))
+    	abort();
+    else if (!b->size && !(b->buf = (unsigned char *)
+			   xmalloc(b->size = togrow)))
+    	abort();
+#ifdef ODR_DEBUG
+    fprintf(stderr, "New size for encode_buffer: %d\n", b->size);
+#endif
+    return 0;
+}
 
-    while (p)
+int odr_write(ODR o, unsigned char *buf, int bytes)
+{
+    if (o->pos + bytes >= o->size && odr_grow_block(o, bytes))
     {
-    	t = p;
-	p = p->next;
-	free_block(t);
+        odr_seterror(o, OSPACE, 40);
+	return -1;
     }
+    memcpy(o->buf + o->pos, buf, bytes);
+    o->pos += bytes;
+    if (o->pos > o->top)
+    	o->top = o->pos;
+    return 0;
 }
 
-void *odr_malloc(ODR o, int size)
+int odr_seek(ODR o, int whence, int offset)
 {
-    struct odr_memblock *p = o->mem;
-    char *r;
-
-    if (!p || p->size - p->top < size)
-    	if (!(p = get_block(size)))
-	{
-	    o->error = OMEMORY;
-	    return 0;
-	}
-	else
-	{
-	    p->next = o->mem;
-	    o->mem = p;
-	}
-    r = p->buf + p->top;
-    p->top += (size + (sizeof(long) - 1)) & ~(sizeof(long) - 1);
-    return r;
+    if (whence == ODR_S_CUR)
+    	offset += o->pos;
+    else if (whence == ODR_S_END)
+    	offset += o->top;
+    if (offset > o->size && odr_grow_block(o, offset - o->size))
+    {
+        odr_seterror(o, OSPACE, 41);
+	return -1;
+    }
+    o->pos = offset;
+    return 0;
 }