Changeset: 6defe9b19435 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6defe9b19435
Modified Files:
clients/mapiclient/Tests/tachograph--help.stable.err
clients/mapiclient/tachograph.c
monetdb5/mal/Tests/performanceTests/performanceLog
monetdb5/mal/Tests/performanceTests/tst901a.mal
monetdb5/mal/Tests/performanceTests/tst901b.mal
Branch: geo
Log Message:
Merge with default branch.
diffs (156 lines):
diff --git a/clients/mapiclient/Tests/tachograph--help.stable.err
b/clients/mapiclient/Tests/tachograph--help.stable.err
--- a/clients/mapiclient/Tests/tachograph--help.stable.err
+++ b/clients/mapiclient/Tests/tachograph--help.stable.err
@@ -18,6 +18,8 @@ tachograph [options]
-b | --beat=<delay> in milliseconds (default 5000)
-i | --interactive=<o | 1> show trace on stdout
-o | --output=<webfile>
+ -c | --cache=<query pool location>
+ -q | --queries=<query pool capacity>
-w | --wait=<delay time> in milliseconds
-? | --help
diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c
--- a/clients/mapiclient/tachograph.c
+++ b/clients/mapiclient/tachograph.c
@@ -167,6 +167,8 @@ usageTachograph(void)
fprintf(stderr, " -b | --beat=<delay> in milliseconds (default
5000)\n");
fprintf(stderr, " -i | --interactive=<o | 1> show trace on stdout\n");
fprintf(stderr, " -o | --output=<webfile>\n");
+ fprintf(stderr, " -c | --cache=<query pool location>\n");
+ fprintf(stderr, " -q | --queries=<query pool capacity>\n");
fprintf(stderr, " -w | --wait=<delay time> in milliseconds\n");
fprintf(stderr, " -? | --help\n");
exit(-1);
@@ -202,6 +204,7 @@ size_t txtlength=0;
// limit the number of separate queries in the pool
#define QUERYPOOL 32
+static int querypool = QUERYPOOL;
int queryid= 0;
static FILE *tachojson;
@@ -245,7 +248,7 @@ static void resetTachograph(void){
pccount = 0;
fflush(stdout);
events = 0;
- queryid = (queryid+1) % QUERYPOOL;
+ queryid = (queryid+1) % querypool;
}
static char stamp[BUFSIZ]={0};
@@ -318,7 +321,7 @@ static struct{
{0,0,0,0,0}};
static void
-renderArgs(char *c, char *l, int len)
+renderArgs(char *c, char *l, size_t len)
{
char varname[BUFSIZ]={0}, *v=0;
char *limit = l + len-1;
@@ -373,16 +376,6 @@ renderArgs(char *c, char *l, int len)
// copy the literals
if( strcmp(varname,"nil") == 0 || strcmp(varname,"true")==0 ||
strcmp(varname,"false")==0)
for(v = varname; *v; ) *l++ = *v++;
-/*
- else
- // show variable in assignment only
- if (v && varname[0] && strstr(c,":=") && !strchr(c,')') ){
- v= fndSource(varname);
- snprintf(l, len -strlen(line)-2,"%s",v);
- while(*l) l++;
- free(v);
- }
-*/
// drop the properties
if( *c == '{'){
while(*c && *c !='}') c++;
@@ -846,6 +839,7 @@ main(int argc, char **argv)
{ "interactive", 1, 0, 'i' },
{ "output", 1, 0, 'o' },
{ "cache", 1, 0, 'c' },
+ { "queries", 1, 0, 'q' },
{ "wait", 1, 0, 'w' },
{ "debug", 0, 0, 'D' },
{ 0, 0, 0, 0 }
@@ -856,7 +850,7 @@ main(int argc, char **argv)
while (1) {
int option_index = 0;
- int c = getopt_long(argc, argv, "d:u:p:P:h:?:b:i:o:c:w:D",
+ int c = getopt_long(argc, argv, "d:u:p:P:h:?:b:i:o:c:q:w:D",
long_options, &option_index);
if (c == -1)
break;
@@ -894,6 +888,10 @@ main(int argc, char **argv)
if (optarg)
portnr = atoi(optarg);
break;
+ case 'q':
+ if (optarg)
+ querypool = atoi(optarg) > 0? atoi(optarg):1;
+ break;
case 'h':
host = optarg;
break;
diff --git a/monetdb5/mal/Tests/performanceTests/performanceLog
b/monetdb5/mal/Tests/performanceTests/performanceLog
--- a/monetdb5/mal/Tests/performanceTests/performanceLog
+++ b/monetdb5/mal/Tests/performanceTests/performanceLog
@@ -1246,3 +1246,18 @@ tst400e 0.861/0.814/0.016
tst901a 0.812/0.750/0.032
tst901b 2.112/2.051/0.038
+======================== 23 apr 2015 ===================
+Vienna Fedora 20
+Default release
+The compilation mode for is --enable-optimize --disable-debug
+compilation took ?
+command: time mserver5 TST </dev/null >/dev/null
+base 0.097/0.070/0.026
+tst400a 0.210/0.187/0.023
+tst400bHuge 0.171/0.142/0.029
+tst400cHuge 0.193/0.167/0.026
+tst400d 0.605/0.584/0.021
+tst400e 1.006/0.986/0.020
+
+tst901a 0.790/0.760/0.030
+tst901b 2.053/2.016/0.037
diff --git a/monetdb5/mal/Tests/performanceTests/tst901a.mal
b/monetdb5/mal/Tests/performanceTests/tst901a.mal
--- a/monetdb5/mal/Tests/performanceTests/tst901a.mal
+++ b/monetdb5/mal/Tests/performanceTests/tst901a.mal
@@ -1,5 +1,4 @@
# what is the overhead of MAL in multiplex situations
-profiler.setFilter("*","*");
b:= bat.new(:oid,:lng);
t0:= alarm.usec();
barrier i:= 0:lng;
diff --git a/monetdb5/mal/Tests/performanceTests/tst901b.mal
b/monetdb5/mal/Tests/performanceTests/tst901b.mal
--- a/monetdb5/mal/Tests/performanceTests/tst901b.mal
+++ b/monetdb5/mal/Tests/performanceTests/tst901b.mal
@@ -1,7 +1,5 @@
# what is the overhead of MAL in multiplex situations
# using a BATloop !! This is 40x slower as the V4.3 multiplex implementation
-#profiler.setAll();
-#profiler.setLogFile("/tmp/MonetProfile.xml");
b:= bat.new(:oid,:lng);
t0:= alarm.usec();
barrier i:= 0:lng;
@@ -14,10 +12,10 @@ c:= algebra.copy(b);
t2:= alarm.usec();
d:= bat.new(:oid,:lng);
barrier (h,t):= iterator.new(b);
- zz:= algebra.find(b,h);
- z:= algebra.find(c,h);
+ zz:= algebra.fetch(b,h);
+ z:= algebra.fetch(c,h);
cr:= zz+z;
- bat.insert(d,h,cr);
+ bat.append(d,cr);
redo (h,t):= iterator.next(b);
exit (h,t);
t3:= alarm.usec();
@@ -31,4 +29,3 @@ io.printf("cnt %d ",cnt);
io.printf("make %d ",d1);
io.printf("multiplex %d\n",d2);
io.printf("compiled multiplex %d\n",d3);
-#profiler.stop();
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
