Tcl Source Code

Check-in [d4b7c74d47]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove all use of thread::release from the thread 7.x tests, replacing it with a script that can easily cause 'stuck' threads to self-destruct for those test cases that require it. Also, make the error message handling far more robust by keeping track of every asynchronous error.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: d4b7c74d4788f4b7c32b3684c28c8c29f7c2d92a
User & Date: mistachkin 2011-11-18 12:11:33
Context
2011-11-21
01:26
Remove unnecessary after calls from the thread tests. Make error message matching more robust for... check-in: 4466e490d8 user: mistachkin tags: trunk
2011-11-18
12:11
Remove all use of thread::release from the thread 7.x tests, replacing it with a script that can eas... check-in: d4b7c74d47 user: mistachkin tags: trunk
04:57
Refactor all the remaining thread-7.x tests that were using [testthread]. Note that this test file ... check-in: 3344b33e21 user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.









1
2
3
4
5
6
7








2011-11-17  Joe Mistachkin  <[email protected]>

	* tests/thread.test: Refactor all the remaining thread-7.x tests that
	were using [testthread].  Note that this test file now requires the
	very latest version of the Thread package to pass all tests.  In
	addition, the thread-7.18 and thread-7.19 tests have been flagged as
	knownBug because they cannot pass without modifications to the [expr]
>
>
>
>
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
2011-11-18  Joe Mistachkin  <[email protected]>

	* tests/thread.test: Remove all use of thread::release from the thread
	7.x tests, replacing it with a script that can easily cause "stuck"
	threads to self-destruct for those test cases that require it.  Also,
	make the error message handling far more robust by keeping track of
	every asynchronous error.

2011-11-17  Joe Mistachkin  <[email protected]>

	* tests/thread.test: Refactor all the remaining thread-7.x tests that
	were using [testthread].  Note that this test file now requires the
	very latest version of the Thread package to pass all tests.  In
	addition, the thread-7.18 and thread-7.19 tests have been flagged as
	knownBug because they cannot pass without modifications to the [expr]

Changes to tests/thread.test.

21
22
23
24
25
26
27











28
29
30
31
32
33
34
35
36
37
38
39
testConstraint testthread [expr {[info commands testthread] != {}}]

# Some tests require the Thread package

testConstraint thread [expr {0 == [catch {package require Thread 2.7}]}]

testConstraint notValgrind [expr {![testConstraint valgrind]}]












proc ThreadError {id info} {
    global threadId threadError
    set threadId $id
    set threadError $info
}

if {[testConstraint thread]} {
    thread::errorproc ThreadError
}

if {[testConstraint testthread]} {







>
>
>
>
>
>
>
>
>
>
>




|







21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
testConstraint testthread [expr {[info commands testthread] != {}}]

# Some tests require the Thread package

testConstraint thread [expr {0 == [catch {package require Thread 2.7}]}]

testConstraint notValgrind [expr {![testConstraint valgrind]}]

set threadSuperKillScript {
    rename catch ""
    rename while ""
    rename update ""
    thread::release
}

proc getThreadError { info } {
    return [lindex [split [lindex $info 0] \n] 0]
}

proc ThreadError {id info} {
    global threadId threadError
    set threadId $id
    lappend threadError($id) $info
}

if {[testConstraint thread]} {
    thread::errorproc ThreadError
}

if {[testConstraint testthread]} {
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.5 {cancel: pure inside-command loop} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.5 {cancel: pure inside-command loop} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.6 {cancel: pure bytecode loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.6 {cancel: pure bytecode loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.7 {cancel: pure inside-command loop -unwind} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.7 {cancel: pure inside-command loop -unwind} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.8 {cancel: pure bytecode loop custom result} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.8 {cancel: pure bytecode loop custom result} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel $serverthread "the eval was canceled"]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {the eval was canceled}}
test thread-7.9 {cancel: pure inside-command loop custom result} -constraints {
    thread
} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted







|







369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel $serverthread "the eval was canceled"]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {the eval was canceled}}
test thread-7.9 {cancel: pure inside-command loop custom result} -constraints {
    thread
} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel $serverthread "the eval was canceled"]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {the eval was canceled}}
test thread-7.10 {cancel: pure bytecode loop custom result -unwind} -constraints {
    thread
} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted







|







