Update of /cvsroot/monetdb/MonetDB4/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6235/src/tools
Modified Files:
Mserver.mx embeddedclient.mx
Log Message:
use new GDKinit, moved initialisation of many options into GDK.
Index: embeddedclient.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/tools/embeddedclient.mx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- embeddedclient.mx 3 Oct 2007 13:55:18 -0000 1.4
+++ embeddedclient.mx 14 Nov 2007 12:49:53 -0000 1.5
@@ -74,76 +74,15 @@
static Client
-Monet_init(opt *set, int setlen)
+Monet_init(opt **set, int setlen)
{
- char *p;
- opt *n = (opt *) GDKmalloc(setlen * sizeof(opt));
- int i, j, nlen = 0;
-
- char *dbname = mo_find_option(set, setlen, "gdk_dbname");
- char *dbfarm = mo_find_option(set, setlen, "gdk_dbfarm");
- char *alloc_map = mo_find_option(set, setlen, "gdk_alloc_map");
-
- if (n == NULL || dbname == NULL || dbfarm == NULL || alloc_map == NULL)
{
- if (n != NULL)
- GDKfree(n);
- return NULL;
- }
-
- dbfarm = mo_substitute(set, setlen, dbfarm);
-
/* determine Monet's kernel settings. */
- if (!GDKinit(dbname, dbfarm, strcasecmp(alloc_map, "yes") == 0)) {
- free(dbfarm);
- GDKfree(n);
+ setlen = mo_add_option(set, setlen, opt_config, "gdk_embedded", "yes");
+ if (!GDKinit(*set, setlen))
return NULL;
- }
- free(dbfarm);
-
- for (i = 0; i < setlen; i++) {
- int done = 0;
-
- for (j = 0; j < nlen; j++) {
- if (strcmp(n[j].name, set[i].name) == 0) {
- if (n[j].kind < set[i].kind)
- n[j] = set[i];
- done = 1;
- break;
- }
- }
- if (!done) {
- n[nlen] = set[i];
- nlen++;
- }
- }
- for (i = 0; i < nlen; i++) {
- char *value;
-
- value = mo_substitute(n, nlen, n[i].value);
- GDKsetenv(n[i].name, value);
- free(value);
- }
- GDKfree(n);
-
- if ((p = GDKgetenv("gdk_debug")) != NULL)
- GDKdebug = strtol(p, NULL, 10);
-
- if ((p = GDKgetenv("gdk_mem_bigsize")) != NULL)
- GDK_mem_bigsize = strtol(p, NULL, 10);
- if ((p = GDKgetenv("gdk_vm_minsize")) != NULL)
- GDK_vm_minsize = strtol(p, NULL, 10);
- if (GDKgetenv_isyes("gdk_embedded")) {
- GDKembedded = 1;
- }
if (GDKgetenv_isyes("monet_daemon"))
monet_daemon = 1;
- if (GDKgetenv_isyes("monet_embedded")) {
- monet_daemon = 1;
- GDKembedded = 1;
- }
-
-
return monet_init();
}
@@ -163,7 +102,7 @@
int len = mo_builtin_settings(&embedded_set);
embedded_len = mo_system_config(&embedded_set, len);
}
- Monet_init(embedded_set, embedded_len);
+ Monet_init(&embedded_set, embedded_len);
mo_free_options(embedded_set, embedded_len);
static_module_init();
THRnew(MT_getpid(), "Interpreter");
Index: Mserver.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/tools/Mserver.mx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Mserver.mx 29 Oct 2007 20:08:32 -0000 1.13
+++ Mserver.mx 14 Nov 2007 12:49:53 -0000 1.14
@@ -148,88 +148,17 @@
static Client
Monet_init(opt *set, int setlen)
{
- char *p;
- opt *n = (opt *) malloc(setlen * sizeof(opt));
- int i, j, nlen = 0;
-
- char *dbname = mo_find_option(set, setlen, "gdk_dbname");
- char *dbfarm = mo_find_option(set, setlen, "gdk_dbfarm");
- char *alloc_map = mo_find_option(set, setlen, "gdk_alloc_map");
-
- if (!n || !dbname || !dbfarm || !alloc_map) {
- if (n)
- free(n);
- return NULL;
- }
-
- dbfarm = mo_substitute(set, setlen, dbfarm);
-
- if ((p = mo_find_option(set, setlen, "gdk_debug")))
- GDKdebug = strtol(p, NULL, 10);
-
- if ((p = mo_find_option(set, setlen, "gdk_mem_pagebits")))
- GDK_mem_pagebits = strtol(p, NULL, 10);
-
- if ((p = mo_find_option(set, setlen, "gdk_vmtrim")))
- GDK_vm_trim = strcasecmp(p, "yes") == 0;
-
/* determine Monet's kernel settings. */
- if (!GDKinit(dbname, dbfarm, strcasecmp(alloc_map, "yes") == 0)) {
- free(dbfarm);
- free(n);
+ if (!GDKinit(set, setlen))
return NULL;
- }
- free(dbfarm);
-
- for (i = 0; i < setlen; i++) {
- int done = 0;
-
- for (j = 0; j < nlen; j++) {
- if (strcmp(n[j].name, set[i].name) == 0) {
- if (n[j].kind < set[i].kind) {
- n[j] = set[i];
- }
- done = 1;
- break;
- }
- }
- if (!done) {
- n[nlen] = set[i];
- nlen++;
- }
- }
- for (i = 0; i < nlen; i++) {
- char *value;
-
- value = mo_substitute(n, nlen, n[i].value);
- GDKsetenv(n[i].name, value);
- free(value);
- }
- free(n);
-
-
- if ((p = GDKgetenv("gdk_mem_bigsize"))) {
- /* when allocating >6% of all RAM; do so using vmalloc() iso
malloc() */
- lng max_mem_bigsize = GDK_mem_maxsize/16;
-
- /* sanity check to avoid memory fragmentation */
- GDK_mem_bigsize = (size_t) MIN(max_mem_bigsize, strtol(p, NULL,
10));
- }
- if ((p = GDKgetenv("gdk_vm_minsize")))
- GDK_vm_minsize = (size_t)strtol(p, NULL, 10);
-
- if (GDKgetenv_isyes("gdk_embedded") || GDKgetenv_isyes("embedded")) {
- GDKembedded = 1;
- monet_daemon = 1;
- }
+ monet_daemon = GDKembedded;
if (GDKgetenv_isyes("monet_daemon") || GDKgetenv_isyes("daemon")) {
monet_daemon = 1;
#ifdef HAVE_SETSID
setsid();
#endif
}
-
return monet_init();
}
@@ -365,7 +294,7 @@
}
if (!(setlen = mo_system_config(&set, setlen)))
- usage(prog,debug, set, setlen);
+ usage(prog, debug, set, setlen);
monet_script = (str *) GDKmalloc(sizeof(str) * (argc - optind + 5));
monet_script[idx] = NULL;
@@ -384,7 +313,7 @@
mo_free_options(set, setlen);
if (!c)
- usage(prog,debug, set, setlen);
+ usage(prog, debug, set, setlen);
GDKsetenv("monet_version", (str)MonetDBversion());
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
