diff options
| author | sebres <sebres@users.sourceforge.net> | 2019-03-05 18:23:26 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2019-03-05 18:23:26 (GMT) |
| commit | f456cd9b3e6743bf15cd756bfc116153fa95605c (patch) | |
| tree | 85e4e3121d93802d9d5df50157ead27f68ff7a43 /generic/tclInt.h | |
| parent | 8c315fd31ff823b217374dd32577e04c42674249 (diff) | |
| parent | b930511d5b774c13f2cd22d7820ad0acf7069c39 (diff) | |
| download | tcl-f456cd9b3e6743bf15cd756bfc116153fa95605c.zip tcl-f456cd9b3e6743bf15cd756bfc116153fa95605c.tar.gz tcl-f456cd9b3e6743bf15cd756bfc116153fa95605c.tar.bz2 | |
merge 8.7 (TIP#527, New measurement facilities in TCL: New command timerate, performance test suite)
Diffstat (limited to 'generic/tclInt.h')
| -rw-r--r-- | generic/tclInt.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 6bd1674..d999603 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -2807,8 +2807,6 @@ struct Tcl_LoadHandle_ { #define TCL_DD_SHORTEST 0x4 /* Use the shortest possible string */ -#define TCL_DD_STEELE 0x5 - /* Use the original Steele&White algorithm */ #define TCL_DD_E_FORMAT 0x2 /* Use a fixed-length string of digits, * suitable for E format*/ @@ -2824,10 +2822,6 @@ struct Tcl_LoadHandle_ { #define TCL_DD_CONVERSION_TYPE_MASK 0x3 /* Mask to isolate the conversion type */ -#define TCL_DD_STEELE0 0x1 - /* 'Steele&White' after masking */ -#define TCL_DD_SHORTEST0 0x0 - /* 'Shortest possible' after masking */ /* *---------------------------------------------------------------- @@ -3194,10 +3188,22 @@ MODULE_SCOPE int TclpLoadMemory(Tcl_Interp *interp, void *buffer, MODULE_SCOPE void TclInitThreadStorage(void); MODULE_SCOPE void TclFinalizeThreadDataThread(void); MODULE_SCOPE void TclFinalizeThreadStorage(void); + #ifdef TCL_WIDE_CLICKS MODULE_SCOPE Tcl_WideInt TclpGetWideClicks(void); MODULE_SCOPE double TclpWideClicksToNanoseconds(Tcl_WideInt clicks); +MODULE_SCOPE double TclpWideClickInMicrosec(void); +#else +# ifdef _WIN32 +# define TCL_WIDE_CLICKS 1 +MODULE_SCOPE Tcl_WideInt TclpGetWideClicks(void); +MODULE_SCOPE double TclpWideClickInMicrosec(void); +# define TclpWideClicksToNanoseconds(clicks) \ + ((double)(clicks) * TclpWideClickInMicrosec() * 1000) +# endif #endif +MODULE_SCOPE Tcl_WideInt TclpGetMicroseconds(void); + MODULE_SCOPE int TclZlibInit(Tcl_Interp *interp); MODULE_SCOPE void * TclpThreadCreateKey(void); MODULE_SCOPE void TclpThreadDeleteKey(void *keyPtr); @@ -3468,6 +3474,9 @@ MODULE_SCOPE int Tcl_ThrowObjCmd(void *dummy, Tcl_Interp *interp, MODULE_SCOPE int Tcl_TimeObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); +MODULE_SCOPE int Tcl_TimeRateObjCmd(void *clientData, + Tcl_Interp *interp, int objc, + Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_TraceObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); |