Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch finalize Excluding Merge-Ins
This is equivalent to a diff from f7bbd700c9 to 25990db353
|
2012-04-23
| ||
| 20:31 | Backport bug fixes check-in: 695182249f user: dgp tags: thread-2-6-branch | |
|
2011-11-01
| ||
| 15:07 | Merge in bug fixes and finalization support check-in: 6067508840 user: dgp tags: trunk | |
|
2011-10-12
| ||
| 07:07 | Free the mutex prior to returning from ThreadFreeError. Closed-Leaf check-in: 25990db353 user: mistachkin tags: finalize | |
|
2011-09-26
| ||
| 11:41 | prepare for Visual Studio 11 check-in: 77f4eb07d4 user: jan.nijtmans tags: trunk | |
|
2011-09-23
| ||
| 14:16 | Stop leaking the errorProcString check-in: 4e5eaeef0c user: dgp tags: finalize | |
|
2011-09-12
| ||
| 22:58 | Support asynchronous script cancellation, per TIP #285 (i.e. thread::cancel). Necessary to replace use of testthread::cancel in the Tcl 8.6 test suite. check-in: 51cf545767 user: mistachkin tags: tip285 | |
|
2011-08-30
| ||
| 21:22 | New branch "finalize" where the attempts to finalize the Thread package are re-enabled and extended. Meant to be used in memory leak testing and similar debugging scenarios. Not committed to trunk since comments indicate only "the brave" would attempt such an unsolvable problem. check-in: 6558fb93bb user: dgp tags: finalize | |
|
2011-08-01
| ||
| 14:39 | Extend support to MSVC10. Thanks to Twylite. check-in: f7bbd700c9 user: dgp tags: trunk, thread-2-6-7 | |
|
2011-06-27
| ||
| 17:33 | Restore compatibility with the latest TEA 3.9 revisions. check-in: 3cd44c9189 user: dgp tags: trunk | |
Changes to generic/threadCmd.c.
| ︙ | ︙ | |||
280 281 282 283 284 285 286 287 288 289 290 291 292 293 | static void ThreadIdleProc _ANSI_ARGS_((ClientData clientData)); static void ThreadExitProc _ANSI_ARGS_((ClientData clientData)); static void ListRemove _ANSI_ARGS_((ThreadSpecificData *tsdPtr)); static void ListRemoveInner _ANSI_ARGS_((ThreadSpecificData *tsdPtr)); static void | > > > | 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 | static void ThreadIdleProc _ANSI_ARGS_((ClientData clientData)); static void ThreadExitProc _ANSI_ARGS_((ClientData clientData)); static void ThreadFreeError _ANSI_ARGS_((ClientData clientData)); static void ListRemove _ANSI_ARGS_((ThreadSpecificData *tsdPtr)); static void ListRemoveInner _ANSI_ARGS_((ThreadSpecificData *tsdPtr)); static void |
| ︙ | ︙ | |||
617 618 619 620 621 622 623 |
if (objc > 3) {
Tcl_WrongNumArgs(interp, 1, objv, "?-wait? ?threadId?");
return TCL_ERROR;
}
if (objc > 1) {
if (OPT_CMP(Tcl_GetString(objv[1]), "-wait")) {
wait = 1;
| > | | | > | 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 |
if (objc > 3) {
Tcl_WrongNumArgs(interp, 1, objv, "?-wait? ?threadId?");
return TCL_ERROR;
}
if (objc > 1) {
if (OPT_CMP(Tcl_GetString(objv[1]), "-wait")) {
wait = 1;
if (objc > 2) {
if (ThreadGetId(interp, objv[2], &thrId) != TCL_OK) {
return TCL_ERROR;
}
}
} else if (ThreadGetId(interp, objv[1], &thrId) != TCL_OK) {
return TCL_ERROR;
}
}
return ThreadReserve(interp, thrId, THREAD_RELEASE, wait);
}
|
| ︙ | ︙ | |||
1081 1082 1083 1084 1085 1086 1087 |
}
Tcl_MutexLock(&threadMutex);
if (objc == 1) {
if (errorProcString) {
Tcl_SetResult(interp, errorProcString, TCL_VOLATILE);
}
} else {
| < > > > > > > > > > > > > > > > > > > > | 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 |
}
Tcl_MutexLock(&threadMutex);
if (objc == 1) {
if (errorProcString) {
Tcl_SetResult(interp, errorProcString, TCL_VOLATILE);
}
} else {
if (errorProcString) {
Tcl_Free(errorProcString);
}
proc = Tcl_GetStringFromObj(objv[1], &len);
if (len == 0) {
errorThreadId = NULL;
errorProcString = NULL;
} else {
errorThreadId = Tcl_GetCurrentThread();
errorProcString = Tcl_Alloc(1+strlen(proc));
strcpy(errorProcString, proc);
Tcl_DeleteThreadExitHandler(ThreadFreeError, NULL);
Tcl_CreateThreadExitHandler(ThreadFreeError, NULL);
}
}
Tcl_MutexUnlock(&threadMutex);
return TCL_OK;
}
static void
ThreadFreeError(clientData)
ClientData clientData;
{
Tcl_MutexLock(&threadMutex);
if (errorThreadId != Tcl_GetCurrentThread()) {
Tcl_MutexUnlock(&threadMutex);
return;
}
Tcl_Free(errorProcString);
errorThreadId = NULL;
errorProcString = NULL;
Tcl_MutexUnlock(&threadMutex);
}
/*
*----------------------------------------------------------------------
*
* ThreadJoinObjCmd --
*
* This procedure is invoked to process the "thread::join" Tcl
|
| ︙ | ︙ | |||
2443 2444 2445 2446 2447 2448 2449 |
/*
* Short circut sends to ourself.
*/
if (thrId == Tcl_GetCurrentThread()) {
Tcl_MutexUnlock(&threadMutex);
if ((flags & THREAD_SEND_WAIT)) {
| | > > | 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 |
/*
* Short circut sends to ourself.
*/
if (thrId == Tcl_GetCurrentThread()) {
Tcl_MutexUnlock(&threadMutex);
if ((flags & THREAD_SEND_WAIT)) {
int code = (*send->execProc)(interp, (ClientData)send);
ThreadFreeProc((ClientData)send);
return code;
} else {
send->interp = interp;
Tcl_Preserve((ClientData)send->interp);
Tcl_DoWhenIdle((Tcl_IdleProc*)ThreadIdleProc, (ClientData)send);
return TCL_OK;
}
}
|
| ︙ | ︙ | |||
3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 |
ThreadSendData *sendPtr = (ThreadSendData*)clientData;
ret = (*sendPtr->execProc)(sendPtr->interp, (ClientData)sendPtr);
if (ret != TCL_OK) {
ThreadErrorProc(sendPtr->interp);
}
Tcl_Release((ClientData)sendPtr->interp);
}
/*
*----------------------------------------------------------------------
*
* TransferEventProc --
| > | 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 |
ThreadSendData *sendPtr = (ThreadSendData*)clientData;
ret = (*sendPtr->execProc)(sendPtr->interp, (ClientData)sendPtr);
if (ret != TCL_OK) {
ThreadErrorProc(sendPtr->interp);
}
ThreadFreeProc(clientData);
Tcl_Release((ClientData)sendPtr->interp);
}
/*
*----------------------------------------------------------------------
*
* TransferEventProc --
|
| ︙ | ︙ |
Changes to generic/threadSpCmd.c.
| ︙ | ︙ | |||
1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 |
*
* Side effects:
* Initializes shared hash table for storing sync primitive
* handles and pointers.
*
*----------------------------------------------------------------------
*/
int
Sp_Init (interp)
Tcl_Interp *interp; /* Interp where to create cmds */
{
SpBucket *bucketPtr;
if (!initOnce) {
Tcl_MutexLock(&initMutex);
if (!initOnce) {
int ii, buflen = sizeof(SpBucket) * (NUMSPBUCKETS);
char *buf = Tcl_Alloc(2 * buflen);
muxBuckets = (SpBucket*)(buf);
varBuckets = (SpBucket*)(buf + buflen);
for (ii = 0; ii < 2 * (NUMSPBUCKETS); ii++) {
bucketPtr = &muxBuckets[ii];
memset(bucketPtr, 0, sizeof(SpBucket));
Tcl_InitHashTable(&bucketPtr->handles, TCL_STRING_KEYS);
}
| > > > > > > > > > | 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 |
*
* Side effects:
* Initializes shared hash table for storing sync primitive
* handles and pointers.
*
*----------------------------------------------------------------------
*/
static void
SpFinalize(
ClientData clientData)
{
Tcl_Free((char *)clientData);
}
int
Sp_Init (interp)
Tcl_Interp *interp; /* Interp where to create cmds */
{
SpBucket *bucketPtr;
if (!initOnce) {
Tcl_MutexLock(&initMutex);
if (!initOnce) {
int ii, buflen = sizeof(SpBucket) * (NUMSPBUCKETS);
char *buf = Tcl_Alloc(2 * buflen);
Tcl_CreateExitHandler(SpFinalize, buf);
muxBuckets = (SpBucket*)(buf);
varBuckets = (SpBucket*)(buf + buflen);
for (ii = 0; ii < 2 * (NUMSPBUCKETS); ii++) {
bucketPtr = &muxBuckets[ii];
memset(bucketPtr, 0, sizeof(SpBucket));
Tcl_InitHashTable(&bucketPtr->handles, TCL_STRING_KEYS);
}
|
| ︙ | ︙ |
Changes to generic/threadSvCmd.c.
| ︙ | ︙ | |||
120 121 122 123 124 125 126 127 128 129 130 131 132 133 | static int DeleteContainer(Container*); static int FlushArray(Array*); static int DeleteArray(Array*); static void SvAllocateContainers(Bucket*); static void SvRegisterStdCommands(void); #ifdef SV_FINALIZE static void SvFinalizeContainers(Bucket*); static void SvFinalize(ClientData); #endif /* SV_FINALIZE */ static PsStore* GetPsStore(char *handle); | > | 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | static int DeleteContainer(Container*); static int FlushArray(Array*); static int DeleteArray(Array*); static void SvAllocateContainers(Bucket*); static void SvRegisterStdCommands(void); #define SV_FINALIZE #ifdef SV_FINALIZE static void SvFinalizeContainers(Bucket*); static void SvFinalize(ClientData); #endif /* SV_FINALIZE */ static PsStore* GetPsStore(char *handle); |
| ︙ | ︙ | |||
2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 |
* Create array of buckets and initialize each bucket
*/
if (buckets == NULL) {
Tcl_MutexLock(&bucketsMutex);
if (buckets == NULL) {
buckets = (Bucket *)Tcl_Alloc(sizeof(Bucket) * NUMBUCKETS);
for (i = 0; i < NUMBUCKETS; ++i) {
bucketPtr = &buckets[i];
memset(bucketPtr, 0, sizeof(Bucket));
Tcl_InitHashTable(&bucketPtr->arrays, TCL_STRING_KEYS);
Tcl_InitHashTable(&bucketPtr->handles, TCL_ONE_WORD_KEYS);
}
| > > | 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 |
* Create array of buckets and initialize each bucket
*/
if (buckets == NULL) {
Tcl_MutexLock(&bucketsMutex);
if (buckets == NULL) {
buckets = (Bucket *)Tcl_Alloc(sizeof(Bucket) * NUMBUCKETS);
Tcl_CreateExitHandler(SvFinalize, NULL);
for (i = 0; i < NUMBUCKETS; ++i) {
bucketPtr = &buckets[i];
memset(bucketPtr, 0, sizeof(Bucket));
Tcl_InitHashTable(&bucketPtr->arrays, TCL_STRING_KEYS);
Tcl_InitHashTable(&bucketPtr->handles, TCL_ONE_WORD_KEYS);
}
|
| ︙ | ︙ |