Changeset: 229b703886a1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/229b703886a1
Modified Files:
gdk/gdk.h
gdk/gdk_heap.c
Branch: default
Log Message:
Remove unused (old pyapi) storage types.
diffs (27 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1452,10 +1452,7 @@ typedef enum {
STORE_MEM, /* load into GDKmalloced memory */
STORE_MMAP, /* mmap() into virtual memory */
STORE_PRIV, /* BAT copy of copy-on-write mmap */
- STORE_CMEM, /* load into malloc (not GDKmalloc) memory*/
STORE_NOWN, /* memory not owned by the BAT */
- STORE_MMAPABS, /* mmap() into virtual memory from an
- * absolute path (not part of dbfarm) */
} storage_t;
typedef struct {
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -637,9 +637,6 @@ HEAPfree(Heap *h, bool rmheap)
if (h->storage == STORE_MEM) { /* plain memory */
TRC_DEBUG(HEAP, "HEAPfree %s %zu %p\n", h->filename,
h->size, h->base);
GDKfree(h->base);
- } else if (h->storage == STORE_CMEM) {
- //heap is stored in regular C memory rather than GDK
memory,so we call free()
- free(h->base);
} else if (h->storage != STORE_NOWN) { /* mapped file, or
STORE_PRIV */
gdk_return ret = GDKmunmap(h->base,
h->storage == STORE_PRIV ?
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]