Update of /cvsroot/monetdb/pathfinder/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17898/src/tools
Modified Files:
embeddedclient.mx
Log Message:
use new GDKinit api
Index: embeddedclient.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/tools/embeddedclient.mx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- embeddedclient.mx 3 Oct 2007 14:24:18 -0000 1.14
+++ embeddedclient.mx 14 Nov 2007 14:28:17 -0000 1.15
@@ -67,76 +67,15 @@
#endif
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_cmdline, "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();
}
@@ -156,7 +95,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");
-------------------------------------------------------------------------
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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
