Changeset: 47f5a049a2f3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/47f5a049a2f3
Modified Files:
gdk/gdk_heap.c
Branch: default
Log Message:
Merge with Sep2022 branch.
diffs (35 lines):
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -296,7 +296,7 @@ HEAPextend(Heap *h, size_t size, bool ma
if (!must_mmap) {
h->newstorage = h->storage = STORE_MEM;
h->base = GDKrealloc(h->base, size);
- TRC_DEBUG(HEAP, "Extending malloced heap %s %zu %zu %p
%p\n", h->filename, size, h->size, bak.base, h->base);
+ TRC_DEBUG(HEAP, "Extending malloced heap %s %zu->%zu
%p->%p\n", h->filename, bak.size, size, bak.base, h->base);
h->size = size;
if (h->base) {
if (h->farmid == 1) {
@@ -384,22 +384,6 @@ HEAPextend(Heap *h, size_t size, bool ma
return GDK_SUCCEED;
}
failure = "h->storage == STORE_MEM && can_map
&& fd >= 0 && HEAPload() != GDK_SUCCEED";
- /* couldn't allocate, now first save data to
- * file */
- if (HEAPsave_intern(&bak, nme, ext, ".tmp",
false, bak.free, NULL) != GDK_SUCCEED) {
- failure = "h->storage == STORE_MEM &&
can_map && fd >= 0 && HEAPsave_intern() != GDK_SUCCEED";
- goto failed;
- }
- /* then free memory */
- HEAPfree(&bak, false);
- /* and load heap back in via memory-mapped
- * file */
- if (HEAPload_intern(h, nme, ext, ".tmp", false)
== GDK_SUCCEED) {
- /* success! */
- GDKclrerr(); /* don't leak errors
from e.g. HEAPload */
- return GDK_SUCCEED;
- }
- failure = "h->storage == STORE_MEM && can_map
&& fd >= 0 && HEAPload_intern() != GDK_SUCCEED";
/* we failed */
} else {
failure = "h->storage == STORE_MEM && can_map
&& fd < 0";
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
