Changeset: 2c1bb47d7eda for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2c1bb47d7eda
Modified Files:
monetdb5/modules/mal/txtsim.c
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (45 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1074,7 +1074,7 @@ GDKinit(opt *set, int setlen, bool embed
first = false;
if (GDK_mem_maxsize / 16 < GDK_mmap_minsize_transient) {
- GDK_mmap_minsize_transient = GDK_mem_maxsize / 16;
+ GDK_mmap_minsize_transient = MAX(MMAP_PAGESIZE, GDK_mem_maxsize
/ 16);
if (GDK_mmap_minsize_persistent > GDK_mmap_minsize_transient)
GDK_mmap_minsize_persistent =
GDK_mmap_minsize_transient;
}
@@ -1107,13 +1107,13 @@ GDKinit(opt *set, int setlen, bool embed
if (strcmp("gdk_mem_maxsize", n[i].name) == 0) {
GDK_mem_maxsize = (size_t) strtoll(n[i].value, NULL,
10);
GDK_mem_maxsize = MAX(1 << 26, GDK_mem_maxsize);
+ if (GDK_mem_maxsize / 16 < GDK_mmap_minsize_transient)
+ GDK_mmap_minsize_transient = MAX(MMAP_PAGESIZE,
GDK_mem_maxsize / 16);
+ if (GDK_mmap_minsize_persistent >
GDK_mmap_minsize_transient)
+ GDK_mmap_minsize_persistent =
GDK_mmap_minsize_transient;
} else if (strcmp("gdk_vm_maxsize", n[i].name) == 0) {
GDK_vm_maxsize = (size_t) strtoll(n[i].value, NULL, 10);
GDK_vm_maxsize = MAX(1 << 30, GDK_vm_maxsize);
- if (GDK_vm_maxsize < GDK_mmap_minsize_persistent / 4)
- GDK_mmap_minsize_persistent = GDK_vm_maxsize /
4;
- if (GDK_vm_maxsize < GDK_mmap_minsize_transient / 4)
- GDK_mmap_minsize_transient = GDK_vm_maxsize / 4;
} else if (strcmp("gdk_mmap_minsize_persistent", n[i].name) ==
0) {
GDK_mmap_minsize_persistent = (size_t)
strtoll(n[i].value, NULL, 10);
} else if (strcmp("gdk_mmap_minsize_transient", n[i].name) ==
0) {
@@ -2058,8 +2058,12 @@ GDKprintinfo(void)
size_t allocated = (size_t) ATOMIC_GET(&GDK_mallocedbytes_estimate);
size_t vmallocated = (size_t) ATOMIC_GET(&GDK_vm_cursize);
- printf("Virtual memory allocated: %zu, of which %zu with malloc (limit:
%zu)\n",
- vmallocated + allocated, allocated, GDK_vm_maxsize);
+ printf("Virtual memory allocated: %zu, of which %zu with malloc\n",
+ vmallocated + allocated, allocated);
+ printf("gdk_vm_maxsize: %zu, gdk_mem_maxsize: %zu\n",
+ GDK_vm_maxsize, GDK_mem_maxsize);
+ printf("gdk_mmap_minsize_persistent %zu, gdk_mmap_minsize_transient
%zu\n",
+ GDK_mmap_minsize_persistent, GDK_mmap_minsize_transient);
#ifdef __linux__
int fd = open("/proc/self/statm", O_RDONLY | O_CLOEXEC);
if (fd >= 0) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
