Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merge 2.8 branch |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
b5cc0241a824c3f88b8b8382181e3d8f |
User & Date: | jan.nijtmans 2019-07-02 13:44:48.523 |
Context
2019-07-03
| ||
10:43 | Merge 2.8 branch. Use TCL_INDEX_NONE as appropriate check-in: 7120359506 user: jan.nijtmans tags: trunk | |
2019-07-02
| ||
15:40 | Merge trunk check-in: 5dbfaa6b67 user: jan.nijtmans tags: novem | |
13:44 | Merge 2.8 branch check-in: b5cc0241a8 user: jan.nijtmans tags: trunk | |
13:38 | Make everything compile with a C++ compiler check-in: 98e6ef4220 user: jan.nijtmans tags: thread-2-8-branch | |
2019-06-29
| ||
14:39 | Merge 2.8 branch check-in: 629db64158 user: jan.nijtmans tags: trunk | |
Changes
Changes to generic/tclThread.h.
︙ | ︙ | |||
21 22 23 24 25 26 27 | #define _TCL_THREAD_H_ #include <tcl.h> /* * Exported from threadCmd.c file. */ | | > > > > > | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | #define _TCL_THREAD_H_ #include <tcl.h> /* * Exported from threadCmd.c file. */ #ifdef __cplusplus extern "C" { #endif DLLEXPORT int Thread_Init(Tcl_Interp *interp); #ifdef __cplusplus } #endif #endif /* _TCL_THREAD_H_ */ |
Changes to generic/tclXkeylist.c.
︙ | ︙ | |||
78 79 80 81 82 83 84 | /* * Macro that behaves like strdup, only uses ckalloc. Also macro that does the * same with a string that might contain zero bytes, */ #define ckstrdup(sourceStr) \ | | | | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | /* * Macro that behaves like strdup, only uses ckalloc. Also macro that does the * same with a string that might contain zero bytes, */ #define ckstrdup(sourceStr) \ (strcpy ((char *)ckalloc (strlen (sourceStr) + 1), sourceStr)) #define ckbinstrdup(sourceStr, length) \ ((char *) memcpy ((char *)ckalloc (length + 1), sourceStr, length + 1)) /* * Used to return argument messages by most commands. */ static const char *tclXWrongArgs = "wrong # args: "; static const Tcl_ObjType *listType; |
︙ | ︙ | |||
103 104 105 106 107 108 109 | * Parameters: * o objPtr - Object to check. * Returns: * 1 if NULL, 0 if not. *----------------------------------------------------------------------------- */ static int | | | < > | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | * Parameters: * o objPtr - Object to check. * Returns: * 1 if NULL, 0 if not. *----------------------------------------------------------------------------- */ static int TclX_IsNullObj ( Tcl_Obj *objPtr ) { if (objPtr->typePtr == NULL) { return (objPtr->length == 0); } else if (objPtr->typePtr == listType) { int length; Tcl_ListObjLength(NULL, objPtr, &length); return (length == 0); } |
︙ | ︙ | |||
167 168 169 170 171 172 173 | * o commandNameObj - Object containing name of command (objv[0]) * o string - Text message to append. * Returns: * TCL_ERROR *----------------------------------------------------------------------------- */ static int | | | | | < > | | | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 | * o commandNameObj - Object containing name of command (objv[0]) * o string - Text message to append. * Returns: * TCL_ERROR *----------------------------------------------------------------------------- */ static int TclX_WrongArgs( Tcl_Interp *interp, Tcl_Obj *commandNameObj, const char *string ) { const char *commandName = Tcl_GetString(commandNameObj); Tcl_Obj *resultPtr = Tcl_GetObjResult(interp); Tcl_ResetResult(interp); Tcl_AppendStringsToObj (resultPtr, tclXWrongArgs, commandName, NULL); if (*string != '\0') { Tcl_AppendStringsToObj (resultPtr, " ", string, NULL); } return TCL_ERROR; } /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ /* Here is where the original file begins */ |
︙ | ︙ | |||
304 305 306 307 308 309 310 | SetKeyedListFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr); static void UpdateStringOfKeyedList(Tcl_Obj *keylPtr); static int | | > > > > > > | < < < < < < | | 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 | SetKeyedListFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr); static void UpdateStringOfKeyedList(Tcl_Obj *keylPtr); static int Tcl_KeylgetObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); static int Tcl_KeylsetObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); static int Tcl_KeyldelObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); static int Tcl_KeylkeysObjCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* * Type definition. */ |
︙ | ︙ | |||
387 388 389 390 391 392 393 | * o isPath - 1 if this is a key path, 0 if its a simple key and * thus "." is illegal. * Returns: * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ static int | | | | | | < > | 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 | * o isPath - 1 if this is a key path, 0 if its a simple key and * thus "." is illegal. * Returns: * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ static int ValidateKey( Tcl_Interp *interp, const char *key, size_t keyLen, int isPath ) { const char *keyp; if (strlen(key) != keyLen) { Tcl_ResetResult(interp); Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "keyed list key may not be a ", "binary string", (char *) NULL); |
︙ | ︙ | |||
432 433 434 435 436 437 438 | * Allocate an and initialize the keyed list internal representation. * * Returns: * A pointer to the keyed list internal structure. *----------------------------------------------------------------------------- */ static keylIntObj_t * | | | 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 | * Allocate an and initialize the keyed list internal representation. * * Returns: * A pointer to the keyed list internal structure. *----------------------------------------------------------------------------- */ static keylIntObj_t * AllocKeyedListIntRep(void) { keylIntObj_t *keylIntPtr; keylIntPtr = (keylIntObj_t *) ckalloc (sizeof (keylIntObj_t)); keylIntPtr->arraySize = 0; keylIntPtr->numEntries = 0; |
︙ | ︙ | |||
454 455 456 457 458 459 460 | * Free the internal representation of a keyed list. * * Parameters: * o keylIntPtr - Keyed list internal structure to free. *----------------------------------------------------------------------------- */ static void | | | < > | 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 | * Free the internal representation of a keyed list. * * Parameters: * o keylIntPtr - Keyed list internal structure to free. *----------------------------------------------------------------------------- */ static void FreeKeyedListData( keylIntObj_t *keylIntPtr ) { int idx; for (idx = 0; idx < keylIntPtr->numEntries ; idx++) { ckfree (keylIntPtr->entries [idx].key); Tcl_DecrRefCount (keylIntPtr->entries [idx].valuePtr); } if (keylIntPtr->entries != NULL) |
︙ | ︙ | |||
480 481 482 483 484 485 486 | * Parameters: * o keylIntPtr - Keyed list internal representation. * o newNumEntries - The number of entries that are going to be added to * the keyed list. *----------------------------------------------------------------------------- */ static void | | | | < > | 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 | * Parameters: * o keylIntPtr - Keyed list internal representation. * o newNumEntries - The number of entries that are going to be added to * the keyed list. *----------------------------------------------------------------------------- */ static void EnsureKeyedListSpace( keylIntObj_t *keylIntPtr, int newNumEntries ) { KEYL_REP_ASSERT (keylIntPtr); if ((keylIntPtr->arraySize - keylIntPtr->numEntries) < newNumEntries) { int newSize = keylIntPtr->arraySize + newNumEntries + KEYEDLIST_ARRAY_INCR_SIZE; if (keylIntPtr->entries == NULL) { keylIntPtr->entries = (keylEntry_t *) |
︙ | ︙ | |||
513 514 515 516 517 518 519 | * * Parameters: * o keylIntPtr - Keyed list internal representation. * o entryIdx - Index of entry to delete. *----------------------------------------------------------------------------- */ static void | | | | < > | 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 | * * Parameters: * o keylIntPtr - Keyed list internal representation. * o entryIdx - Index of entry to delete. *----------------------------------------------------------------------------- */ static void DeleteKeyedListEntry ( keylIntObj_t *keylIntPtr, int entryIdx ) { int idx; ckfree (keylIntPtr->entries [entryIdx].key); Tcl_DecrRefCount (keylIntPtr->entries [entryIdx].valuePtr); for (idx = entryIdx; idx < keylIntPtr->numEntries - 1; idx++) keylIntPtr->entries [idx] = keylIntPtr->entries [idx + 1]; |
︙ | ︙ | |||
545 546 547 548 549 550 551 | * o nextSubKeyPtr - If not NULL, the start of the name of the next * sub-key within key is returned. * Returns: * Index of the entry or -1 if not found. *----------------------------------------------------------------------------- */ static int | | | | | | < > | 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 | * o nextSubKeyPtr - If not NULL, the start of the name of the next * sub-key within key is returned. * Returns: * Index of the entry or -1 if not found. *----------------------------------------------------------------------------- */ static int FindKeyedListEntry( keylIntObj_t *keylIntPtr, const char *key, size_t *keyLenPtr, const char **nextSubKeyPtr ) { char *keySeparPtr; size_t keyLen; int findIdx; keySeparPtr = strchr (key, '.'); if (keySeparPtr != NULL) { keyLen = keySeparPtr - key; |
︙ | ︙ | |||
601 602 603 604 605 606 607 | * value. * o entryPtr - The keyed list entry to initialize from the object. * Returns: * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ static int | | | | | < > | 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 | * value. * o entryPtr - The keyed list entry to initialize from the object. * Returns: * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ static int ObjToKeyedListEntry( Tcl_Interp *interp, Tcl_Obj *objPtr, keylEntry_t *entryPtr ) { int objc; Tcl_Obj **objv; const char *key; if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) { Tcl_ResetResult (interp); Tcl_AppendStringsToObj(Tcl_GetObjResult (interp), |
︙ | ︙ | |||
650 651 652 653 654 655 656 | * Free the internal representation of a keyed list. * * Parameters: * o keylPtr - Keyed list object being deleted. *----------------------------------------------------------------------------- */ static void | | | < > | | | | < > | | 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 | * Free the internal representation of a keyed list. * * Parameters: * o keylPtr - Keyed list object being deleted. *----------------------------------------------------------------------------- */ static void FreeKeyedListInternalRep( Tcl_Obj *keylPtr ) { FreeKeyedListData((keylIntObj_t *)keylPtr->internalRep.twoPtrValue.ptr1); } /*----------------------------------------------------------------------------- * DupKeyedListInternalRep -- * Duplicate the internal representation of a keyed list. * * Parameters: * o srcPtr - Keyed list object to copy. * o copyPtr - Target object to copy internal representation to. *----------------------------------------------------------------------------- */ static void DupKeyedListInternalRep( Tcl_Obj *srcPtr, Tcl_Obj *copyPtr ) { keylIntObj_t *srcIntPtr = (keylIntObj_t *) srcPtr->internalRep.twoPtrValue.ptr1; keylIntObj_t *copyIntPtr; int idx; KEYL_REP_ASSERT (srcIntPtr); copyIntPtr = (keylIntObj_t *) ckalloc (sizeof (keylIntObj_t)); |
︙ | ︙ | |||
708 709 710 711 712 713 714 | * * Parameters: * o srcPtr - Keyed list object to copy. * o copyPtr - Target object to copy internal representation to. *----------------------------------------------------------------------------- */ void | | | | < > | | 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 | * * Parameters: * o srcPtr - Keyed list object to copy. * o copyPtr - Target object to copy internal representation to. *----------------------------------------------------------------------------- */ void DupKeyedListInternalRepShared ( Tcl_Obj *srcPtr, Tcl_Obj *copyPtr ) { keylIntObj_t *srcIntPtr = (keylIntObj_t *) srcPtr->internalRep.twoPtrValue.ptr1; keylIntObj_t *copyIntPtr; int idx; KEYL_REP_ASSERT (srcIntPtr); copyIntPtr = (keylIntObj_t *) ckalloc (sizeof (keylIntObj_t)); |
︙ | ︙ | |||
750 751 752 753 754 755 756 | * the keyed list recurses until lower levels are accessed. * * Parameters: * o objPtr - Object to convert to a keyed list. *----------------------------------------------------------------------------- */ static int | | | | < > | 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 | * the keyed list recurses until lower levels are accessed. * * Parameters: * o objPtr - Object to convert to a keyed list. *----------------------------------------------------------------------------- */ static int SetKeyedListFromAny( Tcl_Interp *interp, Tcl_Obj *objPtr ) { keylIntObj_t *keylIntPtr; int idx, objc; Tcl_Obj **objv; if (Tcl_ListObjGetElements (interp, objPtr, &objc, &objv) != TCL_OK) return TCL_ERROR; |
︙ | ︙ | |||
796 797 798 799 800 801 802 | * Update the string representation of a keyed list. * * Parameters: * o objPtr - Object to convert to a keyed list. *----------------------------------------------------------------------------- */ static void | | | < > | | 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 | * Update the string representation of a keyed list. * * Parameters: * o objPtr - Object to convert to a keyed list. *----------------------------------------------------------------------------- */ static void UpdateStringOfKeyedList( Tcl_Obj *keylPtr ) { #define UPDATE_STATIC_SIZE 32 int idx; Tcl_Obj **listObjv, *entryObjv [2], *tmpListObj; Tcl_Obj *staticListObjv [UPDATE_STATIC_SIZE]; char *listStr; keylIntObj_t *keylIntPtr = (keylIntObj_t *) keylPtr->internalRep.twoPtrValue.ptr1; /* * Conversion to strings is done via list objects to support binary data. */ if (keylIntPtr->numEntries > UPDATE_STATIC_SIZE) { listObjv = |
︙ | ︙ | |||
849 850 851 852 853 854 855 | * Create and initialize a new keyed list object. * * Returns: * A pointer to the object. *----------------------------------------------------------------------------- */ Tcl_Obj * | | | 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 | * Create and initialize a new keyed list object. * * Returns: * A pointer to the object. *----------------------------------------------------------------------------- */ Tcl_Obj * TclX_NewKeyedListObj(void) { Tcl_Obj *keylPtr = Tcl_NewObj (); keylIntObj_t *keylIntPtr = AllocKeyedListIntRep (); keylPtr->internalRep.twoPtrValue.ptr1 = keylIntPtr; keylPtr->typePtr = &keyedListType; return keylPtr; |
︙ | ︙ | |||
877 878 879 880 881 882 883 | * Returns: * o TCL_OK - If the key value was returned. * o TCL_BREAK - If the key was not found. * o TCL_ERROR - If an error occured. *----------------------------------------------------------------------------- */ int | | | | | | < > | | 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 | * Returns: * o TCL_OK - If the key value was returned. * o TCL_BREAK - If the key was not found. * o TCL_ERROR - If an error occured. *----------------------------------------------------------------------------- */ int TclX_KeyedListGet( Tcl_Interp *interp, Tcl_Obj *keylPtr, const char *key, Tcl_Obj **valuePtrPtr ) { keylIntObj_t *keylIntPtr; const char *nextSubKey; int findIdx; if (keylPtr->typePtr != &keyedListType) { if (SetKeyedListFromAny(interp, keylPtr) != TCL_OK) { return TCL_ERROR; } } keylIntPtr = (keylIntObj_t *)keylPtr->internalRep.twoPtrValue.ptr1; KEYL_REP_ASSERT (keylIntPtr); findIdx = FindKeyedListEntry (keylIntPtr, key, NULL, &nextSubKey); /* * If not found, return status. */ |
︙ | ︙ | |||
935 936 937 938 939 940 941 | * sub-key seperated by `.'. * o valueObjPtr - The value to set for the key. * Returns: * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ int | | | | | | < > | | 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 | * sub-key seperated by `.'. * o valueObjPtr - The value to set for the key. * Returns: * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ int TclX_KeyedListSet( Tcl_Interp *interp, Tcl_Obj *keylPtr, const char *key, Tcl_Obj *valuePtr ) { keylIntObj_t *keylIntPtr; const char *nextSubKey; int findIdx, status; size_t keyLen; Tcl_Obj *newKeylPtr; if (keylPtr->typePtr != &keyedListType) { if (SetKeyedListFromAny(interp, keylPtr) != TCL_OK) { return TCL_ERROR; } } keylIntPtr = (keylIntObj_t *)keylPtr->internalRep.twoPtrValue.ptr1; KEYL_REP_ASSERT (keylIntPtr); findIdx = FindKeyedListEntry (keylIntPtr, key, &keyLen, &nextSubKey); /* * If we are at the last subkey, either update or add an entry. |
︙ | ︙ | |||
1038 1039 1040 1041 1042 1043 1044 | * Returns: * o TCL_OK - If the key was deleted. * o TCL_BREAK - If the key was not found. * o TCL_ERROR - If an error occured. *----------------------------------------------------------------------------- */ int | | | | | < > | | 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 | * Returns: * o TCL_OK - If the key was deleted. * o TCL_BREAK - If the key was not found. * o TCL_ERROR - If an error occured. *----------------------------------------------------------------------------- */ int TclX_KeyedListDelete( Tcl_Interp *interp, Tcl_Obj *keylPtr, const char *key ) { keylIntObj_t *keylIntPtr, *subKeylIntPtr; const char *nextSubKey; int findIdx, status; if (keylPtr->typePtr != &keyedListType) { if (SetKeyedListFromAny(interp, keylPtr) != TCL_OK) { return TCL_ERROR; } } keylIntPtr = (keylIntObj_t *)keylPtr->internalRep.twoPtrValue.ptr1; findIdx = FindKeyedListEntry (keylIntPtr, key, NULL, &nextSubKey); /* * If not found, return status. */ if (findIdx < 0) { |
︙ | ︙ | |||
1086 1087 1088 1089 1090 1091 1092 | */ DupSharedKeyListChild (keylIntPtr, findIdx); status = TclX_KeyedListDelete (interp, keylIntPtr->entries [findIdx].valuePtr, nextSubKey); if (status == TCL_OK) { | | | 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 | */ DupSharedKeyListChild (keylIntPtr, findIdx); status = TclX_KeyedListDelete (interp, keylIntPtr->entries [findIdx].valuePtr, nextSubKey); if (status == TCL_OK) { subKeylIntPtr = (keylIntObj_t *) keylIntPtr->entries [findIdx].valuePtr->internalRep.twoPtrValue.ptr1; if (subKeylIntPtr->numEntries == 0) { DeleteKeyedListEntry (keylIntPtr, findIdx); } Tcl_InvalidateStringRep (keylPtr); } |
︙ | ︙ | |||
1115 1116 1117 1118 1119 1120 1121 | * Returns: * o TCL_OK - If the zero or more key where returned. * o TCL_BREAK - If the key was not found. * o TCL_ERROR - If an error occured. *----------------------------------------------------------------------------- */ int | | | | | | < > | | 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 | * Returns: * o TCL_OK - If the zero or more key where returned. * o TCL_BREAK - If the key was not found. * o TCL_ERROR - If an error occured. *----------------------------------------------------------------------------- */ int TclX_KeyedListGetKeys( Tcl_Interp *interp, Tcl_Obj *keylPtr, const char *key, Tcl_Obj **listObjPtrPtr ) { keylIntObj_t *keylIntPtr; Tcl_Obj *nameObjPtr, *listObjPtr; const char *nextSubKey; int idx, findIdx; if (keylPtr->typePtr != &keyedListType) { if (SetKeyedListFromAny(interp, keylPtr) != TCL_OK) { return TCL_ERROR; } } keylIntPtr = (keylIntObj_t *)keylPtr->internalRep.twoPtrValue.ptr1; /* * If key is not NULL or empty, then recurse down until we go past * the end of all of the elements of the key. */ if ((key != NULL) && (key [0] != '\0')) { findIdx = FindKeyedListEntry (keylIntPtr, key, NULL, &nextSubKey); |
︙ | ︙ | |||
1176 1177 1178 1179 1180 1181 1182 | /*----------------------------------------------------------------------------- * Tcl_KeylgetObjCmd -- * Implements the TCL keylget command: * keylget listvar ?key? ?retvar | {}? *----------------------------------------------------------------------------- */ static int | | | | | | < > | 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 | /*----------------------------------------------------------------------------- * Tcl_KeylgetObjCmd -- * Implements the TCL keylget command: * keylget listvar ?key? ?retvar | {}? *----------------------------------------------------------------------------- */ static int Tcl_KeylgetObjCmd( void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { Tcl_Obj *keylPtr, *valuePtr; const char *key; int status; if ((objc < 2) || (objc > 4)) { return TclX_WrongArgs (interp, objv [0], "listvar ?key? ?retvar | {}?"); |
︙ | ︙ | |||
1257 1258 1259 1260 1261 1262 1263 | /*----------------------------------------------------------------------------- * Tcl_KeylsetObjCmd -- * Implements the TCL keylset command: * keylset listvar key value ?key value...? *----------------------------------------------------------------------------- */ static int | | | | | | < > | 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 | /*----------------------------------------------------------------------------- * Tcl_KeylsetObjCmd -- * Implements the TCL keylset command: * keylset listvar key value ?key value...? *----------------------------------------------------------------------------- */ static int Tcl_KeylsetObjCmd( void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { Tcl_Obj *keylVarPtr, *newVarObj; const char *key; int idx; if ((objc < 4) || ((objc % 2) != 0)) { return TclX_WrongArgs (interp, objv [0], "listvar key value ?key value...?"); |
︙ | ︙ | |||
1320 1321 1322 1323 1324 1325 1326 | /*----------------------------------------------------------------------------- * Tcl_KeyldelObjCmd -- * Implements the TCL keyldel command: * keyldel listvar key ?key ...? *---------------------------------------------------------------------------- */ static int | | | | | | < > | 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 | /*----------------------------------------------------------------------------- * Tcl_KeyldelObjCmd -- * Implements the TCL keyldel command: * keyldel listvar key ?key ...? *---------------------------------------------------------------------------- */ static int Tcl_KeyldelObjCmd( void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { Tcl_Obj *keylVarPtr, *keylPtr; const char *key; int idx, status; if (objc < 3) { return TclX_WrongArgs (interp, objv [0], "listvar key ?key ...?"); } |
︙ | ︙ | |||
1382 1383 1384 1385 1386 1387 1388 | /*----------------------------------------------------------------------------- * Tcl_KeylkeysObjCmd -- * Implements the TCL keylkeys command: * keylkeys listvar ?key? *----------------------------------------------------------------------------- */ static int | | | | | | < > | 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 | /*----------------------------------------------------------------------------- * Tcl_KeylkeysObjCmd -- * Implements the TCL keylkeys command: * keylkeys listvar ?key? *----------------------------------------------------------------------------- */ static int Tcl_KeylkeysObjCmd( void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { Tcl_Obj *keylPtr, *listObjPtr; const char *key; int status; if ((objc < 2) || (objc > 3)) { return TclX_WrongArgs(interp, objv [0], "listvar ?key?"); } |
︙ | ︙ | |||
1438 1439 1440 1441 1442 1443 1444 | * Initialize the keyed list commands for this interpreter. * * Parameters: * o interp - Interpreter to add commands to. *----------------------------------------------------------------------------- */ void | | | < > | | | | | | | | | 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 | * Initialize the keyed list commands for this interpreter. * * Parameters: * o interp - Interpreter to add commands to. *----------------------------------------------------------------------------- */ void TclX_KeyedListInit( Tcl_Interp *interp ) { Tcl_Obj *listobj; Tcl_RegisterObjType(&keyedListType); listobj = Tcl_NewObj(); listobj = Tcl_NewListObj(1, &listobj); listType = listobj->typePtr; Tcl_DecrRefCount(listobj); if (0) { Tcl_CreateObjCommand (interp, "keylget", Tcl_KeylgetObjCmd, NULL, NULL); Tcl_CreateObjCommand (interp, "keylset", Tcl_KeylsetObjCmd, NULL, NULL); Tcl_CreateObjCommand (interp, "keyldel", Tcl_KeyldelObjCmd, NULL, NULL); Tcl_CreateObjCommand (interp, "keylkeys", Tcl_KeylkeysObjCmd, NULL, NULL); } } |
Changes to generic/threadCmd.c.
︙ | ︙ | |||
429 430 431 432 433 434 435 | static Tcl_ObjCmdProc ThreadAttachObjCmd; #ifdef TCL_TIP285 static Tcl_ObjCmdProc ThreadCancelObjCmd; #endif static int | | | < > | 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 | static Tcl_ObjCmdProc ThreadAttachObjCmd; #ifdef TCL_TIP285 static Tcl_ObjCmdProc ThreadCancelObjCmd; #endif static int ThreadInit( Tcl_Interp *interp /* The current Tcl interpreter */ ) { if (Tcl_InitStubs(interp, "8.4", 0) == NULL) { if ((sizeof(size_t) != sizeof(int)) #if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 7 && defined(TCL_NO_DEPRECATED) /* As long as Tcl 8.7 is not final, this allows the Thread extension */ /* to be loadable on Tcl 9.0, provided it is compiled against Tcl 8.7+ headers */ || !(Tcl_InitStubs)(interp, "8.4-", (TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), TCL_STUB_MAGIC) |
︙ | ︙ | |||
530 531 532 533 534 535 536 | * Side effects: * Adds package commands to the current interp. * *---------------------------------------------------------------------- */ DLLEXPORT int | | | < > | 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 | * Side effects: * Adds package commands to the current interp. * *---------------------------------------------------------------------- */ DLLEXPORT int Thread_Init( Tcl_Interp *interp /* The current Tcl interpreter */ ) { int status = ThreadInit(interp); if (status != TCL_OK) { return status; } return Tcl_PkgProvideEx(interp, "Thread", PACKAGE_VERSION, NULL); |
︙ | ︙ | |||
559 560 561 562 563 564 565 | * Side effects: * The list of threads is initialized to include the current thread. * *---------------------------------------------------------------------- */ static void | | | < > | 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 | * Side effects: * The list of threads is initialized to include the current thread. * *---------------------------------------------------------------------- */ static void Init( Tcl_Interp *interp /* Current interpreter. */ ) { ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); if (tsdPtr->interp == (Tcl_Interp*)NULL) { memset(tsdPtr, 0, sizeof(ThreadSpecificData)); tsdPtr->interp = interp; ListUpdate(tsdPtr); Tcl_CreateThreadExitHandler(ThreadExitProc, |
︙ | ︙ | |||
591 592 593 594 595 596 597 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadCreateObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int argc, rsrv = 0; const char *arg, *script; int flags = TCL_THREAD_NOFLAGS; Init(interp); /* |
︙ | ︙ | |||
657 658 659 660 661 662 663 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadReserveObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { Tcl_ThreadId thrId = NULL; Init(interp); if (objc > 2) { Tcl_WrongNumArgs(interp, 1, objv, "?threadId?"); return TCL_ERROR; |
︙ | ︙ | |||
699 700 701 702 703 704 705 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadReleaseObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int wait = 0; Tcl_ThreadId thrId = NULL; Init(interp); if (objc > 3) { Tcl_WrongNumArgs(interp, 1, objv, "?-wait? ?threadId?"); |
︙ | ︙ | |||
748 749 750 751 752 753 754 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadUnwindObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { Init(interp); if (objc > 1) { Tcl_WrongNumArgs(interp, 1, objv, NULL); return TCL_ERROR; } |
︙ | ︙ | |||
783 784 785 786 787 788 789 | * Side effects: * Lots. improper clean up of resources. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 | * Side effects: * Lots. improper clean up of resources. * *---------------------------------------------------------------------- */ static int ThreadExitObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int status = 666; Init(interp); if (objc > 2) { Tcl_WrongNumArgs(interp, 1, objv, "?status?"); return TCL_ERROR; |
︙ | ︙ | |||
829 830 831 832 833 834 835 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int ThreadIdObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { char thrHandle[THREAD_HNDLMAXLEN]; Init(interp); if (objc > 1) { Tcl_WrongNumArgs(interp, 1, objv, NULL); return TCL_ERROR; |
︙ | ︙ | |||
870 871 872 873 874 875 876 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int ThreadNamesObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int ii, length; char *result, thrHandle[THREAD_HNDLMAXLEN]; Tcl_ThreadId *thrIdArray; Tcl_DString threadNames; Init(interp); |
︙ | ︙ | |||
942 943 944 945 946 947 948 | static void threadSendObjFree(ClientData ptr) { Tcl_DecrRefCount((Tcl_Obj *)ptr); } static int | | | | | | < > | 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 | static void threadSendObjFree(ClientData ptr) { Tcl_DecrRefCount((Tcl_Obj *)ptr); } static int ThreadSendObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { size_t size; int cmd = 0, ret, ii = 0, flags = 0; Tcl_ThreadId thrId; const char *script, *arg; Tcl_Obj *var = NULL; ThreadClbkData *clbkPtr = NULL; |
︙ | ︙ | |||
1078 1079 1080 1081 1082 1083 1084 | * Side effects: * Script is sent to all known threads except the caller thread. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 | * Side effects: * Script is sent to all known threads except the caller thread. * *---------------------------------------------------------------------- */ static int ThreadBroadcastObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int ii, nthreads; size_t size; const char *script; Tcl_ThreadId *thrIdArray; ThreadSendData *sendPtr, job; Init(interp); |
︙ | ︙ | |||
1165 1166 1167 1168 1169 1170 1171 | * Side effects: * Enters the event loop. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 | * Side effects: * Enters the event loop. * *---------------------------------------------------------------------- */ static int ThreadWaitObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { Init(interp); if (objc > 1) { Tcl_WrongNumArgs(interp, 1, objv, NULL); return TCL_ERROR; } |
︙ | ︙ | |||
1201 1202 1203 1204 1205 1206 1207 | * Side effects: * Registers an errorproc. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 | * Side effects: * Registers an errorproc. * *---------------------------------------------------------------------- */ static int ThreadErrorProcObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { size_t len; char *proc; Init(interp); if (objc > 2) { Tcl_WrongNumArgs(interp, 1, objv, "?proc?"); |
︙ | ︙ | |||
1232 1233 1234 1235 1236 1237 1238 | proc = Tcl_GetString(objv[1]); len = objv[1]->length; if (len == 0) { errorThreadId = NULL; errorProcString = NULL; } else { errorThreadId = Tcl_GetCurrentThread(); | | | | < > | 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 | proc = Tcl_GetString(objv[1]); len = objv[1]->length; if (len == 0) { errorThreadId = NULL; errorProcString = NULL; } else { errorThreadId = Tcl_GetCurrentThread(); errorProcString = (char *)ckalloc(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 ) { Tcl_MutexLock(&threadMutex); if (errorThreadId != Tcl_GetCurrentThread()) { Tcl_MutexUnlock(&threadMutex); return; } ckfree(errorProcString); errorThreadId = NULL; |
︙ | ︙ | |||
1276 1277 1278 1279 1280 1281 1282 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadJoinObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { Tcl_ThreadId thrId; Init(interp); /* * Syntax of 'join': id */ |
︙ | ︙ | |||
1320 1321 1322 1323 1324 1325 1326 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadTransferObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { Tcl_ThreadId thrId; Tcl_Channel chan; Init(interp); /* |
︙ | ︙ | |||
1370 1371 1372 1373 1374 1375 1376 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadDetachObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { Tcl_Channel chan; Init(interp); /* * Syntax: thread::detach channel */ |
︙ | ︙ | |||
1415 1416 1417 1418 1419 1420 1421 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadAttachObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { char *chanName; Init(interp); /* * Syntax: thread::attach channel */ |
︙ | ︙ | |||
1460 1461 1462 1463 1464 1465 1466 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadExistsObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { Tcl_ThreadId thrId; Init(interp); if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "id"); return TCL_ERROR; |
︙ | ︙ | |||
1500 1501 1502 1503 1504 1505 1506 | * A standard Tcl result. * * Side effects: * None. *---------------------------------------------------------------------- */ static int | | | | | | < > | 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 | * A standard Tcl result. * * Side effects: * None. *---------------------------------------------------------------------- */ static int ThreadConfigureObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { char *option, *value; Tcl_ThreadId thrId; /* Id of the thread to configure */ int i; /* Iterate over arg-value pairs. */ Tcl_DString ds; /* DString to hold result of * calling GetThreadOption. */ if (objc < 2 || (objc % 2 == 1 && objc != 3)) { |
︙ | ︙ | |||
1572 1573 1574 1575 1576 1577 1578 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadCancelObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { Tcl_ThreadId thrId; int ii, flags; const char *result; if ((objc < 2) || (objc > 4)) { Tcl_WrongNumArgs(interp, 1, objv, "?-unwind? id ?result?"); return TCL_ERROR; |
︙ | ︙ | |||
1627 1628 1629 1630 1631 1632 1633 | * * Side effects: * *---------------------------------------------------------------------- */ static int | | | | < > | 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 | * * Side effects: * *---------------------------------------------------------------------- */ static int ThreadSendEval( Tcl_Interp *interp, ClientData clientData ) { ThreadSendData *sendPtr = (ThreadSendData*)clientData; char *script = (char*)sendPtr->clientData; return Tcl_EvalEx(interp, script, -1, TCL_EVAL_GLOBAL); } /* |
︙ | ︙ | |||
1655 1656 1657 1658 1659 1660 1661 | * Side effects: * New Tcl variable may be created * *---------------------------------------------------------------------- */ static int | | | | < > | 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 | * Side effects: * New Tcl variable may be created * *---------------------------------------------------------------------- */ static int ThreadClbkSetVar( Tcl_Interp *interp, ClientData clientData ) { ThreadClbkData *clbkPtr = (ThreadClbkData*)clientData; Tcl_Obj *var = (Tcl_Obj *)clbkPtr->clientData; Tcl_Obj *valObj; ThreadEventResult *resultPtr = &clbkPtr->result; int rc = TCL_OK; /* |
︙ | ︙ | |||
1751 1752 1753 1754 1755 1756 1757 | * Side effects: * Create a thread. * *---------------------------------------------------------------------- */ static int | | | | | | | < > | 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 | * Side effects: * Create a thread. * *---------------------------------------------------------------------- */ static int ThreadCreate( Tcl_Interp *interp, /* Current interpreter. */ const char *script, /* Script to evaluate */ int stacksize, /* Zero for default size */ int flags, /* Zero for no flags */ int preserve /* If true, reserve the thread */ ) { char thrHandle[THREAD_HNDLMAXLEN]; ThreadCtrl ctrl; Tcl_ThreadId thrId; ctrl.cd = Tcl_GetAssocData(interp, "thread:nsd", NULL); ctrl.script = (char *)script; ctrl.condWait = NULL; |
︙ | ︙ | |||
1833 1834 1835 1836 1837 1838 1839 | * Side effects: * A Tcl script is executed in a new thread. * *---------------------------------------------------------------------- */ Tcl_ThreadCreateType | | | < > | 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 | * Side effects: * A Tcl script is executed in a new thread. * *---------------------------------------------------------------------- */ Tcl_ThreadCreateType NewThread( ClientData clientData ) { ThreadCtrl *ctrlPtr = (ThreadCtrl *)clientData; ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); Tcl_Interp *interp; int result = TCL_OK; size_t scriptLen; char *evalScript; |
︙ | ︙ | |||
1956 1957 1958 1959 1960 1961 1962 | * Side effects: * Send an event. * *---------------------------------------------------------------------- */ static void | | | < > | 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 | * Side effects: * Send an event. * *---------------------------------------------------------------------- */ static void ThreadErrorProc( Tcl_Interp *interp /* Interp that failed */ ) { ThreadSendData *sendPtr; const char *argv[3]; char buf[THREAD_HNDLMAXLEN]; const char *errorInfo; errorInfo = Tcl_GetVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY); if (errorInfo == NULL) { |
︙ | ︙ | |||
2020 2021 2022 2023 2024 2025 2026 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | < > | 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void ListUpdate( ThreadSpecificData *tsdPtr ) { if (tsdPtr == NULL) { tsdPtr = TCL_TSD_INIT(&dataKey); } Tcl_MutexLock(&threadMutex); ListUpdateInner(tsdPtr); Tcl_MutexUnlock(&threadMutex); |
︙ | ︙ | |||
2050 2051 2052 2053 2054 2055 2056 | * Side effects: * Add the thread local storage to its list. * *---------------------------------------------------------------------- */ static void | | | < > | 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 | * Side effects: * Add the thread local storage to its list. * *---------------------------------------------------------------------- */ static void ListUpdateInner( ThreadSpecificData *tsdPtr ) { if (threadList) { threadList->prevPtr = tsdPtr; } tsdPtr->nextPtr = threadList; tsdPtr->prevPtr = NULL; tsdPtr->threadId = Tcl_GetCurrentThread(); |
︙ | ︙ | |||
2082 2083 2084 2085 2086 2087 2088 | * Side effects: * Remove the thread local storage from its list. * *---------------------------------------------------------------------- */ static void | | | < > | 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 | * Side effects: * Remove the thread local storage from its list. * *---------------------------------------------------------------------- */ static void ListRemove( ThreadSpecificData *tsdPtr ) { if (tsdPtr == NULL) { tsdPtr = TCL_TSD_INIT(&dataKey); } Tcl_MutexLock(&threadMutex); ListRemoveInner(tsdPtr); Tcl_MutexUnlock(&threadMutex); |
︙ | ︙ | |||
2111 2112 2113 2114 2115 2116 2117 | * Side effects: * Remove the thread local storage from its list. * *---------------------------------------------------------------------- */ static void | | | < > | 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 | * Side effects: * Remove the thread local storage from its list. * *---------------------------------------------------------------------- */ static void ListRemoveInner( ThreadSpecificData *tsdPtr ) { if (tsdPtr->prevPtr || tsdPtr->nextPtr) { if (tsdPtr->prevPtr) { tsdPtr->prevPtr->nextPtr = tsdPtr->nextPtr; } else { threadList = tsdPtr->nextPtr; } if (tsdPtr->nextPtr) { |
︙ | ︙ | |||
2147 2148 2149 2150 2151 2152 2153 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | < > | 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int ThreadList( Tcl_Interp *interp, Tcl_ThreadId **thrIdArray ) { int ii, count = 0; ThreadSpecificData *tsdPtr; Tcl_MutexLock(&threadMutex); /* * First walk; find out how many threads are registered. |
︙ | ︙ | |||
2208 2209 2210 2211 2212 2213 2214 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | < > | 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int ThreadExists( Tcl_ThreadId thrId ) { ThreadSpecificData *tsdPtr; Tcl_MutexLock(&threadMutex); tsdPtr = ThreadExistsInner(thrId); Tcl_MutexUnlock(&threadMutex); return tsdPtr != NULL; |
︙ | ︙ | |||
2239 2240 2241 2242 2243 2244 2245 | * Side effects: * None. * *---------------------------------------------------------------------- */ static ThreadSpecificData * | | | < > | 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 | * Side effects: * None. * *---------------------------------------------------------------------- */ static ThreadSpecificData * ThreadExistsInner( Tcl_ThreadId thrId /* Thread id to look for. */ ) { ThreadSpecificData *tsdPtr; for (tsdPtr = threadList; tsdPtr; tsdPtr = tsdPtr->nextPtr) { if (tsdPtr->threadId == thrId) { return tsdPtr; } } |
︙ | ︙ | |||
2271 2272 2273 2274 2275 2276 2277 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int ThreadCancel( Tcl_Interp *interp, /* The current interpreter. */ Tcl_ThreadId thrId, /* Thread ID of other interpreter. */ const char *result, /* The error message or NULL for default. */ int flags /* Flags for Tcl_CancelEval. */ ) { int code; Tcl_Obj *resultObj = NULL; ThreadSpecificData *tsdPtr; /* ... of the target thread */ Tcl_MutexLock(&threadMutex); tsdPtr = ThreadExistsInner(thrId); |
︙ | ︙ | |||
2325 2326 2327 2328 2329 2330 2331 | * The status of the exiting thread is left in the interp result * area, but only in the case of success. * *---------------------------------------------------------------------- */ static int | | | | < > | 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 | * The status of the exiting thread is left in the interp result * area, but only in the case of success. * *---------------------------------------------------------------------- */ static int ThreadJoin( Tcl_Interp *interp, /* The current interpreter. */ Tcl_ThreadId thrId /* Thread ID of other interpreter. */ ) { int ret, state; ret = Tcl_JoinThread(thrId, &state); if (ret == TCL_OK) { Tcl_SetIntObj(Tcl_GetObjResult (interp), state); } else { |
︙ | ︙ | |||
2367 2368 2369 2370 2371 2372 2373 | * involved (specified and current) are modified. The channel is * moved, all event handling for the channel is killed. * *---------------------------------------------------------------------- */ static int | | | | | < > | 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 | * involved (specified and current) are modified. The channel is * moved, all event handling for the channel is killed. * *---------------------------------------------------------------------- */ static int ThreadTransfer( Tcl_Interp *interp, /* The current interpreter. */ Tcl_ThreadId thrId, /* Thread Id of other interpreter. */ Tcl_Channel chan /* The channel to transfer */ ) { /* Steps to perform for the transfer: * * i. Sanity checks: chan has to registered in interp, must not be * shared. This automatically excludes the special channels for * stdin, stdout and stderr! * ii. Clear event handling. * iii. Bump reference counter up to prevent destruction during the |
︙ | ︙ | |||
2544 2545 2546 2547 2548 2549 2550 | * The thread-global lists of all known channels (transferList) * is modified. All event handling for the channel is killed. * *---------------------------------------------------------------------- */ static int | | | | < > | 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 | * The thread-global lists of all known channels (transferList) * is modified. All event handling for the channel is killed. * *---------------------------------------------------------------------- */ static int ThreadDetach( Tcl_Interp *interp, /* The current interpreter. */ Tcl_Channel chan /* The channel to detach */ ) { TransferEvent *evPtr; TransferResult *resultPtr; if (!Tcl_IsChannelRegistered(interp, chan)) { Tcl_SetObjResult(interp, Tcl_NewStringObj("channel is not registered here", -1)); } if (Tcl_IsChannelShared(chan)) { |
︙ | ︙ | |||
2630 2631 2632 2633 2634 2635 2636 | * The thread-global lists of all known channels (transferList) * is modified. * *---------------------------------------------------------------------- */ static int | | | | < > | 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 | * The thread-global lists of all known channels (transferList) * is modified. * *---------------------------------------------------------------------- */ static int ThreadAttach( Tcl_Interp *interp, /* The current interpreter. */ char *chanName /* The name of the channel to detach */ ) { int found = 0; Tcl_Channel chan = NULL; TransferResult *resPtr; /* * Locate the channel to attach by looking up its name in * the list of transfered channels. Watch that we don't |
︙ | ︙ | |||
2696 2697 2698 2699 2700 2701 2702 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | | < > | 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int ThreadSend( Tcl_Interp *interp, /* The current interpreter. */ Tcl_ThreadId thrId, /* Thread Id of other thread. */ ThreadSendData *send, /* Pointer to structure with work to do */ ThreadClbkData *clbk, /* Opt. callback structure (may be NULL) */ int flags /* Wait or queue to tail */ ) { ThreadSpecificData *tsdPtr = NULL; /* ... of the target thread */ int code; ThreadEvent *eventPtr; ThreadEventResult *resultPtr; /* |
︙ | ︙ | |||
3012 3013 3014 3015 3016 3017 3018 | * * Side effects: * *---------------------------------------------------------------------- */ static int | | | | | | < > | 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 | * * Side effects: * *---------------------------------------------------------------------- */ static int ThreadReserve( Tcl_Interp *interp, /* Current interpreter */ Tcl_ThreadId thrId, /* Target thread ID */ int operation, /* THREAD_RESERVE | THREAD_RELEASE */ int wait /* Wait for thread to exit */ ) { int users, dowait = 0; ThreadEvent *evPtr; ThreadSpecificData *tsdPtr; Tcl_MutexLock(&threadMutex); /* |
︙ | ︙ | |||
3127 3128 3129 3130 3131 3132 3133 | * * Side effects: * Fills out the ThreadEventResult struct. * *---------------------------------------------------------------------- */ static int | | | | < > | 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 | * * Side effects: * Fills out the ThreadEventResult struct. * *---------------------------------------------------------------------- */ static int ThreadEventProc( Tcl_Event *evPtr, /* Really ThreadEvent */ int mask ) { ThreadSpecificData* tsdPtr = TCL_TSD_INIT(&dataKey); Tcl_Interp *interp = NULL; Tcl_ThreadId thrId = Tcl_GetCurrentThread(); ThreadEvent *eventPtr = (ThreadEvent*)evPtr; ThreadSendData *sendPtr = eventPtr->sendData; ThreadClbkData *clbkPtr = eventPtr->clbkData; |
︙ | ︙ | |||
3290 3291 3292 3293 3294 3295 3296 | * * Side effects: * *---------------------------------------------------------------------- */ static void | | | | | < > | 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 | * * Side effects: * *---------------------------------------------------------------------- */ static void ThreadSetResult( Tcl_Interp *interp, int code, ThreadEventResult *resultPtr ) { const char *errorCode, *errorInfo; size_t size; if (interp == NULL) { code = TCL_ERROR; errorInfo = ""; errorCode = "THREAD"; |
︙ | ︙ | |||
3319 3320 3321 3322 3323 3324 3325 | } Tcl_IncrRefCount(resultPtr->result); resultPtr->code = code; if (errorCode != NULL) { size = strlen(errorCode) + 1; | | | | | | | | < > | 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 | } Tcl_IncrRefCount(resultPtr->result); resultPtr->code = code; if (errorCode != NULL) { size = strlen(errorCode) + 1; resultPtr->errorCode = (char *)memcpy(ckalloc(size), errorCode, size); } else { resultPtr->errorCode = NULL; } if (errorInfo != NULL) { size = strlen(errorInfo) + 1; resultPtr->errorInfo = (char *)memcpy(ckalloc(size), errorInfo, size); } else { resultPtr->errorInfo = NULL; } } /* *---------------------------------------------------------------------- * * ThreadGetOption -- * * Results: * * Side effects: * *---------------------------------------------------------------------- */ static int ThreadGetOption( Tcl_Interp *interp, Tcl_ThreadId thrId, char *option, Tcl_DString *dsPtr ) { size_t len; ThreadSpecificData *tsdPtr = NULL; /* * If the optionName is NULL it means that we want * a list of all options and values. */ |
︙ | ︙ | |||
3436 3437 3438 3439 3440 3441 3442 | * * Side effects: * *---------------------------------------------------------------------- */ static int | | | | | | < > | 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 | * * Side effects: * *---------------------------------------------------------------------- */ static int ThreadSetOption( Tcl_Interp *interp, Tcl_ThreadId thrId, char *option, char *value ) { size_t len = strlen(option); ThreadSpecificData *tsdPtr = NULL; Tcl_MutexLock(&threadMutex); tsdPtr = ThreadExistsInner(thrId); |
︙ | ︙ | |||
3506 3507 3508 3509 3510 3511 3512 | * * Side effects. * *---------------------------------------------------------------------- */ static void | | | < > | 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 | * * Side effects. * *---------------------------------------------------------------------- */ static void ThreadIdleProc( ClientData clientData ) { int ret; ThreadSendData *sendPtr = (ThreadSendData*)clientData; ret = (*sendPtr->execProc)(sendPtr->interp, (ClientData)sendPtr); if (ret != TCL_OK) { ThreadErrorProc(sendPtr->interp); } |
︙ | ︙ | |||
3538 3539 3540 3541 3542 3543 3544 | * Side effects: * Fills out the TransferResult struct. * *---------------------------------------------------------------------- */ static int | | | | < > | 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 | * Side effects: * Fills out the TransferResult struct. * *---------------------------------------------------------------------- */ static int TransferEventProc( Tcl_Event *evPtr, /* Really ThreadEvent */ int mask ) { ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); TransferEvent *eventPtr = (TransferEvent *)evPtr; TransferResult *resultPtr = eventPtr->resultPtr; Tcl_Interp *interp = tsdPtr->interp; int code; const char* msg = NULL; |
︙ | ︙ | |||
3578 3579 3580 3581 3582 3583 3584 | } } if (resultPtr) { Tcl_MutexLock(&threadMutex); resultPtr->resultCode = code; if (msg != NULL) { size_t size = strlen(msg)+1; | | | 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 | } } if (resultPtr) { Tcl_MutexLock(&threadMutex); resultPtr->resultCode = code; if (msg != NULL) { size_t size = strlen(msg)+1; resultPtr->resultMsg = (char *)memcpy(ckalloc(size), msg, size); } Tcl_ConditionNotify(&resultPtr->done); Tcl_MutexUnlock(&threadMutex); } return 1; } |
︙ | ︙ | |||
3603 3604 3605 3606 3607 3608 3609 | * * Side effects: * Clears up mem specified in ClientData * *---------------------------------------------------------------------- */ static void | | | < > | 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 | * * Side effects: * Clears up mem specified in ClientData * *---------------------------------------------------------------------- */ static void ThreadFreeProc( ClientData clientData ) { /* * This will free send and/or callback structures * since both are the same in the beginning. */ ThreadSendData *anyPtr = (ThreadSendData*)clientData; |
︙ | ︙ | |||
3638 3639 3640 3641 3642 3643 3644 | * * Side effects: * It cleans up our events in the event queue for this thread. * *---------------------------------------------------------------------- */ static int | | | | < > | 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 | * * Side effects: * It cleans up our events in the event queue for this thread. * *---------------------------------------------------------------------- */ static int ThreadDeleteEvent( Tcl_Event *eventPtr, /* Really ThreadEvent */ ClientData clientData /* dummy */ ) { if (eventPtr->proc == ThreadEventProc) { /* * Regular script event. Just dispose memory */ ThreadEvent *evPtr = (ThreadEvent*)eventPtr; if (evPtr->sendData) { ThreadFreeProc((ClientData)evPtr->sendData); |
︙ | ︙ | |||
3708 3709 3710 3711 3712 3713 3714 | * Side effects: * It unblocks anyone that is waiting on a send to this thread. * It cleans up any events in the event queue for this thread. * *---------------------------------------------------------------------- */ static void | | | < > | 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 | * Side effects: * It unblocks anyone that is waiting on a send to this thread. * It cleans up any events in the event queue for this thread. * *---------------------------------------------------------------------- */ static void ThreadExitProc( ClientData clientData ) { char *threadEvalScript = (char*)clientData; const char *diemsg = "target thread died"; ThreadEventResult *resultPtr, *nextPtr; Tcl_ThreadId self = Tcl_GetCurrentThread(); ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); TransferResult *tResultPtr, *tNextPtr; |
︙ | ︙ | |||
3798 3799 3800 3801 3802 3803 3804 | } else if (tResultPtr->dstThreadId == self) { /* * Dang. The target is going away. Unblock the caller. * The result string must be dynamically allocated * because the main thread is going to call free on it. */ | | | 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 | } else if (tResultPtr->dstThreadId == self) { /* * Dang. The target is going away. Unblock the caller. * The result string must be dynamically allocated * because the main thread is going to call free on it. */ tResultPtr->resultMsg = strcpy((char *)ckalloc(1+strlen(diemsg)), diemsg); tResultPtr->resultCode = TCL_ERROR; Tcl_ConditionNotify(&tResultPtr->done); } } Tcl_MutexUnlock(&threadMutex); } |
︙ | ︙ | |||
3825 3826 3827 3828 3829 3830 3831 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | | < > | | | | | < > | | 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void ThreadGetHandle( Tcl_ThreadId thrId, char *handlePtr ) { sprintf(handlePtr, THREAD_HNDLPREFIX "%p", thrId); } /* *---------------------------------------------------------------------- * * ThreadGetId -- * * Returns the ID of thread given it's Tcl handle. * * Results: * Thread ID. * * Side effects: * None. * *---------------------------------------------------------------------- */ static int ThreadGetId( Tcl_Interp *interp, Tcl_Obj *handleObj, Tcl_ThreadId *thrIdPtr ) { const char *thrHandle = Tcl_GetString(handleObj); if (sscanf(thrHandle, THREAD_HNDLPREFIX "%p", thrIdPtr) == 1) { return TCL_OK; } Tcl_AppendResult(interp, "invalid thread handle \"", thrHandle, "\"", NULL); return TCL_ERROR; } |
︙ | ︙ | |||
3883 3884 3885 3886 3887 3888 3889 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | | < > | 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void ErrorNoSuchThread( Tcl_Interp *interp, Tcl_ThreadId thrId ) { char thrHandle[THREAD_HNDLMAXLEN]; ThreadGetHandle(thrId, thrHandle); Tcl_AppendResult(interp, "thread \"", thrHandle, "\" does not exist", NULL); } |
︙ | ︙ | |||
3912 3913 3914 3915 3916 3917 3918 | * Events still pending in the thread event queue and ready to fire * are not processed. * *---------------------------------------------------------------------- */ static void | | | | < > | 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 | * Events still pending in the thread event queue and ready to fire * are not processed. * *---------------------------------------------------------------------- */ static void ThreadCutChannel( Tcl_Interp *interp, Tcl_Channel chan ) { Tcl_DriverWatchProc *watchProc; Tcl_ClearChannelHandlers(chan); watchProc = Tcl_ChannelWatchProc(Tcl_GetChannelType(chan)); /* |
︙ | ︙ |
Changes to generic/threadPoolCmd.c.
︙ | ︙ | |||
189 190 191 192 193 194 195 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolCreateObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int ii, minw, maxw, idle; char buf[64], *exs = NULL, *cmd = NULL; ThreadPool *tpoolPtr; /* * Syntax: tpool::create ?-minworkers count? * ?-maxworkers count? |
︙ | ︙ | |||
235 236 237 238 239 240 241 | } } else if (OPT_CMP(opt, "-idletime")) { if (Tcl_GetIntFromObj(interp, objv[ii+1], &idle) != TCL_OK) { return TCL_ERROR; } } else if (OPT_CMP(opt, "-initcmd")) { const char *val = Tcl_GetString(objv[ii+1]); | | | | 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | } } else if (OPT_CMP(opt, "-idletime")) { if (Tcl_GetIntFromObj(interp, objv[ii+1], &idle) != TCL_OK) { return TCL_ERROR; } } else if (OPT_CMP(opt, "-initcmd")) { const char *val = Tcl_GetString(objv[ii+1]); cmd = strcpy((char *)ckalloc(objv[ii+1]->length+1), val); } else if (OPT_CMP(opt, "-exitcmd")) { const char *val = Tcl_GetString(objv[ii+1]); exs = strcpy((char *)ckalloc(objv[ii+1]->length+1), val); } else { goto usage; } } /* * Do some consistency checking |
︙ | ︙ | |||
325 326 327 328 329 330 331 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolPostObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { Tcl_WideInt jobId = 0; int ii, detached = 0, nowait = 0; size_t len; const char *tpoolName, *script; TpoolResult *rPtr; ThreadPool *tpoolPtr; |
︙ | ︙ | |||
460 461 462 463 464 465 466 | memset(rPtr, 0, sizeof(TpoolResult)); if (detached == 0) { jobId = ++tpoolPtr->jobId; rPtr->jobId = jobId; } | | | 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 | memset(rPtr, 0, sizeof(TpoolResult)); if (detached == 0) { jobId = ++tpoolPtr->jobId; rPtr->jobId = jobId; } rPtr->script = strcpy((char *)ckalloc(len+1), script); rPtr->scriptLen = len; rPtr->detached = detached; rPtr->threadId = Tcl_GetCurrentThread(); PushWork(rPtr, tpoolPtr); Tcl_ConditionNotify(&tpoolPtr->cond); Tcl_MutexUnlock(&tpoolPtr->mutex); |
︙ | ︙ | |||
497 498 499 500 501 502 503 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolWaitObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int ii, done, wObjc; Tcl_WideInt jobId; char *tpoolName; Tcl_Obj *listVar = NULL; Tcl_Obj *waitList, *doneList, **wObjv; ThreadPool *tpoolPtr; TpoolResult *rPtr; |
︙ | ︙ | |||
612 613 614 615 616 617 618 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolCancelObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int ii, wObjc; Tcl_WideInt jobId; char *tpoolName; Tcl_Obj *listVar = NULL; Tcl_Obj *doneList, *waitList, **wObjv; ThreadPool *tpoolPtr; TpoolResult *rPtr; |
︙ | ︙ | |||
708 709 710 711 712 713 714 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolGetObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int ret; Tcl_WideInt jobId; char *tpoolName; Tcl_Obj *resVar = NULL; ThreadPool *tpoolPtr; TpoolResult *rPtr; Tcl_HashEntry *hPtr; |
︙ | ︙ | |||
803 804 805 806 807 808 809 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolReserveObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int ret; char *tpoolName; ThreadPool *tpoolPtr; /* * Syntax: tpool::preserve tpoolId */ |
︙ | ︙ | |||
858 859 860 861 862 863 864 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolReleaseObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { size_t ret; char *tpoolName; ThreadPool *tpoolPtr; /* * Syntax: tpool::release tpoolId */ |
︙ | ︙ | |||
913 914 915 916 917 918 919 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolSuspendObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { char *tpoolName; ThreadPool *tpoolPtr; /* * Syntax: tpool::suspend tpoolId */ |
︙ | ︙ | |||
963 964 965 966 967 968 969 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolResumeObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { char *tpoolName; ThreadPool *tpoolPtr; /* * Syntax: tpool::resume tpoolId */ |
︙ | ︙ | |||
1013 1014 1015 1016 1017 1018 1019 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolNamesObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { ThreadPool *tpoolPtr; Tcl_Obj *listObj = Tcl_NewListObj(0, NULL); Tcl_MutexLock(&listMutex); for (tpoolPtr = tpoolList; tpoolPtr; tpoolPtr = tpoolPtr->nextPtr) { char buf[32]; sprintf(buf, "%s%p", TPOOL_HNDLPREFIX, tpoolPtr); |
︙ | ︙ | |||
1051 1052 1053 1054 1055 1056 1057 | * * Side effects: * Informs waiter thread (if any) about the new worker thread. * *---------------------------------------------------------------------- */ static int | | | | < > | 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 | * * Side effects: * Informs waiter thread (if any) about the new worker thread. * *---------------------------------------------------------------------- */ static int CreateWorker( Tcl_Interp *interp, ThreadPool *tpoolPtr ) { Tcl_ThreadId id; TpoolResult result; /* * Initialize the result structure to be * passed to the new thread. This is used * as communication to and from the thread. |
︙ | ︙ | |||
1116 1117 1118 1119 1120 1121 1122 | * Side effects: * None. * *---------------------------------------------------------------------- */ static Tcl_ThreadCreateType | | | < > | 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 | * Side effects: * None. * *---------------------------------------------------------------------- */ static Tcl_ThreadCreateType TpoolWorker( ClientData clientData ) { TpoolResult *rPtr = (TpoolResult*)clientData; ThreadPool *tpoolPtr = rPtr->tpoolPtr; int tout = 0; Tcl_Interp *interp; Tcl_Time waitTime, *idlePtr; const char *errMsg; |
︙ | ︙ | |||
1149 1150 1151 1152 1153 1154 1155 | } else { rPtr->retcode = 0; } #endif if (rPtr->retcode == 1) { errMsg = Tcl_GetString(Tcl_GetObjResult(interp)); | | | | 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 | } else { rPtr->retcode = 0; } #endif if (rPtr->retcode == 1) { errMsg = Tcl_GetString(Tcl_GetObjResult(interp)); rPtr->result = strcpy((char *)ckalloc(strlen(errMsg)+1), errMsg); Tcl_ConditionNotify(&tpoolPtr->cond); Tcl_MutexUnlock(&startMutex); goto out; } /* * Initialize the interpreter */ if (tpoolPtr->initScript) { TpoolEval(interp, tpoolPtr->initScript, -1, rPtr); if (rPtr->retcode != TCL_OK) { rPtr->retcode = 1; errMsg = Tcl_GetString(Tcl_GetObjResult(interp)); rPtr->result = strcpy((char *)ckalloc(strlen(errMsg)+1), errMsg); Tcl_ConditionNotify(&tpoolPtr->cond); Tcl_MutexUnlock(&startMutex); goto out; } } /* |
︙ | ︙ | |||
1235 1236 1237 1238 1239 1240 1241 | break; /* Kill worker because pool is going down */ } Tcl_MutexUnlock(&tpoolPtr->mutex); TpoolEval(interp, rPtr->script, rPtr->scriptLen, rPtr); ckfree(rPtr->script); Tcl_MutexLock(&tpoolPtr->mutex); if (!rPtr->detached) { | | | | 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 | break; /* Kill worker because pool is going down */ } Tcl_MutexUnlock(&tpoolPtr->mutex); TpoolEval(interp, rPtr->script, rPtr->scriptLen, rPtr); ckfree(rPtr->script); Tcl_MutexLock(&tpoolPtr->mutex); if (!rPtr->detached) { int isNew; Tcl_SetHashValue(Tcl_CreateHashEntry(&tpoolPtr->jobsDone, (void *)(size_t)rPtr->jobId, &isNew), (ClientData)rPtr); SignalWaiter(tpoolPtr); } else { ckfree((char*)rPtr); } } |
︙ | ︙ | |||
1286 1287 1288 1289 1290 1291 1292 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | < > | 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int RunStopEvent( Tcl_Event *eventPtr, int mask ) { ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); tsdPtr->stop = 1; return 1; } /* |
︙ | ︙ | |||
1313 1314 1315 1316 1317 1318 1319 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | | < > | 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void PushWork( TpoolResult *rPtr, ThreadPool *tpoolPtr ) { SpliceIn(rPtr, tpoolPtr->workHead); if (tpoolPtr->workTail == NULL) { tpoolPtr->workTail = rPtr; } } /* |
︙ | ︙ | |||
1340 1341 1342 1343 1344 1345 1346 | * Side effects: * None. * *---------------------------------------------------------------------- */ static TpoolResult * | | | < > | 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 | * Side effects: * None. * *---------------------------------------------------------------------- */ static TpoolResult * PopWork( ThreadPool *tpoolPtr ) { TpoolResult *rPtr = tpoolPtr->workTail; if (rPtr == NULL) { return NULL; } tpoolPtr->workTail = rPtr->prevPtr; |
︙ | ︙ | |||
1374 1375 1376 1377 1378 1379 1380 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | < > | 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void PushWaiter( ThreadPool *tpoolPtr ) { ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); SpliceIn(tsdPtr->waitPtr, tpoolPtr->waitHead); if (tpoolPtr->waitTail == NULL) { tpoolPtr->waitTail = tsdPtr->waitPtr; } } |
︙ | ︙ | |||
1402 1403 1404 1405 1406 1407 1408 | * Side effects: * None. * *---------------------------------------------------------------------- */ static TpoolWaiter* | | | < > | 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 | * Side effects: * None. * *---------------------------------------------------------------------- */ static TpoolWaiter* PopWaiter( ThreadPool *tpoolPtr ) { TpoolWaiter *waitPtr = tpoolPtr->waitTail; if (waitPtr == NULL) { return NULL; } tpoolPtr->waitTail = waitPtr->prevPtr; |
︙ | ︙ | |||
1436 1437 1438 1439 1440 1441 1442 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static ThreadPool* | | | < > | 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static ThreadPool* GetTpool( const char *tpoolName ) { ThreadPool *tpoolPtr; Tcl_MutexLock(&listMutex); tpoolPtr = GetTpoolUnl(tpoolName); Tcl_MutexUnlock(&listMutex); return tpoolPtr; |
︙ | ︙ | |||
1467 1468 1469 1470 1471 1472 1473 | * Side effects: * None. * *---------------------------------------------------------------------- */ static ThreadPool* | | | < > | 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 | * Side effects: * None. * *---------------------------------------------------------------------- */ static ThreadPool* GetTpoolUnl ( const char *tpoolName ) { ThreadPool *tpool; ThreadPool *tpoolPtr = NULL; if (sscanf(tpoolName, TPOOL_HNDLPREFIX"%p", &tpool) != 1) { return NULL; } for (tpoolPtr = tpoolList; tpoolPtr; tpoolPtr = tpoolPtr->nextPtr) { |
︙ | ︙ | |||
1501 1502 1503 1504 1505 1506 1507 | * * Side effects: * Many, depending on the script. * *---------------------------------------------------------------------- */ static int | | | | | | < > | | | | 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 | * * Side effects: * Many, depending on the script. * *---------------------------------------------------------------------- */ static int TpoolEval( Tcl_Interp *interp, char *script, size_t scriptLen, TpoolResult *rPtr ) { int ret; size_t reslen; const char *result; const char *errorCode, *errorInfo; ret = Tcl_EvalEx(interp, script, scriptLen, TCL_EVAL_GLOBAL); if (rPtr == NULL || rPtr->detached) { return ret; } rPtr->retcode = ret; if (ret == TCL_ERROR) { errorCode = Tcl_GetVar2(interp, "errorCode", NULL, TCL_GLOBAL_ONLY); errorInfo = Tcl_GetVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY); if (errorCode != NULL) { rPtr->errorCode = (char *)ckalloc(1 + strlen(errorCode)); strcpy(rPtr->errorCode, errorCode); } if (errorInfo != NULL) { rPtr->errorInfo = (char *)ckalloc(1 + strlen(errorInfo)); strcpy(rPtr->errorInfo, errorInfo); } } result = Tcl_GetString(Tcl_GetObjResult(interp)); reslen = Tcl_GetObjResult(interp)->length; if (reslen == 0) { rPtr->result = threadEmptyResult; } else { rPtr->result = strcpy((char *)ckalloc(1 + reslen), result); } return ret; } /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
1558 1559 1560 1561 1562 1563 1564 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | | < > | 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static void SetResult( Tcl_Interp *interp, TpoolResult *rPtr ) { if (rPtr->retcode == TCL_ERROR) { if (rPtr->errorCode) { if (interp) { Tcl_SetObjErrorCode(interp,Tcl_NewStringObj(rPtr->errorCode,-1)); } ckfree(rPtr->errorCode); rPtr->errorCode = NULL; |
︙ | ︙ | |||
1610 1611 1612 1613 1614 1615 1616 | * * Side effects: * May tear-down the threadpool if refcount drops to 0 or below. * *---------------------------------------------------------------------- */ static int | | | < > | | < > | 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 | * * Side effects: * May tear-down the threadpool if refcount drops to 0 or below. * *---------------------------------------------------------------------- */ static int TpoolReserve( ThreadPool *tpoolPtr ) { return ++tpoolPtr->refCount; } /* *---------------------------------------------------------------------- * * TpoolRelease -- * * Does the pool preserve and/or release. Assumes caller holds * the listMutex. * * Results: * None. * * Side effects: * May tear-down the threadpool if refcount drops to 0 or below. * *---------------------------------------------------------------------- */ static size_t TpoolRelease( ThreadPool *tpoolPtr ) { ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); TpoolResult *rPtr; Tcl_HashEntry *hPtr; Tcl_HashSearch search; if (tpoolPtr->refCount-- > 1) { return tpoolPtr->refCount; |
︙ | ︙ | |||
1738 1739 1740 1741 1742 1743 1744 | * Side effects: * During the suspended state, pool worker threads wlll not timeout * even if the worker inactivity timer has been configured. * *---------------------------------------------------------------------- */ static void | | | < > | 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 | * Side effects: * During the suspended state, pool worker threads wlll not timeout * even if the worker inactivity timer has been configured. * *---------------------------------------------------------------------- */ static void TpoolSuspend( ThreadPool *tpoolPtr ) { Tcl_MutexLock(&tpoolPtr->mutex); tpoolPtr->suspend = 1; Tcl_MutexUnlock(&tpoolPtr->mutex); } /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
1763 1764 1765 1766 1767 1768 1769 | * * Side effects: * Pool workers may be started or awaken. * *---------------------------------------------------------------------- */ static void | | | < > | 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 | * * Side effects: * Pool workers may be started or awaken. * *---------------------------------------------------------------------- */ static void TpoolResume( ThreadPool *tpoolPtr ) { Tcl_MutexLock(&tpoolPtr->mutex); tpoolPtr->suspend = 0; Tcl_ConditionNotify(&tpoolPtr->cond); Tcl_MutexUnlock(&tpoolPtr->mutex); } /* |
︙ | ︙ | |||
1788 1789 1790 1791 1792 1793 1794 | * * Side effects: * The waiter thread will exit from the event loop. * *---------------------------------------------------------------------- */ static void | | | < > | 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 | * * Side effects: * The waiter thread will exit from the event loop. * *---------------------------------------------------------------------- */ static void SignalWaiter( ThreadPool *tpoolPtr ) { TpoolWaiter *waitPtr; Tcl_Event *evPtr; waitPtr = PopWaiter(tpoolPtr); if (waitPtr == NULL) { return; } |
︙ | ︙ | |||
1851 1852 1853 1854 1855 1856 1857 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | < > | 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static void ThrExitHandler( ClientData clientData ) { ThreadSpecificData *tsdPtr = (ThreadSpecificData *)clientData; ckfree((char*)tsdPtr->waitPtr); } /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
1875 1876 1877 1878 1879 1880 1881 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | < > | 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static void AppExitHandler( ClientData clientData ) { ThreadPool *tpoolPtr; Tcl_MutexLock(&listMutex); /* * Restart with head of list each time until empty. [Bug 1427570] */ for (tpoolPtr = tpoolList; tpoolPtr; tpoolPtr = tpoolList) { |
︙ | ︙ | |||
1908 1909 1910 1911 1912 1913 1914 | * On first load, creates application exit handler to clean up * any threadpools left. * *---------------------------------------------------------------------- */ int | | | < > | 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 | * On first load, creates application exit handler to clean up * any threadpools left. * *---------------------------------------------------------------------- */ int Tpool_Init ( Tcl_Interp *interp /* Interp where to create cmds */ ) { static int initialized; TCL_CMD(interp, TPOOL_CMD_PREFIX"create", TpoolCreateObjCmd); TCL_CMD(interp, TPOOL_CMD_PREFIX"names", TpoolNamesObjCmd); TCL_CMD(interp, TPOOL_CMD_PREFIX"post", TpoolPostObjCmd); TCL_CMD(interp, TPOOL_CMD_PREFIX"wait", TpoolWaitObjCmd); TCL_CMD(interp, TPOOL_CMD_PREFIX"cancel", TpoolCancelObjCmd); |
︙ | ︙ |
Changes to generic/threadSpCmd.c.
︙ | ︙ | |||
172 173 174 175 176 177 178 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadMutexObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int opt, ret; size_t nameLen; const char *mutexName; char type; SpMutex *mutexPtr; static const char *cmdOpts[] = { |
︙ | ︙ | |||
348 349 350 351 352 353 354 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadRWMutexObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int opt, ret; size_t nameLen; const char *mutexName; SpMutex *mutexPtr; Sp_ReadWriteMutex *rwPtr; Sp_AnyMutex **lockPtr; |
︙ | ︙ | |||
512 513 514 515 516 517 518 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadCondObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int opt, ret, timeMsec = 0; size_t nameLen; const char *condvName, *mutexName; SpMutex *mutexPtr; SpCondv *condvPtr; static const char *cmdOpts[] = { |
︙ | ︙ | |||
680 681 682 683 684 685 686 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadEvalObjCmd( ClientData dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int ret, optx, internal; const char *mutexName; Tcl_Obj *scriptObj; SpMutex *mutexPtr = NULL; static Sp_RecursiveMutex evalMutex; /* |
︙ | ︙ | |||
925 926 927 928 929 930 931 | * *---------------------------------------------------------------------- */ static void AddAnyItem(int type, const char *handle, size_t len, SpItem *itemPtr) { | | | | 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 | * *---------------------------------------------------------------------- */ static void AddAnyItem(int type, const char *handle, size_t len, SpItem *itemPtr) { int isNew; SpBucket *bucketPtr = GetBucket(type, handle, len); Tcl_HashEntry *hashEntryPtr; Tcl_MutexLock(&bucketPtr->lock); hashEntryPtr = Tcl_CreateHashEntry(&bucketPtr->handles, handle, &isNew); Tcl_SetHashValue(hashEntryPtr, (ClientData)itemPtr); itemPtr->refcnt = 0; itemPtr->bucket = bucketPtr; itemPtr->hentry = hashEntryPtr; Tcl_MutexUnlock(&bucketPtr->lock); |
︙ | ︙ | |||
1070 1071 1072 1073 1074 1075 1076 | * Initializes shared hash table for storing sync primitive * handles and pointers. * *---------------------------------------------------------------------- */ int | | | < > | 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 | * Initializes shared hash table for storing sync primitive * handles and pointers. * *---------------------------------------------------------------------- */ int Sp_Init ( Tcl_Interp *interp /* Interp where to create cmds */ ) { SpBucket *bucketPtr; if (!initOnce) { Tcl_MutexLock(&initMutex); if (!initOnce) { int ii; for (ii = 0; ii < NUMSPBUCKETS; ii++) { |
︙ | ︙ |
Changes to generic/threadSpCmd.h.
1 2 | /* * This is the header file for the module that implements some missing | | | 1 2 3 4 5 6 7 8 9 10 | /* * This is the header file for the module that implements some missing * synchronization primitives from the Tcl API. * * Copyright (c) 2002 by Zoran Vasiljevic. * * See the file "license.txt" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * --------------------------------------------------------------------------- */ |
︙ | ︙ |
Changes to generic/threadSvCmd.c.
︙ | ︙ | |||
506 507 508 509 510 511 512 | static Container * AcquireContainer( Array *arrayPtr, const char *key, int flags) { | | | | 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 | static Container * AcquireContainer( Array *arrayPtr, const char *key, int flags) { int isNew; Tcl_Obj *tclObj = NULL; Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&arrayPtr->vars, key); if (hPtr == NULL) { PsStore *psPtr = arrayPtr->psPtr; if (psPtr) { char *val = NULL; size_t len = 0; if (psPtr->psGet(psPtr->psHandle, key, &val, &len) == 0) { tclObj = Tcl_NewStringObj(val, len); psPtr->psFree(psPtr->psHandle, val); } } if (!(flags & FLAGS_CREATEVAR) && tclObj == NULL) { return NULL; } if (tclObj == NULL) { tclObj = Tcl_NewObj(); } hPtr = Tcl_CreateHashEntry(&arrayPtr->vars, key, &isNew); Tcl_SetHashValue(hPtr, CreateContainer(arrayPtr, hPtr, tclObj)); } return (Container*)Tcl_GetHashValue(hPtr); } /* |
︙ | ︙ | |||
566 567 568 569 570 571 572 | char *key, *val; switch (mode) { case SV_UNCHANGED: return TCL_OK; case SV_ERROR: return TCL_ERROR; case SV_CHANGED: if (psPtr) { | | | 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 | char *key, *val; switch (mode) { case SV_UNCHANGED: return TCL_OK; case SV_ERROR: return TCL_ERROR; case SV_CHANGED: if (psPtr) { key = (char *)Tcl_GetHashKey(&svObj->arrayPtr->vars, svObj->entryPtr); val = Tcl_GetString(svObj->tclObj); len = svObj->tclObj->length; if (psPtr->psPut(psPtr->psHandle, key, val, len) == -1) { const char *err = psPtr->psError(psPtr->psHandle); Tcl_SetObjResult(interp, Tcl_NewStringObj(err, -1)); return TCL_ERROR; } |
︙ | ︙ | |||
657 658 659 660 661 662 663 | } if (svObj->handlePtr) { Tcl_DeleteHashEntry(svObj->handlePtr); } if (svObj->entryPtr) { PsStore *psPtr = svObj->arrayPtr->psPtr; if (psPtr) { | | | 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 | } if (svObj->handlePtr) { Tcl_DeleteHashEntry(svObj->handlePtr); } if (svObj->entryPtr) { PsStore *psPtr = svObj->arrayPtr->psPtr; if (psPtr) { char *key = (char *)Tcl_GetHashKey(&svObj->arrayPtr->vars,svObj->entryPtr); if (psPtr->psDelete(psPtr->psHandle, key) == -1) { return TCL_ERROR; } } Tcl_DeleteHashEntry(svObj->entryPtr); } |
︙ | ︙ | |||
795 796 797 798 799 800 801 | */ static Array * CreateArray( Bucket *bucketPtr, const char *arrayName) { | | | | | 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 | */ static Array * CreateArray( Bucket *bucketPtr, const char *arrayName) { int isNew; Array *arrayPtr; Tcl_HashEntry *hPtr; hPtr = Tcl_CreateHashEntry(&bucketPtr->arrays, arrayName, &isNew); if (!isNew) { return (Array*)Tcl_GetHashValue(hPtr); } arrayPtr = (Array*)ckalloc(sizeof(Array)); arrayPtr->bucketPtr = bucketPtr; arrayPtr->entryPtr = hPtr; arrayPtr->psPtr = NULL; |
︙ | ︙ | |||
991 992 993 994 995 996 997 | * Some object may, when copied, loose their type, i.e. will become * just plain string objects. * *----------------------------------------------------------------------------- */ Tcl_Obj * | | | < > | 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 | * Some object may, when copied, loose their type, i.e. will become * just plain string objects. * *----------------------------------------------------------------------------- */ Tcl_Obj * Sv_DuplicateObj( register Tcl_Obj *objPtr /* The object to duplicate. */ ) { register Tcl_Obj *dupPtr = Tcl_NewObj(); /* * Handle the internal rep */ if (objPtr->typePtr != NULL) { |
︙ | ︙ | |||
1139 1140 1141 1142 1143 1144 1145 | static int SvObjObjCmd( ClientData arg, /* != NULL if aolSpecial */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { | | | 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 | static int SvObjObjCmd( ClientData arg, /* != NULL if aolSpecial */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { int isNew, off, ret, flg; char buf[128]; Tcl_Obj *val = NULL; Container *svObj = NULL; /* * Syntax: sv::object array key ?var? */ |
︙ | ︙ | |||
1170 1171 1172 1173 1174 1175 1176 | break; case TCL_ERROR: return TCL_ERROR; } if (svObj->handlePtr == NULL) { Tcl_HashTable *handles = &svObj->arrayPtr->bucketPtr->handles; | | | | 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 | break; case TCL_ERROR: return TCL_ERROR; } if (svObj->handlePtr == NULL) { Tcl_HashTable *handles = &svObj->arrayPtr->bucketPtr->handles; svObj->handlePtr = Tcl_CreateHashEntry(handles, (char*)svObj, &isNew); } /* * Format the command name */ sprintf(buf, "::%p", (int*)svObj); svObj->aolSpecial = (arg != NULL); Tcl_CreateObjCommand(interp, buf, SvObjDispatchObjCmd, svObj, NULL); Tcl_ResetResult(interp); Tcl_SetObjResult(interp, Tcl_NewStringObj(buf, -1)); return Sv_PutContainer(interp, svObj, SV_UNCHANGED); } /* |
︙ | ︙ | |||
1311 1312 1313 1314 1315 1316 1317 | } else if (index == AGET || index == ANAMES) { if (arrayPtr) { Tcl_HashSearch search; Tcl_Obj *resObj = Tcl_NewListObj(0, NULL); const char *pattern = (argx == 0) ? NULL : Tcl_GetString(objv[argx]); Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&arrayPtr->vars,&search); while (hPtr) { | | | 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 | } else if (index == AGET || index == ANAMES) { if (arrayPtr) { Tcl_HashSearch search; Tcl_Obj *resObj = Tcl_NewListObj(0, NULL); const char *pattern = (argx == 0) ? NULL : Tcl_GetString(objv[argx]); Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&arrayPtr->vars,&search); while (hPtr) { char *key = (char *)Tcl_GetHashKey(&arrayPtr->vars, hPtr); if (pattern == NULL || Tcl_StringCaseMatch(key, pattern, 0)) { Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj(key, -1)); if (index == AGET) { elObj = (Container*)Tcl_GetHashValue(hPtr); Tcl_ListObjAppendElement(interp, resObj, Sv_DuplicateObj(elObj->tclObj)); |
︙ | ︙ | |||
1343 1344 1345 1346 1347 1348 1349 | * storage and cache all key/value pairs found there into tne * newly created shared array. */ PsStore *psPtr; Tcl_HashEntry *hPtr; size_t len; | | | 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 | * storage and cache all key/value pairs found there into tne * newly created shared array. */ PsStore *psPtr; Tcl_HashEntry *hPtr; size_t len; int isNew; char *psurl, *key = NULL, *val = NULL; if (objc < 4) { Tcl_WrongNumArgs(interp, 2, objv, "array handle"); ret = TCL_ERROR; goto cmdExit; } |
︙ | ︙ | |||
1372 1373 1374 1375 1376 1377 1378 | ret = TCL_ERROR; goto cmdExit; } if (arrayPtr) { Tcl_HashSearch search; hPtr = Tcl_FirstHashEntry(&arrayPtr->vars,&search); arrayPtr->psPtr = psPtr; | | | | | | 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 | ret = TCL_ERROR; goto cmdExit; } if (arrayPtr) { Tcl_HashSearch search; hPtr = Tcl_FirstHashEntry(&arrayPtr->vars,&search); arrayPtr->psPtr = psPtr; arrayPtr->bindAddr = strcpy((char *)ckalloc(len+1), psurl); while (hPtr) { svObj = (Container *)Tcl_GetHashValue(hPtr); if (ReleaseContainer(interp, svObj, SV_CHANGED) != TCL_OK) { ret = TCL_ERROR; goto cmdExit; } hPtr = Tcl_NextHashEntry(&search); } } else { arrayPtr = LockArray(interp, arrayName, FLAGS_CREATEARRAY); arrayPtr->psPtr = psPtr; arrayPtr->bindAddr = strcpy((char *)ckalloc(len+1), psurl); } if (!psPtr->psFirst(psPtr->psHandle, &key, &val, &len)) { do { Tcl_Obj * tclObj = Tcl_NewStringObj(val, len); hPtr = Tcl_CreateHashEntry(&arrayPtr->vars, key, &isNew); Tcl_SetHashValue(hPtr, CreateContainer(arrayPtr, hPtr, tclObj)); psPtr->psFree(psPtr->psHandle, val); } while (!psPtr->psNext(psPtr->psHandle, &key, &val, &len)); } } else if (index == AUNBIND) { if (!arrayPtr || !arrayPtr->psPtr) { |
︙ | ︙ | |||
1526 1527 1528 1529 1530 1531 1532 | resObj = Tcl_NewListObj(0, NULL); for (i = 0; i < NUMBUCKETS; i++) { Bucket *bucketPtr = &buckets[i]; LOCK_BUCKET(bucketPtr); hPtr = Tcl_FirstHashEntry(&bucketPtr->arrays, &search); while (hPtr) { | | | 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 | resObj = Tcl_NewListObj(0, NULL); for (i = 0; i < NUMBUCKETS; i++) { Bucket *bucketPtr = &buckets[i]; LOCK_BUCKET(bucketPtr); hPtr = Tcl_FirstHashEntry(&bucketPtr->arrays, &search); while (hPtr) { char *key = (char *)Tcl_GetHashKey(&bucketPtr->arrays, hPtr); if ((arg==NULL || (*key != '.')) /* Hide .<name> arrays for AOL*/ && (pattern == NULL || Tcl_StringCaseMatch(key, pattern, 0))) { Tcl_ListObjAppendElement(interp, resObj, Tcl_NewStringObj(key, -1)); } hPtr = Tcl_NextHashEntry(&search); } |
︙ | ︙ | |||
1745 1746 1747 1748 1749 1750 1751 | static int SvIncrObjCmd( ClientData arg, /* Pointer to object container */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { | | | | | 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 | static int SvIncrObjCmd( ClientData arg, /* Pointer to object container */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { int off, ret, flg, isNew = 0; Tcl_WideInt incrValue = 1, currValue = 0; Container *svObj = (Container*)arg; /* * Syntax: * tsv::incr array key ?increment? * $object incr ?increment? */ ret = Sv_GetContainer(interp, objc, objv, &svObj, &off, 0); if (ret != TCL_OK) { if (ret != TCL_BREAK) { return TCL_ERROR; } flg = FLAGS_CREATEARRAY | FLAGS_CREATEVAR; Tcl_ResetResult(interp); ret = Sv_GetContainer(interp, objc, objv, &svObj, &off, flg); if (ret != TCL_OK) { return TCL_ERROR; } isNew = 1; } if ((objc - off)) { ret = Tcl_GetWideIntFromObj(interp, objv[off], &incrValue); if (ret != TCL_OK) { goto cmd_err; } } if (isNew) { currValue = 0; } else { ret = Tcl_GetWideIntFromObj(interp, svObj->tclObj, &currValue); if (ret != TCL_OK) { goto cmd_err; } } |
︙ | ︙ | |||
1955 1956 1957 1958 1959 1960 1961 | static int SvMoveObjCmd( ClientData arg, /* Pointer to object container. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { | | | | | | 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 | static int SvMoveObjCmd( ClientData arg, /* Pointer to object container. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { int ret, off, isNew; const char *toKey; Tcl_HashEntry *hPtr; Container *svObj = (Container*)arg; /* * Syntax: * tsv::move array key to * $object move to */ ret = Sv_GetContainer(interp, objc, objv, &svObj, &off, 0); if (ret != TCL_OK) { return TCL_ERROR; } toKey = Tcl_GetString(objv[off]); hPtr = Tcl_CreateHashEntry(&svObj->arrayPtr->vars, toKey, &isNew); if (!isNew) { Tcl_AppendResult(interp, "key \"", toKey, "\" exists", NULL); goto cmd_err; } if (svObj->entryPtr) { char *key = (char *)Tcl_GetHashKey(&svObj->arrayPtr->vars, svObj->entryPtr); if (svObj->arrayPtr->psPtr) { PsStore *psPtr = svObj->arrayPtr->psPtr; if (psPtr->psDelete(psPtr->psHandle, key) == -1) { const char *err = psPtr->psError(psPtr->psHandle); Tcl_SetObjResult(interp, Tcl_NewStringObj(err, -1)); return TCL_ERROR; } |
︙ | ︙ | |||
2186 2187 2188 2189 2190 2191 2192 | * Side effects * Many new command created in current interpreter. Global data * structures used by them initialized as well. * *----------------------------------------------------------------------------- */ int | | | < > | 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 | * Side effects * Many new command created in current interpreter. Global data * structures used by them initialized as well. * *----------------------------------------------------------------------------- */ int Sv_Init ( Tcl_Interp *interp ) { int i; Bucket *bucketPtr; SvCmdInfo *cmdPtr; Tcl_Obj *obj; #ifdef SV_FINALIZE /* |
︙ | ︙ |
Changes to generic/threadSvKeylistCmd.c.
︙ | ︙ | |||
93 94 95 96 97 98 99 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvKeylsetObjCmd( void *arg, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int i, off, ret, flg; char *key; Tcl_Obj *val; Container *svObj = (Container*)arg; /* * Syntax: |
︙ | ︙ | |||
152 153 154 155 156 157 158 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvKeylgetObjCmd( void *arg, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int ret, flg, off; char *key; Tcl_Obj *varObjPtr = NULL, *valObjPtr = NULL; Container *svObj = (Container*)arg; /* * Syntax: |
︙ | ︙ | |||
240 241 242 243 244 245 246 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvKeyldelObjCmd( void *arg, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int i, off, ret; char *key; Container *svObj = (Container*)arg; /* * Syntax: * sv::keyldel array lkey key ?key ...? |
︙ | ︙ | |||
299 300 301 302 303 304 305 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvKeylkeysObjCmd( void *arg, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int ret, off; char *key = NULL; Tcl_Obj *listObj = NULL; Container *svObj = (Container*)arg; /* * Syntax: |
︙ | ︙ |
Changes to generic/threadSvListCmd.c.
︙ | ︙ | |||
15 16 17 18 19 20 21 | #if TCL_MAJOR_VERSION > 8 #define tclSizeT size_t #elif defined(USE_TCL_STUBS) #define tclSizeT int /* Little hack to eliminate the need for "tclInt.h" here: Just copy a small portion of TclIntStubs, just enough to make it work */ | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | #if TCL_MAJOR_VERSION > 8 #define tclSizeT size_t #elif defined(USE_TCL_STUBS) #define tclSizeT int /* Little hack to eliminate the need for "tclInt.h" here: Just copy a small portion of TclIntStubs, just enough to make it work */ typedef struct TclIntStubs { int magic; void *hooks; void (*dummy[34]) (void); /* dummy entries 0-33, not used */ int (*tclGetIntForIndex) (Tcl_Interp *interp, Tcl_Obj *objPtr, int endValue, int *indexPtr); /* 34 */ } TclIntStubs; extern const struct TclIntStubs *tclIntStubsPtr; # undef Tcl_GetIntForIndex # define Tcl_GetIntForIndex(interp, obj, max, ptr) ((threadTclVersion>86)? \ ((int (*)(Tcl_Interp*, Tcl_Obj *, int, int*))((&(tclStubsPtr->tcl_PkgProvideEx))[645]))((interp), (obj), (max), (ptr)): \ tclIntStubsPtr->tclGetIntForIndex((interp), (obj), (max), (ptr))) #elif TCL_MINOR_VERSION < 7 extern int TclGetIntForIndex(Tcl_Interp*, Tcl_Obj *, int, int*); |
︙ | ︙ | |||
145 146 147 148 149 150 151 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLpopObjCmd ( ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { int ret, off, llen, iarg = 0; tclSizeT index = 0; Tcl_Obj *elPtr = NULL; Container *svObj = (Container*)arg; /* * Syntax: |
︙ | ︙ | |||
225 226 227 228 229 230 231 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLpushObjCmd ( ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { int off, ret, flg, llen; tclSizeT index = 0; Tcl_Obj *args[1]; Container *svObj = (Container*)arg; /* * Syntax: |
︙ | ︙ | |||
298 299 300 301 302 303 304 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLappendObjCmd( ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { int i, ret, flg, off; Tcl_Obj *dup; Container *svObj = (Container*)arg; /* * Syntax: * tsv::lappend array key value ?value ...? |
︙ | ︙ | |||
358 359 360 361 362 363 364 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLreplaceObjCmd( ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { const char *firstArg; size_t argLen; int ret, off, llen, ndel, nargs, i, j; tclSizeT first, last; Tcl_Obj **args = NULL; Container *svObj = (Container*)arg; |
︙ | ︙ | |||
458 459 460 461 462 463 464 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLrangeObjCmd( ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { int ret, off, llen, nargs, i, j; tclSizeT first, last; Tcl_Obj **elPtrs, **args; Container *svObj = (Container*)arg; /* * Syntax: |
︙ | ︙ | |||
540 541 542 543 544 545 546 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLinsertObjCmd( ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { int off, ret, flg, llen, nargs, i, j; tclSizeT index = 0; Tcl_Obj **args; Container *svObj = (Container*)arg; /* * Syntax: |
︙ | ︙ | |||
620 621 622 623 624 625 626 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLlengthObjCmd( ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { int llen, off, ret; Container *svObj = (Container*)arg; /* * Syntax: * tsv::llength array key * $list llength |
︙ | ︙ | |||
669 670 671 672 673 674 675 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLsearchObjCmd( ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { size_t length; int ret, off, listc, mode, imode, ipatt, index, match, i; const char *patBytes; Tcl_Obj **listv; Container *svObj = (Container*)arg; static const char *modes[] = {"-exact", "-glob", "-regexp", NULL}; |
︙ | ︙ | |||
775 776 777 778 779 780 781 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLindexObjCmd( ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { Tcl_Obj **elPtrs; int ret, off, llen; tclSizeT index; Container *svObj = (Container*)arg; /* * Syntax: |
︙ | ︙ | |||
836 837 838 839 840 841 842 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLsetObjCmd( ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { Tcl_Obj *lPtr; int ret, argc, off; Container *svObj = (Container*)arg; /* * Syntax: * tsv::lset array key index ?index ...? value |
︙ | ︙ | |||
900 901 902 903 904 905 906 | * available to Tcl API programmer. We could include the tclInt.h and * get the copy more efficient using list internals, but ... * *----------------------------------------------------------------------------- */ static void | | | | < > | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 | * available to Tcl API programmer. We could include the tclInt.h and * get the copy more efficient using list internals, but ... * *----------------------------------------------------------------------------- */ static void DupListObjShared( Tcl_Obj *srcPtr, /* Object with internal rep to copy. */ Tcl_Obj *copyPtr /* Object with internal rep to set. */ ) { int i, llen; Tcl_Obj *elObj, **newObjList; Tcl_ListObjLength(NULL, srcPtr, &llen); if (llen == 0) { (*srcPtr->typePtr->dupIntRepProc)(srcPtr, copyPtr); copyPtr->refCount = 0; |
︙ | ︙ | |||
942 943 944 945 946 947 948 | * Actual return value of this procedure is irrelevant to the caller, * and it should be either NULL or non-NULL. * *---------------------------------------------------------------------- */ static Tcl_Obj* | | | | | | | < > | 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 | * Actual return value of this procedure is irrelevant to the caller, * and it should be either NULL or non-NULL. * *---------------------------------------------------------------------- */ static Tcl_Obj* SvLsetFlat( Tcl_Interp *interp, /* Tcl interpreter */ Tcl_Obj *listPtr, /* Pointer to the list being modified */ int indexCount, /* Number of index args */ Tcl_Obj **indexArray, Tcl_Obj *valuePtr /* Value arg to 'lset' */ ) { int elemCount, result, i; tclSizeT index; Tcl_Obj **elemPtrs, *chainPtr, *subListPtr; /* * Determine whether the index arg designates a list * or a single index. |
︙ | ︙ |