401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel $serverthread "the eval was canceled"]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {the eval was canceled}}
test thread-7.10 {cancel: pure bytecode loop custom result -unwind} -constraints {
    thread
} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread "the eval was unwound"]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {the eval was unwound}}
test thread-7.11 {cancel: pure inside-command loop custom result -unwind} -constraints {
    thread
} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted







|







432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread "the eval was unwound"]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {the eval was unwound}}
test thread-7.11 {cancel: pure inside-command loop custom result -unwind} -constraints {
    thread
} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread "the eval was unwound"]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {the eval was unwound}}
test thread-7.12 {cancel: after} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread "the eval was unwound"]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {the eval was unwound}}
test thread-7.12 {cancel: after} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.13 {cancel: after -unwind} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.13 {cancel: after -unwind} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.14 {cancel: vwait} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.14 {cancel: vwait} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.15 {cancel: vwait -unwind} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.15 {cancel: vwait -unwind} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.16 {cancel: expr} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.16 {cancel: expr} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.17 {cancel: expr -unwind} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.17 {cancel: expr -unwind} -constraints thread -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.18 {cancel: expr bignum} {thread knownBug} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {







|







617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
    # wait for other thread to signal "ready to cancel"
    vwait threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.18 {cancel: expr bignum} {thread knownBug} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
    vwait ::threadIdStarted; after 1000
    set res [thread::cancel $serverthread]
    thread::join $serverthread; # WARNING: Never returns due to bug (see above).
    list $res [expr {[info exists ::threadIdStarted] ? \
                  $::threadIdStarted == $serverthread : 0}] \
              [expr {[info exists ::threadId] ? \
                  $::threadId == $serverthread : 0}] \
              [expr {[info exists ::threadError] ? \
                  [lindex [split $::threadError \n] 0] : "" }]
} {{} 1 0 {}}
test thread-7.19 {cancel: expr bignum -unwind} {thread knownBug} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
        set i [interp create]
	$i eval "package require -exact Thread [package present Thread]"







|
|







649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
    vwait ::threadIdStarted; after 1000
    set res [thread::cancel $serverthread]
    thread::join $serverthread; # WARNING: Never returns due to bug (see above).
    list $res [expr {[info exists ::threadIdStarted] ? \
                  $::threadIdStarted == $serverthread : 0}] \
              [expr {[info exists ::threadId] ? \
                  $::threadId == $serverthread : 0}] \
              [expr {[info exists ::threadError($serverthread)] ? \
                  [getThreadError $::threadError($serverthread)] : "" }]
} {{} 1 0 {}}
test thread-7.19 {cancel: expr bignum -unwind} {thread knownBug} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
        set i [interp create]
	$i eval "package require -exact Thread [package present Thread]"
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
    vwait ::threadIdStarted; after 1000
    set res [thread::cancel -unwind $serverthread]
    thread::join $serverthread; # WARNING: Never returns due to bug (see above).
    list $res [expr {[info exists ::threadIdStarted] ? \
                  $::threadIdStarted == $serverthread : 0}] \
              [expr {[info exists ::threadId] ? \
                  $::threadId == $serverthread : 0}] \
              [expr {[info exists ::threadError] ? \
                  [lindex [split $::threadError \n] 0] : "" }]
} {{} 1 0 {}}
test thread-7.20 {cancel: subst} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
	set i [interp create]







|
|







