Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26988
Modified Files:
pathfinder.mx shttpd.c
Log Message:
- added latency test (42) and corrected timing
Index: shttpd.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/shttpd.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- shttpd.c 7 Apr 2007 00:55:11 -0000 1.29
+++ shttpd.c 7 Apr 2007 14:56:36 -0000 1.30
@@ -2979,7 +2979,7 @@
* connection in chain (pc) unchanged.
*/
if ( (c->flags & FLAG_FINISHED) || ((c->io != do_embedded) &&
c->expire < now) ) {
- if (0) disconnect(c, pc);
+ disconnect(c, pc);
} else
pc = c;
}
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- pathfinder.mx 6 Apr 2007 17:16:00 -0000 1.323
+++ pathfinder.mx 7 Apr 2007 14:56:36 -0000 1.324
@@ -5456,6 +5456,7 @@
xquery_client *ctx = mc->fc;
stream *in = mc->c->fdin, *out = mc->c->fdout;
char *p, *xquery, *err = (char*) -1, *msg = NULL;
+ lng usec;
/* buf is the mode string that is available during execution in the MIL
genType var */
char buf[113], *genType, *output;
@@ -5466,6 +5467,8 @@
ctx->mode = XQ_MAPI;
while (1) {
+ usec = GDKusec();
+
/* use the MAPI protocol to read as much xquery buffer as possible */
if (stream_flush(out)) {
msg = "could not flush prompt";
@@ -5538,9 +5541,12 @@
}
continue;
} else if (*p == 'S' || *p == 's') {
+
/* execute query */
- lng usec = GDKusec();
xquery = p+1;
+if (p[1] == '4' && p[2] == '2' && p[3] == '\n' && p[4] == 0 && genType == buf
&& output[2] == 0) { /* use '42' as latency query test */
+ stream_printf(GDKout, "42\n\nTrans 0.000 msec\nShred 0.000
msec\nQuery 0.000 msec\nPrint 0.000 msec\n");
+} else {
err = xquery_change_genType(ctx, genType);
if (err == NULL)
err = xquery_prepare(ctx, usec, xquery);
@@ -5562,6 +5568,7 @@
BBPreclaim(b);
}
}
+}
}
/* second and on queries also need a cleared context */
xquery_client_reset(ctx, NULL);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
