MonetDB: Jan2022 - Don't set gdk values outside of it, use monet...

[Pedro Ferreira]

Changeset: d28dac236250 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d28dac236250
Modified Files:
        tools/monetdbe/monetdbe.c
Branch: Jan2022
Log Message:

Don't set gdk values outside of it, use monet options


diffs (50 lines):

diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -487,7 +487,7 @@ monetdbe_workers_internal(monetdbe_datab
                if (opts->nr_threads < 0)
                        set_error(mdbe,createException(MAL, 
"monetdbe.monetdbe_startup", "Nr_threads should be positive"));
                else
-                       workers = GDKnr_threads = opts->nr_threads;
+                       workers = opts->nr_threads;
        }
        return workers;
 }
@@ -682,12 +682,32 @@ monetdbe_startup(monetdbe_database_inter
                GDKtracer_set_adapter("MBEDDED");
        }
 
-       workers = monetdbe_workers_internal(mdbe, opts);
-       memory = monetdbe_memory_internal(mdbe, opts);
-       if (memory)
-                       GDK_vm_maxsize = (size_t) memory << 20; /* convert from 
MiB to bytes */
-       if (mdbe->msg)
+       if ((workers = monetdbe_workers_internal(mdbe, opts))) {
+               int psetlen = setlen;
+               char workstr[16];
+
+               snprintf(workstr, sizeof(workstr), "%d", workers);
+               if ((setlen = mo_add_option(&set, setlen, opt_cmdline, 
"gdk_nr_threads", workstr)) == psetlen) {
+                       mo_free_options(set, setlen);
+                       set_error(mdbe, createException(MAL, 
"monetdbe.monetdbe_startup", MAL_MALLOC_FAIL));
                        goto cleanup;
+               }
+       }
+       if ((memory = monetdbe_memory_internal(mdbe, opts))) {
+               int psetlen = setlen;
+               char memstr[32];
+
+               snprintf(memstr, sizeof(memstr), "%zu", (size_t) memory << 20); 
/* convert from MiB to bytes */
+               if ((setlen = mo_add_option(&set, setlen, opt_cmdline, 
"gdk_vm_maxsize", memstr)) == psetlen) {
+                       mo_free_options(set, setlen);
+                       set_error(mdbe, createException(MAL, 
"monetdbe.monetdbe_startup", MAL_MALLOC_FAIL));
+                       goto cleanup;
+               }
+       }
+       if (mdbe->msg) {
+               mo_free_options(set, setlen);
+               goto cleanup;
+       }
 
        if (!dbdir) { /* in-memory */
                if (BBPaddfarm(NULL, (1U << PERSISTENT) | (1U << TRANSIENT), 
false) != GDK_SUCCEED) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list