Merge remote-tracking branch 'remotes/gh-sebres/sb/_se-back-port/timerate' into sb/trunk-rewrite-clock-in-c

Author: sebres

generic/tclCmdMZ.c

@@ -4211,6 +4211,7 @@ Tcl_TimeRateObjCmd(
 	    return TCL_ERROR;
 	}
 	codePtr = TclCompileObj(interp, objPtr, NULL, 0);
+	TclPreserveByteCode(codePtr);
     }
 
     /* get start and stop time */
@@ -4238,7 +4239,7 @@ Tcl_TimeRateObjCmd(
 	    result = TclEvalObjEx(interp, objPtr, 0, NULL, 0);
 	}
 	if (result != TCL_OK) {
-	    return result;
+	    goto done;
 	}
 
 	/* don't check time up to threshold */
@@ -4277,6 +4278,7 @@ Tcl_TimeRateObjCmd(
 	if (!calibrate) {
 	    /* minimize influence of measurement overhead */
 	    if (overhead > 0) {
+		/* estimate the time of overhead (microsecs) */
 		Tcl_WideInt curOverhead = overhead * count;
 		if (middle > curOverhead) {
 		    middle -= curOverhead;
@@ -4290,7 +4292,7 @@ Tcl_TimeRateObjCmd(
 		measureOverhead = (double)middle / count;
 	    }
 	    objs[0] = Tcl_NewDoubleObj(measureOverhead);
-	    TclNewLiteralStringObj(objs[1], "\xC2\xB5s/#-overhead,"); /* mics */
+	    TclNewLiteralStringObj(objs[1], "\xC2\xB5s/#-overhead"); /* mics */
 	    objs += 2;
 	}
 
@@ -4324,15 +4326,27 @@ Tcl_TimeRateObjCmd(
 	    objs[4] = Tcl_NewWideIntObj((count / middle) * 1000000);
 	}
 
+	/* estimated net execution time (in millisecs) */
+	if (!calibrate) {
+	    objs[6] = Tcl_ObjPrintf("%.3f", (double)middle / 1000);
+	    TclNewLiteralStringObj(objs[7], "nett-ms");
+	}
+
 	/*
 	* Construct the result as a list because many programs have always parsed
 	* as such (extracting the first element, typically).
 	*/
 
-	TclNewLiteralStringObj(objs[1], "\xC2\xB5s/#,"); /* mics/# */
-	TclNewLiteralStringObj(objs[3], "#,");
+	TclNewLiteralStringObj(objs[1], "\xC2\xB5s/#"); /* mics/# */
+	TclNewLiteralStringObj(objs[3], "#");
 	TclNewLiteralStringObj(objs[5], "#/sec");
-	Tcl_SetObjResult(interp, Tcl_NewListObj((!calibrate) ? 6 : 8, objarr));
+	Tcl_SetObjResult(interp, Tcl_NewListObj(8, objarr));
+    }
+
+done:
+
+    if (codePtr != NULL) {
+	TclReleaseByteCode(codePtr);
     }
 
     return result;