Update of /cvsroot/monetdb/clients/src/mapiclient
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14114/src/mapiclient
Modified Files:
MapiClient.mx
Log Message:
propagated changes of Thursday Dec 20 2007 - Friday Dec 21 2007
from the Clients_1-20 branch to the development trunk
Index: MapiClient.mx
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/MapiClient.mx,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- MapiClient.mx 19 Dec 2007 19:13:27 -0000 1.99
+++ MapiClient.mx 21 Dec 2007 14:55:30 -0000 1.100
@@ -268,6 +268,18 @@
}
static void
+timerPause(void)
+{
+ t1 = gettime();
+}
+
+static void
+timerResume(void)
+{
+ t0 = gettime() - (t1 - t0);
+}
+
+static void
timerEnd(void)
{
t1 = gettime();
@@ -1049,6 +1061,7 @@
timerStart();
do {
+ timerPause();
if ((length = fread(buf, 1, bufsize, fp)) == 0) {
/* end of file */
if (file != NULL) {
@@ -1058,6 +1071,7 @@
if (hdl == NULL)
break; /* nothing more to do */
}
+ timerResume();
if (hdl == NULL) {
hdl = mapi_query_prep(mid);
@@ -1202,6 +1216,7 @@
oldbuf = buf = malloc(BUFSIZ);
do {
+ timerPause();
#ifdef HAVE_LIBREADLINE
if (prompt) {
rl_completion_func_t *func = NULL;
@@ -1492,7 +1507,9 @@
timerStart();
hdl = mapi_query_prep(mid);
CHECK_RESULT(mid, hdl, buf, continue);
- }
+ } else
+ timerResume();
+
assert(hdl != NULL);
if (length > 0) {
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
