diff options
| author | sebres <sebres@users.sourceforge.net> | 2019-06-25 19:04:18 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2019-06-25 19:04:18 (GMT) |
| commit | f5299fe91b8bca422e3a5725a70db8cd134467ab (patch) | |
| tree | d991cbbb15d4faf1845b3b266ab03a4d52450247 | |
| parent | d1b95c26242ba247ebd5656c430b01943b24a728 (diff) | |
| parent | 9392d9001aff32b293b587f531e08a54f534b2c2 (diff) | |
| download | tcl-f5299fe91b8bca422e3a5725a70db8cd134467ab.zip tcl-f5299fe91b8bca422e3a5725a70db8cd134467ab.tar.gz tcl-f5299fe91b8bca422e3a5725a70db8cd134467ab.tar.bz2 | |
merge 8.6
| -rw-r--r-- | generic/tclCmdMZ.c | 14 | ||||
| -rw-r--r-- | generic/tclInt.h | 7 |
2 files changed, 14 insertions, 7 deletions
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c index 455b44c..cdc1e28 100644 --- a/generic/tclCmdMZ.c +++ b/generic/tclCmdMZ.c @@ -4164,14 +4164,14 @@ Tcl_TimeRateObjCmd( register Tcl_Obj *objPtr; register int result, i; Tcl_Obj *calibrate = NULL, *direct = NULL; - Tcl_WideUInt count = 0; /* Holds repetition count */ + TclWideMUInt count = 0; /* Holds repetition count */ Tcl_WideInt maxms = WIDE_MIN; /* Maximal running time (in milliseconds) */ - Tcl_WideUInt maxcnt = WIDE_MAX; + TclWideMUInt maxcnt = WIDE_MAX; /* Maximal count of iterations. */ - Tcl_WideUInt threshold = 1; /* Current threshold for check time (faster + TclWideMUInt threshold = 1; /* Current threshold for check time (faster * repeat count without time check) */ - Tcl_WideUInt maxIterTm = 1; /* Max time of some iteration as max + TclWideMUInt maxIterTm = 1; /* Max time of some iteration as max * threshold, additionally avoiding divide to * zero (i.e., never < 1) */ unsigned short factor = 50; /* Factor (4..50) limiting threshold to avoid @@ -4546,13 +4546,13 @@ Tcl_TimeRateObjCmd( { Tcl_Obj *objarr[8], **objs = objarr; - Tcl_WideUInt usec, val; + TclWideMUInt usec, val; int digits; /* * Absolute execution time in microseconds or in wide clicks. */ - usec = (Tcl_WideUInt)(middle - start); + usec = (TclWideMUInt)(middle - start); #ifdef TCL_WIDE_CLICKS /* @@ -4581,7 +4581,7 @@ Tcl_TimeRateObjCmd( * Estimate the time of overhead (microsecs). */ - Tcl_WideUInt curOverhead = overhead * count; + TclWideMUInt curOverhead = overhead * count; if (usec > curOverhead) { usec -= curOverhead; diff --git a/generic/tclInt.h b/generic/tclInt.h index 80b4493..42a9044 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -3272,6 +3272,13 @@ MODULE_SCOPE void TclInitThreadStorage(void); MODULE_SCOPE void TclFinalizeThreadDataThread(void); MODULE_SCOPE void TclFinalizeThreadStorage(void); +/* TclWideMUInt -- wide integer used for measurement calculations: */ +#if (!defined(_WIN32) || !defined(_MSC_VER) || (_MSC_VER >= 1400)) +# define TclWideMUInt Tcl_WideUInt +#else +/* older MSVS may not allow conversions between unsigned __int64 and double) */ +# define TclWideMUInt Tcl_WideInt +#endif #ifdef TCL_WIDE_CLICKS MODULE_SCOPE Tcl_WideInt TclpGetWideClicks(void); MODULE_SCOPE double TclpWideClicksToNanoseconds(Tcl_WideInt clicks); |