680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
    vwait ::threadIdStarted; after 1000
    set res [thread::cancel -unwind $serverthread]
    thread::join $serverthread; # WARNING: Never returns due to bug (see above).
    list $res [expr {[info exists ::threadIdStarted] ? \
                  $::threadIdStarted == $serverthread : 0}] \
              [expr {[info exists ::threadId] ? \
                  $::threadId == $serverthread : 0}] \
              [expr {[info exists ::threadError($serverthread)] ? \
                  [getThreadError $::threadError($serverthread)] : "" }]
} {{} 1 0 {}}
test thread-7.20 {cancel: subst} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
	set i [interp create]
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.21 {cancel: subst -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.21 {cancel: subst -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.22 {cancel: slave interp} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.22 {cancel: slave interp} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.23 {cancel: slave interp -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.23 {cancel: slave interp -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.24 {cancel: nested catch inside pure bytecode loop} {thread} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {







|







791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.24 {cancel: nested catch inside pure bytecode loop} {thread} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
815
816
817
818
819
820
821

822
823
824
825
826
827
828
829
830
831
832
833
834
835
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted; after 1000
    set res [thread::cancel $serverthread]
    after 1000; # wait for ThreadErrorProc to be called.

    catch {thread::release $serverthread}
    list $res [expr {[info exists ::threadIdStarted] ? \
		  $::threadIdStarted == $serverthread : 0}] \
	      [expr {[info exists ::threadId] ? \
		  $::threadId == $serverthread : 0}] \
	      [expr {[info exists ::threadError] ? \
		  [lindex [split $::threadError \n] 0] : "" }]
} {{} 1 0 {}}
test thread-7.25 {cancel: nested catch inside pure inside-command loop} {thread} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
	proc foobar {} {
	    set catch catch







>
|




|
|







826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted; after 1000
    set res [thread::cancel $serverthread]
    after 1000; # wait for ThreadErrorProc to be called.
    thread::send $serverthread $::threadSuperKillScript
    thread::join $serverthread
    list $res [expr {[info exists ::threadIdStarted] ? \
		  $::threadIdStarted == $serverthread : 0}] \
	      [expr {[info exists ::threadId] ? \
		  $::threadId == $serverthread : 0}] \
	      [expr {[info exists ::threadError($serverthread)] ? \
		  [getThreadError $::threadError($serverthread)] : "" }]
} {{} 1 0 {}}
test thread-7.25 {cancel: nested catch inside pure inside-command loop} {thread} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
	proc foobar {} {
	    set catch catch
856
857
858
859
860
861
862

863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted; after 1000
    set res [thread::cancel $serverthread]
    after 1000; # wait for ThreadErrorProc to be called.

    catch {thread::release $serverthread}
    list $res [expr {[info exists ::threadIdStarted] ? \
		  $::threadIdStarted == $serverthread : 0}] \
	      [expr {[info exists ::threadId] ? \
		  $::threadId == $serverthread : 0}] \
	      [expr {[info exists ::threadError] ? \
		  [lindex [split $::threadError \n] 0] : "" }]
} {{} 1 0 {}}
test thread-7.26 {cancel: send async cancel bad interp path} {thread} {
    unset -nocomplain ::threadIdStarted
    set serverthread [thread::create -preserved \
	[string map [list %ID% [thread::id]] {
	proc foobar {} {
	    while {1} {
		if {![info exists foo]} then {
		    # signal the primary thread that we are ready
		    # to be canceled now (we are running).
		    thread::send %ID% [list set ::threadIdStarted [thread::id]]
		    set foo 1
		}
		update
	    }
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    catch {thread::send $serverthread {interp cancel -- bad}} msg
    thread::send -async $serverthread {interp cancel -unwind}
    thread::release -wait $serverthread
    list [expr {$::threadIdStarted == $serverthread}] $msg
} {1 {could not find interpreter "bad"}}
test thread-7.27 {cancel: send async cancel -- switch} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {







>
|




|
|



|


















|







868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted; after 1000
    set res [thread::cancel $serverthread]
    after 1000; # wait for ThreadErrorProc to be called.
    thread::send $serverthread $::threadSuperKillScript
    thread::join $serverthread
    list $res [expr {[info exists ::threadIdStarted] ? \
		  $::threadIdStarted == $serverthread : 0}] \
	      [expr {[info exists ::threadId] ? \
		  $::threadId == $serverthread : 0}] \
	      [expr {[info exists ::threadError($serverthread)] ? \
		  [getThreadError $::threadError($serverthread)] : "" }]
} {{} 1 0 {}}
test thread-7.26 {cancel: send async cancel bad interp path} {thread} {
    unset -nocomplain ::threadIdStarted
    set serverthread [thread::create -joinable \
	[string map [list %ID% [thread::id]] {
	proc foobar {} {
	    while {1} {
		if {![info exists foo]} then {
		    # signal the primary thread that we are ready
		    # to be canceled now (we are running).
		    thread::send %ID% [list set ::threadIdStarted [thread::id]]
		    set foo 1
		}
		update
	    }
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    catch {thread::send $serverthread {interp cancel -- bad}} msg
    thread::send -async $serverthread {interp cancel -unwind}
    thread::join $serverthread
    list [expr {$::threadIdStarted == $serverthread}] $msg
} {1 {could not find interpreter "bad"}}
test thread-7.27 {cancel: send async cancel -- switch} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::send -async $serverthread {interp cancel -- -unwind}]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.28 {cancel: send async cancel nested catch inside pure bytecode loop} {thread} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {







|







930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::send -async $serverthread {interp cancel -- -unwind}]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval canceled}}
test thread-7.28 {cancel: send async cancel nested catch inside pure bytecode loop} {thread} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
952
953
954
955
956
957
958

959
960
961
962
963
964
965
966
967
968
969
970
971
972
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted; after 1000
    set res [thread::send -async $serverthread {interp cancel}]
    after 1000; # wait for ThreadErrorProc to be called.

    catch {thread::release $serverthread}
    list $res [expr {[info exists ::threadIdStarted] ? \
		  $::threadIdStarted == $serverthread : 0}] \
	      [expr {[info exists ::threadId] ? \
		  $::threadId == $serverthread : 0}] \
	      [expr {[info exists ::threadError] ? \
		  [lindex [split $::threadError \n] 0] : "" }]
} {{} 1 0 {}}
test thread-7.29 {cancel: send async cancel nested catch pure inside-command loop} {thread} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
	proc foobar {} {
	    set catch catch







>
|




|
|







965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted; after 1000
    set res [thread::send -async $serverthread {interp cancel}]
    after 1000; # wait for ThreadErrorProc to be called.
    thread::send $serverthread $::threadSuperKillScript
    thread::join $serverthread
    list $res [expr {[info exists ::threadIdStarted] ? \
		  $::threadIdStarted == $serverthread : 0}] \
	      [expr {[info exists ::threadId] ? \
		  $::threadId == $serverthread : 0}] \
	      [expr {[info exists ::threadError($serverthread)] ? \
		  [getThreadError $::threadError($serverthread)] : "" }]
} {{} 1 0 {}}
test thread-7.29 {cancel: send async cancel nested catch pure inside-command loop} {thread} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
	proc foobar {} {
	    set catch catch
993
994
995
996
997
998
999

1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted; after 1000
    set res [thread::send -async $serverthread {interp cancel}]
    after 1000; # wait for ThreadErrorProc to be called.

    catch {thread::release $serverthread}
    list $res [expr {[info exists ::threadIdStarted] ? \
		  $::threadIdStarted == $serverthread : 0}] \
	      [expr {[info exists ::threadId] ? \
		  $::threadId == $serverthread : 0}] \
	      [expr {[info exists ::threadError] ? \
		  [lindex [split $::threadError \n] 0] : "" }]
} {{} 1 0 {}}
test thread-7.30 {cancel: send async thread cancel nested catch inside pure bytecode loop} {thread} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
	proc foobar {} {
	    while {1} {







>
|




|
|







1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted; after 1000
    set res [thread::send -async $serverthread {interp cancel}]
    after 1000; # wait for ThreadErrorProc to be called.
    thread::send $serverthread $::threadSuperKillScript
    thread::join $serverthread
    list $res [expr {[info exists ::threadIdStarted] ? \
		  $::threadIdStarted == $serverthread : 0}] \
	      [expr {[info exists ::threadId] ? \
		  $::threadId == $serverthread : 0}] \
	      [expr {[info exists ::threadError($serverthread)] ? \
		  [getThreadError $::threadError($serverthread)] : "" }]
} {{} 1 0 {}}
test thread-7.30 {cancel: send async thread cancel nested catch inside pure bytecode loop} {thread} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
	proc foobar {} {
	    while {1} {
1032
1033
1034
1035
1036
1037
1038

1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted; after 1000
    set res [thread::send -async $serverthread {thread::cancel [thread::id]}]
    after 1000; # wait for ThreadErrorProc to be called.

    catch {thread::release $serverthread}
    list $res [expr {[info exists ::threadIdStarted] ? \
		  $::threadIdStarted == $serverthread : 0}] \
	      [expr {[info exists ::threadId] ? \
		  $::threadId == $serverthread : 0}] \
	      [expr {[info exists ::threadError] ? \
		  [lindex [split $::threadError \n] 0] : "" }]
} {{} 1 0 {}}
test thread-7.31 {cancel: send async thread cancel nested catch pure inside-command loop} {thread} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
	proc foobar {} {
	    set catch catch







>
|




|
|







1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted; after 1000
    set res [thread::send -async $serverthread {thread::cancel [thread::id]}]
    after 1000; # wait for ThreadErrorProc to be called.
    thread::send $serverthread $::threadSuperKillScript
    thread::join $serverthread
    list $res [expr {[info exists ::threadIdStarted] ? \
		  $::threadIdStarted == $serverthread : 0}] \
	      [expr {[info exists ::threadId] ? \
		  $::threadId == $serverthread : 0}] \
	      [expr {[info exists ::threadError($serverthread)] ? \
		  [getThreadError $::threadError($serverthread)] : "" }]
} {{} 1 0 {}}
test thread-7.31 {cancel: send async thread cancel nested catch pure inside-command loop} {thread} {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
	proc foobar {} {
	    set catch catch
1073
1074
1075
1076
1077
1078
1079

1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted; after 1000
    set res [thread::send -async $serverthread {thread::cancel [thread::id]}]
    after 1000; # wait for ThreadErrorProc to be called.

    catch {thread::release $serverthread}
    list $res [expr {[info exists ::threadIdStarted] ? \
		  $::threadIdStarted == $serverthread : 0}] \
	      [expr {[info exists ::threadId] ? \
		  $::threadId == $serverthread : 0}] \
	      [expr {[info exists ::threadError] ? \
		  [lindex [split $::threadError \n] 0] : "" }]
} {{} 1 0 {}}
test thread-7.32 {cancel: nested catch inside pure bytecode loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
	proc foobar {} {







>
|




|
|







1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
	}
	foobar
    }]]
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted; after 1000
    set res [thread::send -async $serverthread {thread::cancel [thread::id]}]
    after 1000; # wait for ThreadErrorProc to be called.
    thread::send $serverthread $::threadSuperKillScript
    thread::join $serverthread
    list $res [expr {[info exists ::threadIdStarted] ? \
		  $::threadIdStarted == $serverthread : 0}] \
	      [expr {[info exists ::threadId] ? \
		  $::threadId == $serverthread : 0}] \
	      [expr {[info exists ::threadError($serverthread)] ? \
		  [getThreadError $::threadError($serverthread)] : "" }]
} {{} 1 0 {}}
test thread-7.32 {cancel: nested catch inside pure bytecode loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
	    [string map [list %ID% [thread::id]] {
	proc foobar {} {
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.33 {cancel: nested catch inside pure inside-command loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.33 {cancel: nested catch inside pure inside-command loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.34 {cancel: send async cancel nested catch inside pure bytecode loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::cancel -unwind $serverthread]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.34 {cancel: send async cancel nested catch inside pure bytecode loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::send -async $serverthread {interp cancel -unwind}]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.35 {cancel: send async cancel nested catch inside pure inside-command loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::send -async $serverthread {interp cancel -unwind}]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.35 {cancel: send async cancel nested catch inside pure inside-command loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::send -async $serverthread {interp cancel -unwind}]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.36 {cancel: send async thread cancel nested catch inside pure bytecode loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::send -async $serverthread {interp cancel -unwind}]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.36 {cancel: send async thread cancel nested catch inside pure bytecode loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::send -async $serverthread {thread::cancel -unwind [thread::id]}]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.37 {cancel: send async thread cancel nested catch inside pure inside-command loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \







|







1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::send -async $serverthread {thread::cancel -unwind [thread::id]}]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}
test thread-7.37 {cancel: send async thread cancel nested catch inside pure inside-command loop -unwind} -constraints {thread} -setup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -body {
    set serverthread [thread::create -joinable \
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::send -async $serverthread {thread::cancel -unwind [thread::id]}]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [lindex [split $::threadError \n] 0]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}

# cleanup
::tcltest::cleanupTests
return







|







1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
    # wait for other thread to signal "ready to cancel"
    vwait ::threadIdStarted
    set res [thread::send -async $serverthread {thread::cancel -unwind [thread::id]}]
    vwait ::threadId
    thread::join $serverthread
    list $res [expr {$::threadIdStarted == $serverthread}] \
	      [expr {$::threadId == $serverthread}] \
	      [getThreadError $::threadError($serverthread)]
} -cleanup {
    unset -nocomplain ::threadError ::threadId ::threadIdStarted
} -result {{} 1 1 {eval unwound}}

# cleanup
::tcltest::cleanupTests
return