Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch dgp-eventmark Excluding Merge-Ins
This is equivalent to a diff from 7c8c5bd4e1 to 55e837cbfc
|
2015-03-26
| ||
| 17:26 | Make sure any new [thread::configure -eventmark] setting actually has an effect on blocks that are currently active. Leaf check-in: 55e837cbfc user: dgp tags: dgp-eventmark | |
| 17:00 | Revise the compile-time version/feature checking for improved clarity and correctness. check-in: 94b0e5de65 user: mistachkin tags: trunk | |
| 16:48 | First pass at repairing the broken -eventmark management. check-in: 0fea2d083e user: dgp tags: dgp-eventmark | |
|
2015-03-09
| ||
| 20:21 | Merge trunk check-in: 2cac05e016 user: jan.nijtmans tags: novem-support | |
| 19:34 | merge trunk check-in: 93f406a21f user: jan.nijtmans tags: novem | |
|
2015-03-06
| ||
| 19:13 | Update `make dist` target for the configure.in rename. check-in: 7c8c5bd4e1 user: dgp tags: trunk, thread-2-7-2 | |
|
2015-01-23
| ||
| 18:30 | Bump to Thread 2.7.2 check-in: 47891b2f97 user: dgp tags: trunk | |
Changes to generic/threadCmd.c.
| ︙ | ︙ | |||
2830 2831 2832 2833 2834 2835 2836 |
/*
* Process events until signaled to stop.
*/
while (canrun) {
| < < < < < < < < < < < < | 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 |
/*
* Process events until signaled to stop.
*/
while (canrun) {
/*
* Attempt to process one event, blocking forever until an
* event is actually received. The event processed may cause
* a script in progress to be canceled or exceed its limit;
* therefore, check for these conditions if we are able to
* (i.e. we are running in a high enough version of Tcl).
*/
|
| ︙ | ︙ | |||
3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 |
tsdPtr->flags |= THREAD_FLAGS_INERROR;
if (tsdPtr->refCount == 0) {
tsdPtr->flags |= THREAD_FLAGS_STOPPED;
}
}
Tcl_MutexUnlock(&threadMutex);
}
return 1;
}
/*
*----------------------------------------------------------------------
*
| > > > > > > > > > | 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 |
tsdPtr->flags |= THREAD_FLAGS_INERROR;
if (tsdPtr->refCount == 0) {
tsdPtr->flags |= THREAD_FLAGS_STOPPED;
}
}
Tcl_MutexUnlock(&threadMutex);
}
if (tsdPtr->maxEventsCount) {
Tcl_MutexLock(&threadMutex);
tsdPtr->eventsPending--;
if (tsdPtr->eventsPending <= tsdPtr->maxEventsCount) {
Tcl_ConditionNotify(&tsdPtr->doOneEvent);
}
Tcl_MutexUnlock(&threadMutex);
}
return 1;
}
/*
*----------------------------------------------------------------------
*
|
| ︙ | ︙ | |||
3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 |
&& !strncmp(option,"-eventmark", len)) {
if (sscanf(value, "%d", &tsdPtr->maxEventsCount) != 1) {
Tcl_AppendResult(interp, "expected integer but got \"",
value, "\"", NULL);
Tcl_MutexUnlock(&threadMutex);
return TCL_ERROR;
}
} else if (len > 2 && option[1] == 'u'
&& !strncmp(option,"-unwindonerror", len)) {
int flag = 0;
if (Tcl_GetBoolean(interp, value, &flag) != TCL_OK) {
Tcl_MutexUnlock(&threadMutex);
return TCL_ERROR;
}
| > > > > > > > | 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 |
&& !strncmp(option,"-eventmark", len)) {
if (sscanf(value, "%d", &tsdPtr->maxEventsCount) != 1) {
Tcl_AppendResult(interp, "expected integer but got \"",
value, "\"", NULL);
Tcl_MutexUnlock(&threadMutex);
return TCL_ERROR;
}
if (tsdPtr->maxEventsCount == 0) {
tsdPtr->eventsPending = 0;
}
if (tsdPtr->maxEventsCount == 0 ||
tsdPtr->eventsPending <= tsdPtr->maxEventsCount) {
Tcl_ConditionNotify(&tsdPtr->doOneEvent);
}
} else if (len > 2 && option[1] == 'u'
&& !strncmp(option,"-unwindonerror", len)) {
int flag = 0;
if (Tcl_GetBoolean(interp, value, &flag) != TCL_OK) {
Tcl_MutexUnlock(&threadMutex);
return TCL_ERROR;
}
|
| ︙ | ︙ |