MonetDB: default - Protect against non-initialized timer variables.

[mk]

Changeset: 817a64af4505 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=817a64af4505
Modified Files:
        clients/src/mapiclient/mclient.mx
Branch: default
Log Message:

Protect against non-initialized timer variables.


diffs (41 lines):

diff -r 0a6a45c2a2b0 -r 817a64af4505 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Tue Aug 10 16:58:06 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Wed Aug 11 21:23:12 2010 +0200
@@ -315,11 +315,16 @@
 timerPause(void)
 {
        t1 = gettime();
+       if ( t0 == 0 ) 
+               t0 = t1;
 }
 
 static void
 timerResume(void)
 {
+       if ( t1 == 0)
+               t1= gettime();
+       assert(t1 >= t0);
        t0 = gettime() - (t1 - t0);
 }
 
@@ -328,6 +333,7 @@
 {
        mnstr_flush(toConsole);
        t1 = gettime();
+       assert( t1 >= t0);
        if (mark && specials == NOmodifier) {
                fprintf(stderr, "%s %7ld.%03ld msec %s\n", mark, (long) ((t1 - 
t0) / 1000), (long) ((t1 - t0) % 1000), mark2 ? mark2 : "");
                fflush(stderr);
@@ -338,8 +344,11 @@
 static char *
 timerHuman()
 {
-       timertype t = t1 - t0;
+       timertype t;
+       t1 = gettime();
+       t = t1 - t0;
 
+       assert( t1 >= t0);
        if (t / 1000 < 950) {
                snprintf(htimbuf, 32, "%ld.%03ldms", (long) (t / 1000), (long) 
(t % 1000));
                return(htimbuf);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list