summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generic/tclCmdAH.c2
-rw-r--r--generic/tclIO.c8
-rw-r--r--generic/tclOOInfo.c2
-rw-r--r--generic/tclTest.c6
-rw-r--r--generic/tclZlib.c14
-rw-r--r--tests/cmdMZ.test15
-rw-r--r--tests/ioTrans.test2
7 files changed, 27 insertions, 22 deletions
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index d6e98a5..d2f30dd 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -1466,7 +1466,7 @@ FileAttrSizeCmd(
if (GetStatBuf(interp, objv[1], Tcl_FSStat, &buf) != TCL_OK) {
return TCL_ERROR;
}
- Tcl_SetObjResult(interp, Tcl_NewWideIntObj((Tcl_WideInt) buf.st_size));
+ Tcl_SetObjResult(interp, Tcl_NewWideIntObj(buf.st_size));
return TCL_OK;
}
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 2d8b945..96a6d33 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -9383,7 +9383,7 @@ TclCopyChannel(
csPtr->readFlags = readFlags;
csPtr->writeFlags = writeFlags;
csPtr->toRead = toRead;
- csPtr->total = (Tcl_WideInt) 0;
+ csPtr->total = 0;
csPtr->interp = interp;
if (cmdPtr) {
Tcl_IncrRefCount(cmdPtr);
@@ -9706,7 +9706,7 @@ CopyData(
Tcl_IncrRefCount(bufObj);
}
- while (csPtr->toRead != (Tcl_WideInt) 0) {
+ while (csPtr->toRead != 0) {
/*
* Check for unreported background errors.
*/
@@ -9745,8 +9745,8 @@ CopyData(
* Read up to bufSize characters.
*/
- if ((csPtr->toRead == (Tcl_WideInt) -1)
- || (csPtr->toRead > (Tcl_WideInt) csPtr->bufSize)) {
+ if ((csPtr->toRead == -1)
+ || (csPtr->toRead > (Tcl_WideInt)csPtr->bufSize)) {
sizeb = csPtr->bufSize;
} else {
sizeb = csPtr->toRead;
diff --git a/generic/tclOOInfo.c b/generic/tclOOInfo.c
index be329d7..f8b7ddd 100644
--- a/generic/tclOOInfo.c
+++ b/generic/tclOOInfo.c
@@ -1909,7 +1909,7 @@ PropNameCompare(
Tcl_Obj *first = *(Tcl_Obj **) a;
Tcl_Obj *second = *(Tcl_Obj **) b;
- return strcmp(Tcl_GetString(first), Tcl_GetString(second));
+ return strcmp(TclGetString(first), TclGetString(second));
}
static void
diff --git a/generic/tclTest.c b/generic/tclTest.c
index b224797..795310d 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -3539,7 +3539,7 @@ TestlinkCmd(
return TCL_ERROR;
}
Tcl_DecrRefCount(tmp);
- uwideVar = (Tcl_WideUInt) w;
+ uwideVar = (Tcl_WideUInt)w;
}
} else if (strcmp(argv[1], "update") == 0) {
int v;
@@ -3656,7 +3656,7 @@ TestlinkCmd(
return TCL_ERROR;
}
Tcl_DecrRefCount(tmp);
- uwideVar = (Tcl_WideUInt) w;
+ uwideVar = (Tcl_WideUInt)w;
Tcl_UpdateLinkedVar(interp, "uwide");
}
} else {
@@ -6312,7 +6312,7 @@ TestChannelCmd(
}
Tcl_SetObjResult(interp, Tcl_NewWideIntObj(
- (Tcl_WideInt) (size_t) Tcl_GetChannelThread(chan)));
+ (Tcl_WideInt)(size_t)Tcl_GetChannelThread(chan)));
return TCL_OK;
}
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index ff360d6..0c11bb4 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -1148,7 +1148,7 @@ int
Tcl_ZlibStreamChecksum(
Tcl_ZlibStream zshandle) /* As obtained from Tcl_ZlibStreamInit */
{
- ZlibStreamHandle *zshPtr = (ZlibStreamHandle *) zshandle;
+ ZlibStreamHandle *zshPtr = (ZlibStreamHandle *)zshandle;
return zshPtr->stream.adler;
}
@@ -2018,8 +2018,8 @@ ZlibCmd(
if (objc < 4) {
start = Tcl_ZlibAdler32(0, NULL, 0);
}
- Tcl_SetObjResult(interp, Tcl_NewWideIntObj((Tcl_WideInt)
- (uLong) Tcl_ZlibAdler32(start, data, dlen)));
+ Tcl_SetObjResult(interp, Tcl_NewWideIntObj(
+ Tcl_ZlibAdler32(start, data, dlen)));
return TCL_OK;
case CMD_CRC: /* crc32 str ?startvalue?
* -> checksum */
@@ -2038,8 +2038,8 @@ ZlibCmd(
if (objc < 4) {
start = Tcl_ZlibCRC32(0, NULL, 0);
}
- Tcl_SetObjResult(interp, Tcl_NewWideIntObj((Tcl_WideInt)
- (uLong) Tcl_ZlibCRC32(start, data, dlen)));
+ Tcl_SetObjResult(interp, Tcl_NewWideIntObj(
+ Tcl_ZlibCRC32(start, data, dlen)));
return TCL_OK;
case CMD_DEFLATE: /* deflate data ?level?
* -> rawCompressedData */
@@ -2700,8 +2700,8 @@ ZlibStreamCmd(
Tcl_WrongNumArgs(interp, 2, objv, NULL);
return TCL_ERROR;
}
- Tcl_SetObjResult(interp, Tcl_NewWideIntObj((Tcl_WideInt)
- (uLong) Tcl_ZlibStreamChecksum(zstream)));
+ Tcl_SetObjResult(interp, Tcl_NewWideIntObj(
+ Tcl_ZlibStreamChecksum(zstream)));
return TCL_OK;
case zs_reset: /* $strm reset */
if (objc != 2) {
diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test
index da7ce5c..9af30bd 100644
--- a/tests/cmdMZ.test
+++ b/tests/cmdMZ.test
@@ -320,11 +320,15 @@ test cmdMZ-4.13 {Tcl_SplitObjCmd: basic split commands} {
# todo: rewrite this if monotonic clock is provided resp. command "after"
# gets microsecond accuracy (RFE [fdfbd5e10] gets merged):
proc _nrt_sleep {msec} {
- set usec [expr {$msec * 1000}]
set stime [clock microseconds]
- while {abs([clock microseconds] - $stime) < $usec} {
- # don't use after 0 unless it's NRT-capable, so yes - busy-wait (but it's more precise):
- # after 0
+ set usec [expr {$msec * 1000}]
+ set etime [expr {$stime + $usec}]
+ while {[set tm [clock microseconds]] < $etime} {
+ # don't use after 0 unless it's NRT-capable, so yes - busy-wait (but it's more precise):
+ # after 0
+ if {$tm < $stime} { # avoid too long delays by backwards time jumps, simply skip test
+ tcltest::Skip "time-jump?"
+ }
}
}
_nrt_sleep 0; # warm up (clock, compile, etc)
@@ -404,6 +408,9 @@ test cmdMZ-6.5b {Tcl_TimeRateObjCmd: result format without iterations} {
test cmdMZ-6.6 {Tcl_TimeRateObjCmd: slower commands take longer, but it remains almost the same time of measurement} -body {
set m1 [timerate {_nrt_sleep 0.01} 50]
set m2 [timerate {_nrt_sleep 1.00} 50]
+ if {[testConstraint valgrind] && ([lindex $m1 0] >= 100 || [lindex $m1 2] <= 500)} {
+ tcltest::Skip "too-slow-by-valgrind"
+ }
list [list \
[expr {[lindex $m1 0] < [lindex $m2 0]}] \
[expr {[lindex $m1 0] < 100}] \
diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index 45d2530..265520a 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -2096,8 +2096,6 @@ test iortrans.tf-11.0 {origin thread of moved transform gone} -setup {
thread::release $tidb
} -result {1 {Owner lost} 0 0 1 {Owner lost} 1 {Owner lost} 1 {Owner lost}}
-testConstraint notValgrind [expr {![testConstraint valgrind]}]
-
test iortrans.tf-11.1 {origin thread of moved transform destroyed during access} -setup {
#puts <<$tcltest::mainThread>>main
set tida [thread::create -preserved]; #puts <<$tida>>
generated by cgit v0.12 at 2025-12-10 01:03:09 (GMT)