Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merge trunk |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | novem |
Files: | files | file ages | folders |
SHA3-256: |
5dbfaa6b673844e0d8c67f1ff860d259 |
User & Date: | jan.nijtmans 2019-07-02 15:40:22.460 |
References
2024-07-30
| ||
16:14 | • Ticket [741231ddf0] tsv::lindex foo bar -1 returns signal 11 instead of {} status still Open with 4 other changes artifact: 58d3a9ba7f user: sebres | |
Context
2019-07-03
| ||
10:53 | Merge trunk check-in: d07114f217 user: jan.nijtmans tags: novem | |
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 | |
2019-06-29
| ||
21:06 | Merge trunk check-in: 0238d42a96 user: jan.nijtmans tags: novem | |
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.
︙ | ︙ | |||
50 51 52 53 54 55 56 | /* * Macro that behaves like strdup, only uses Tcl_Alloc. Also macro that does the * same with a string that might contain zero bytes, */ #define ckstrdup(sourceStr) \ | | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | /* * Macro that behaves like strdup, only uses Tcl_Alloc. Also macro that does the * same with a string that might contain zero bytes, */ #define ckstrdup(sourceStr) \ (strcpy ((char *)Tcl_Alloc (strlen (sourceStr) + 1), sourceStr)) #define ckbinstrdup(sourceStr, length) \ ((char *) memcpy ((char *)Tcl_Alloc (length + 1), sourceStr, length + 1)) /* * Used to return argument messages by most commands. */ static const char *tclXWrongArgs = "wrong # args: "; static const Tcl_ObjType *listType; |
︙ | ︙ | |||
75 76 77 78 79 80 81 | * Parameters: * o objPtr - Object to check. * Returns: * 1 if NULL, 0 if not. *----------------------------------------------------------------------------- */ static int | | | < > | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | * 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); } |
︙ | ︙ | |||
139 140 141 142 143 144 145 | * o commandNameObj - Object containing name of command (objv[0]) * o string - Text message to append. * Returns: * TCL_ERROR *----------------------------------------------------------------------------- */ static int | | | | | < > | | | 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 | * 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 */ |
︙ | ︙ | |||
276 277 278 279 280 281 282 | SetKeyedListFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr); static void UpdateStringOfKeyedList(Tcl_Obj *keylPtr); static int | | > > > > > > | < < < < < < | | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 | 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. */ |
︙ | ︙ | |||
359 360 361 362 363 364 365 | * 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 | | | | | | < > | 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 | * 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); |
︙ | ︙ | |||
404 405 406 407 408 409 410 | * Allocate an and initialize the keyed list internal representation. * * Returns: * A pointer to the keyed list internal structure. *----------------------------------------------------------------------------- */ static keylIntObj_t * | | | | | < > | 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 | * 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 *)Tcl_Alloc(sizeof(keylIntObj_t)); keylIntPtr->arraySize = 0; keylIntPtr->numEntries = 0; keylIntPtr->entries = NULL; return keylIntPtr; } /*----------------------------------------------------------------------------- * FreeKeyedListData -- * 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++) { Tcl_Free(keylIntPtr->entries[idx].key); Tcl_DecrRefCount (keylIntPtr->entries[idx].valuePtr); } if (keylIntPtr->entries != NULL) |
︙ | ︙ | |||
452 453 454 455 456 457 458 | * 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 | | | | < > | | | | | < > | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 | * 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 *) Tcl_Alloc(newSize * sizeof(keylEntry_t)); } else { keylIntPtr->entries = (keylEntry_t *) Tcl_Realloc(keylIntPtr->entries, newSize * sizeof(keylEntry_t)); } keylIntPtr->arraySize = newSize; } KEYL_REP_ASSERT (keylIntPtr); } /*----------------------------------------------------------------------------- * DeleteKeyedListEntry -- * Delete an entry from a keyed list. * * Parameters: * o keylIntPtr - Keyed list internal representation. * o entryIdx - Index of entry to delete. *----------------------------------------------------------------------------- */ static void DeleteKeyedListEntry ( keylIntObj_t *keylIntPtr, int entryIdx ) { int idx; Tcl_Free(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]; |
︙ | ︙ | |||
517 518 519 520 521 522 523 | * 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 | | | | | | < > | 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 | * 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; |
︙ | ︙ | |||
573 574 575 576 577 578 579 | * value. * o entryPtr - The keyed list entry to initialize from the object. * Returns: * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ static int | | | | | < > | 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 | * 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), |
︙ | ︙ | |||
622 623 624 625 626 627 628 | * Free the internal representation of a keyed list. * * Parameters: * o keylPtr - Keyed list object being deleted. *----------------------------------------------------------------------------- */ static void | | | < > | | | | < > | | | | 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 | * 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 *)Tcl_Alloc(sizeof(keylIntObj_t)); copyIntPtr->arraySize = srcIntPtr->arraySize; copyIntPtr->numEntries = srcIntPtr->numEntries; copyIntPtr->entries = (keylEntry_t *) Tcl_Alloc(copyIntPtr->arraySize * sizeof(keylEntry_t)); for (idx = 0; idx < srcIntPtr->numEntries ; idx++) { copyIntPtr->entries [idx].key = ckstrdup (srcIntPtr->entries [idx].key); copyIntPtr->entries [idx].valuePtr = srcIntPtr->entries [idx].valuePtr; Tcl_IncrRefCount (copyIntPtr->entries [idx].valuePtr); |
︙ | ︙ | |||
680 681 682 683 684 685 686 | * * Parameters: * o srcPtr - Keyed list object to copy. * o copyPtr - Target object to copy internal representation to. *----------------------------------------------------------------------------- */ void | | | | < > | | | | 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 | * * 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 *)Tcl_Alloc(sizeof(keylIntObj_t)); copyIntPtr->arraySize = srcIntPtr->arraySize; copyIntPtr->numEntries = srcIntPtr->numEntries; copyIntPtr->entries = (keylEntry_t *) Tcl_Alloc(copyIntPtr->arraySize * sizeof(keylEntry_t)); for (idx = 0; idx < srcIntPtr->numEntries ; idx++) { copyIntPtr->entries [idx].key = ckstrdup (srcIntPtr->entries [idx].key); copyIntPtr->entries [idx].valuePtr = Sv_DuplicateObj (srcIntPtr->entries [idx].valuePtr); |
︙ | ︙ | |||
722 723 724 725 726 727 728 | * the keyed list recurses until lower levels are accessed. * * Parameters: * o objPtr - Object to convert to a keyed list. *----------------------------------------------------------------------------- */ static int | | | | < > | 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 | * 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; int objc; Tcl_Obj **objv; if (Tcl_ListObjGetElements (interp, objPtr, &objc, &objv) != TCL_OK) return TCL_ERROR; |
︙ | ︙ | |||
769 770 771 772 773 774 775 | * Update the string representation of a keyed list. * * Parameters: * o objPtr - Object to convert to a keyed list. *----------------------------------------------------------------------------- */ static void | | | < > | | | 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 | * 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 = (Tcl_Obj **) Tcl_Alloc(keylIntPtr->numEntries * sizeof(Tcl_Obj *)); } else { listObjv = staticListObjv; } /* * Convert each keyed list entry to a two element list object. No |
︙ | ︙ | |||
822 823 824 825 826 827 828 | * Create and initialize a new keyed list object. * * Returns: * A pointer to the object. *----------------------------------------------------------------------------- */ Tcl_Obj * | | | 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 | * 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; |
︙ | ︙ | |||
850 851 852 853 854 855 856 | * 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 | | | | | | < > | | 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 | * 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. */ |
︙ | ︙ | |||
908 909 910 911 912 913 914 | * sub-key seperated by `.'. * o valueObjPtr - The value to set for the key. * Returns: * TCL_OK or TCL_ERROR. *----------------------------------------------------------------------------- */ int | | | | | | < > | | | 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 | * 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. */ if (nextSubKey == NULL) { if (findIdx < 0) { EnsureKeyedListSpace (keylIntPtr, 1); findIdx = keylIntPtr->numEntries; keylIntPtr->numEntries++; } else { Tcl_Free(keylIntPtr->entries [findIdx].key); Tcl_DecrRefCount (keylIntPtr->entries [findIdx].valuePtr); } keylIntPtr->entries [findIdx].key = (char *) Tcl_Alloc(keyLen + 1); strncpy (keylIntPtr->entries [findIdx].key, key, keyLen); keylIntPtr->entries [findIdx].key [keyLen] = '\0'; keylIntPtr->entries [findIdx].valuePtr = valuePtr; Tcl_IncrRefCount (valuePtr); Tcl_InvalidateStringRep (keylPtr); |
︙ | ︙ | |||
982 983 984 985 986 987 988 | if (TclX_KeyedListSet (interp, newKeylPtr, nextSubKey, valuePtr) != TCL_OK) { Tcl_DecrRefCount (newKeylPtr); return TCL_ERROR; } EnsureKeyedListSpace (keylIntPtr, 1); findIdx = keylIntPtr->numEntries++; | | | 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 | if (TclX_KeyedListSet (interp, newKeylPtr, nextSubKey, valuePtr) != TCL_OK) { Tcl_DecrRefCount (newKeylPtr); return TCL_ERROR; } EnsureKeyedListSpace (keylIntPtr, 1); findIdx = keylIntPtr->numEntries++; keylIntPtr->entries [findIdx].key = (char *) Tcl_Alloc(keyLen + 1); strncpy (keylIntPtr->entries [findIdx].key, key, keyLen); keylIntPtr->entries [findIdx].key [keyLen] = '\0'; keylIntPtr->entries [findIdx].valuePtr = newKeylPtr; Tcl_IncrRefCount (newKeylPtr); Tcl_InvalidateStringRep (keylPtr); |
︙ | ︙ | |||
1011 1012 1013 1014 1015 1016 1017 | * 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 | | | | | < > | | 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 | * 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) { |
︙ | ︙ | |||
1059 1060 1061 1062 1063 1064 1065 | */ DupSharedKeyListChild (keylIntPtr, findIdx); status = TclX_KeyedListDelete (interp, keylIntPtr->entries [findIdx].valuePtr, nextSubKey); if (status == TCL_OK) { | | | 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 | */ 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); } |
︙ | ︙ | |||
1088 1089 1090 1091 1092 1093 1094 | * 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 | | | | | | < > | | 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 | * 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); |
︙ | ︙ | |||
1149 1150 1151 1152 1153 1154 1155 | /*----------------------------------------------------------------------------- * Tcl_KeylgetObjCmd -- * Implements the TCL keylget command: * keylget listvar ?key? ?retvar | {}? *----------------------------------------------------------------------------- */ static int | | | | | | < > | 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 | /*----------------------------------------------------------------------------- * 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 | {}?"); |
︙ | ︙ | |||
1230 1231 1232 1233 1234 1235 1236 | /*----------------------------------------------------------------------------- * Tcl_KeylsetObjCmd -- * Implements the TCL keylset command: * keylset listvar key value ?key value...? *----------------------------------------------------------------------------- */ static int | | | | | | < > | 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 | /*----------------------------------------------------------------------------- * 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...?"); |
︙ | ︙ | |||
1293 1294 1295 1296 1297 1298 1299 | /*----------------------------------------------------------------------------- * Tcl_KeyldelObjCmd -- * Implements the TCL keyldel command: * keyldel listvar key ?key ...? *---------------------------------------------------------------------------- */ static int | | | | | | < > | 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 | /*----------------------------------------------------------------------------- * 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 ...?"); } |
︙ | ︙ | |||
1355 1356 1357 1358 1359 1360 1361 | /*----------------------------------------------------------------------------- * Tcl_KeylkeysObjCmd -- * Implements the TCL keylkeys command: * keylkeys listvar ?key? *----------------------------------------------------------------------------- */ static int | | | | | | < > | 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 | /*----------------------------------------------------------------------------- * 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?"); } |
︙ | ︙ | |||
1411 1412 1413 1414 1415 1416 1417 | * Initialize the keyed list commands for this interpreter. * * Parameters: * o interp - Interpreter to add commands to. *----------------------------------------------------------------------------- */ void | | | < > | | | | | 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 | * 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; 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.
︙ | ︙ | |||
365 366 367 368 369 370 371 | static Tcl_ObjCmdProc ThreadJoinObjCmd; static Tcl_ObjCmdProc ThreadTransferObjCmd; static Tcl_ObjCmdProc ThreadDetachObjCmd; static Tcl_ObjCmdProc ThreadAttachObjCmd; static Tcl_ObjCmdProc ThreadCancelObjCmd; static int | | | < > | 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 | static Tcl_ObjCmdProc ThreadJoinObjCmd; static Tcl_ObjCmdProc ThreadTransferObjCmd; static Tcl_ObjCmdProc ThreadDetachObjCmd; static Tcl_ObjCmdProc ThreadAttachObjCmd; static Tcl_ObjCmdProc ThreadCancelObjCmd; static int ThreadInit( Tcl_Interp *interp /* The current Tcl interpreter */ ) { /* Tcl 8.6 interps are only supported on 32-bit machines. * Lower than that is never supported. Bye! */ const char *ver = (sizeof(size_t) == sizeof(int))? "8.6-": "9.0"; if (!((Tcl_InitStubs)(interp, ver, (TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), TCL_STUB_MAGIC))) { |
︙ | ︙ | |||
449 450 451 452 453 454 455 | * Side effects: * Adds package commands to the current interp. * *---------------------------------------------------------------------- */ DLLEXPORT int | | | < > | 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 | * 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); |
︙ | ︙ | |||
478 479 480 481 482 483 484 | * Side effects: * The list of threads is initialized to include the current thread. * *---------------------------------------------------------------------- */ static void | | | < > | 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 | * 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, |
︙ | ︙ | |||
510 511 512 513 514 515 516 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadCreateObjCmd( void *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); /* |
︙ | ︙ | |||
575 576 577 578 579 580 581 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadReserveObjCmd( void *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; |
︙ | ︙ | |||
617 618 619 620 621 622 623 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadReleaseObjCmd( void *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?"); |
︙ | ︙ | |||
666 667 668 669 670 671 672 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadUnwindObjCmd( void *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; } |
︙ | ︙ | |||
701 702 703 704 705 706 707 | * Side effects: * Lots. improper clean up of resources. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 | * Side effects: * Lots. improper clean up of resources. * *---------------------------------------------------------------------- */ static int ThreadExitObjCmd( void *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; |
︙ | ︙ | |||
747 748 749 750 751 752 753 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int ThreadIdObjCmd( void *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; |
︙ | ︙ | |||
788 789 790 791 792 793 794 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int ThreadNamesObjCmd( void *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); |
︙ | ︙ | |||
854 855 856 857 858 859 860 | static void threadSendFree(void *ptr) { Tcl_Free(ptr); } static void | | | | | | | < > | 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 | static void threadSendFree(void *ptr) { Tcl_Free(ptr); } static void threadSendObjFree(void *ptr) { Tcl_DecrRefCount((Tcl_Obj *)ptr); } static int ThreadSendObjCmd( void *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; |
︙ | ︙ | |||
931 932 933 934 935 936 937 | /* * Prepare record for the callback. This is asynchronously * posted back to us when the target thread finishes processing. * We should do a vwait on the "var" to get notified. */ | | | | 931 932 933 934 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 | /* * Prepare record for the callback. This is asynchronously * posted back to us when the target thread finishes processing. * We should do a vwait on the "var" to get notified. */ clbkPtr = (ThreadClbkData *)Tcl_Alloc(sizeof(ThreadClbkData)); if (cmd) { clbkPtr->execProc = ThreadClbkCommand; } else { clbkPtr->execProc = ThreadClbkSetVar; } clbkPtr->freeProc = threadSendObjFree; clbkPtr->interp = interp; clbkPtr->threadId = Tcl_GetCurrentThread(); clbkPtr->clientData = Sv_DuplicateObj(var); Tcl_IncrRefCount((Tcl_Obj *)clbkPtr->clientData); } /* * Prepare job record for the target thread */ sendPtr = (ThreadSendData *)Tcl_Alloc(sizeof(ThreadSendData)); sendPtr->interp = NULL; /* Signal to use thread main interp */ sendPtr->execProc = ThreadSendEval; sendPtr->freeProc = threadSendFree; sendPtr->clientData = memcpy(Tcl_Alloc(size), script, size); ret = ThreadSend(interp, thrId, sendPtr, clbkPtr, flags); |
︙ | ︙ | |||
996 997 998 999 1000 1001 1002 | * Side effects: * Script is sent to all known threads except the caller thread. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 | * Side effects: * Script is sent to all known threads except the caller thread. * *---------------------------------------------------------------------- */ static int ThreadBroadcastObjCmd( void *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); |
︙ | ︙ | |||
1053 1054 1055 1056 1057 1058 1059 | * to the head of the event queue (as out-of-band message). */ for (ii = 0; ii < nthreads; ii++) { if (thrIdArray[ii] == Tcl_GetCurrentThread()) { continue; /* Do not broadcast self */ } | | | 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 | * to the head of the event queue (as out-of-band message). */ for (ii = 0; ii < nthreads; ii++) { if (thrIdArray[ii] == Tcl_GetCurrentThread()) { continue; /* Do not broadcast self */ } sendPtr = (ThreadSendData *)Tcl_Alloc(sizeof(ThreadSendData)); *sendPtr = job; sendPtr->clientData = memcpy(Tcl_Alloc(size), script, size); ThreadSend(interp, thrIdArray[ii], sendPtr, NULL, THREAD_SEND_HEAD); } Tcl_Free(thrIdArray); Tcl_ResetResult(interp); |
︙ | ︙ | |||
1083 1084 1085 1086 1087 1088 1089 | * Side effects: * Enters the event loop. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 | * Side effects: * Enters the event loop. * *---------------------------------------------------------------------- */ static int ThreadWaitObjCmd( void *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; } |
︙ | ︙ | |||
1119 1120 1121 1122 1123 1124 1125 | * Side effects: * Registers an errorproc. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 | * Side effects: * Registers an errorproc. * *---------------------------------------------------------------------- */ static int ThreadErrorProcObjCmd( void *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?"); |
︙ | ︙ | |||
1150 1151 1152 1153 1154 1155 1156 | proc = Tcl_GetString(objv[1]); len = objv[1]->length; if (len == 0) { errorThreadId = NULL; errorProcString = NULL; } else { errorThreadId = Tcl_GetCurrentThread(); | | | | < > | 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 | proc = Tcl_GetString(objv[1]); len = objv[1]->length; if (len == 0) { errorThreadId = NULL; errorProcString = NULL; } else { errorThreadId = Tcl_GetCurrentThread(); errorProcString = (char *)Tcl_Alloc(1+strlen(proc)); strcpy(errorProcString, proc); Tcl_DeleteThreadExitHandler(ThreadFreeError, NULL); Tcl_CreateThreadExitHandler(ThreadFreeError, NULL); } } Tcl_MutexUnlock(&threadMutex); return TCL_OK; } static void ThreadFreeError( void *clientData ) { Tcl_MutexLock(&threadMutex); if (errorThreadId != Tcl_GetCurrentThread()) { Tcl_MutexUnlock(&threadMutex); return; } Tcl_Free(errorProcString); errorThreadId = NULL; |
︙ | ︙ | |||
1194 1195 1196 1197 1198 1199 1200 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadJoinObjCmd( void *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 */ |
︙ | ︙ | |||
1238 1239 1240 1241 1242 1243 1244 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadTransferObjCmd( void *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); /* |
︙ | ︙ | |||
1288 1289 1290 1291 1292 1293 1294 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadDetachObjCmd( void *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 */ |
︙ | ︙ | |||
1333 1334 1335 1336 1337 1338 1339 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadAttachObjCmd( void *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 */ |
︙ | ︙ | |||
1378 1379 1380 1381 1382 1383 1384 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadExistsObjCmd( void *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; |
︙ | ︙ | |||
1418 1419 1420 1421 1422 1423 1424 | * A standard Tcl result. * * Side effects: * None. *---------------------------------------------------------------------- */ static int | | | | | | < > | 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 | * A standard Tcl result. * * Side effects: * None. *---------------------------------------------------------------------- */ static int ThreadConfigureObjCmd( void *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)) { |
︙ | ︙ | |||
1489 1490 1491 1492 1493 1494 1495 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 | * Side effects: * See the user documentation. * *---------------------------------------------------------------------- */ static int ThreadCancelObjCmd( void *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; |
︙ | ︙ | |||
1543 1544 1545 1546 1547 1548 1549 | * * Side effects: * *---------------------------------------------------------------------- */ static int | | | | < > | | 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 | * * Side effects: * *---------------------------------------------------------------------- */ static int ThreadSendEval( Tcl_Interp *interp, void *clientData ) { ThreadSendData *sendPtr = (ThreadSendData *)clientData; char *script = (char*)sendPtr->clientData; return Tcl_EvalEx(interp, script, TCL_AUTO_LENGTH, TCL_EVAL_GLOBAL); } /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
1571 1572 1573 1574 1575 1576 1577 | * Side effects: * New Tcl variable may be created * *---------------------------------------------------------------------- */ static int | | | | < > | 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 | * Side effects: * New Tcl variable may be created * *---------------------------------------------------------------------- */ static int ThreadClbkSetVar( Tcl_Interp *interp, void *clientData ) { ThreadClbkData *clbkPtr = (ThreadClbkData*)clientData; Tcl_Obj *var = (Tcl_Obj *)clbkPtr->clientData; Tcl_Obj *valObj; ThreadEventResult *resultPtr = &clbkPtr->result; int rc = TCL_OK; /* |
︙ | ︙ | |||
1624 1625 1626 1627 1628 1629 1630 | return TCL_OK; cleanup: Tcl_DecrRefCount(valObj); return rc; } | | | 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 | return TCL_OK; cleanup: Tcl_DecrRefCount(valObj); return rc; } static int ThreadClbkCommand(Tcl_Interp *interp, void *clientData) { int status = TCL_OK; ThreadClbkData *clbkPtr = (ThreadClbkData*)clientData; Tcl_Obj *script = (Tcl_Obj *)clbkPtr->clientData; ThreadEventResult *resultPtr = &clbkPtr->result; if (resultPtr->code == TCL_ERROR) { |
︙ | ︙ | |||
1667 1668 1669 1670 1671 1672 1673 | * Side effects: * Create a thread. * *---------------------------------------------------------------------- */ static int | | | | | | | < > | 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 | * 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; |
︙ | ︙ | |||
1749 1750 1751 1752 1753 1754 1755 | * Side effects: * A Tcl script is executed in a new thread. * *---------------------------------------------------------------------- */ Tcl_ThreadCreateType | | | < > | | 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 | * Side effects: * A Tcl script is executed in a new thread. * *---------------------------------------------------------------------- */ Tcl_ThreadCreateType NewThread( void *clientData ) { ThreadCtrl *ctrlPtr = (ThreadCtrl *)clientData; ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); Tcl_Interp *interp; int result = TCL_OK; size_t scriptLen; char *evalScript; /* |
︙ | ︙ | |||
1796 1797 1798 1799 1800 1801 1802 | /* * We need to keep a pointer to the alloc'ed mem of the script * we are eval'ing, for the case that we exit during evaluation */ scriptLen = strlen(ctrlPtr->script); | | | 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 | /* * We need to keep a pointer to the alloc'ed mem of the script * we are eval'ing, for the case that we exit during evaluation */ scriptLen = strlen(ctrlPtr->script); evalScript = strcpy((char *)Tcl_Alloc(scriptLen+1), ctrlPtr->script); Tcl_CreateThreadExitHandler(ThreadExitProc, evalScript); /* * Notify the parent we are alive. */ ctrlPtr->script = NULL; |
︙ | ︙ | |||
1872 1873 1874 1875 1876 1877 1878 | * Side effects: * Send an event. * *---------------------------------------------------------------------- */ static void | | | < > | 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 | * 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) { |
︙ | ︙ | |||
1908 1909 1910 1911 1912 1913 1914 | #endif } else { ThreadGetHandle(Tcl_GetCurrentThread(), buf); argv[0] = errorProcString; argv[1] = buf; argv[2] = errorInfo; | | | 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 | #endif } else { ThreadGetHandle(Tcl_GetCurrentThread(), buf); argv[0] = errorProcString; argv[1] = buf; argv[2] = errorInfo; sendPtr = (ThreadSendData *)Tcl_Alloc(sizeof(ThreadSendData)); sendPtr->execProc = ThreadSendEval; sendPtr->freeProc = threadSendFree; sendPtr->clientData = Tcl_Merge(3, argv); sendPtr->interp = NULL; ThreadSend(interp, errorThreadId, sendPtr, NULL, 0); } |
︙ | ︙ | |||
1936 1937 1938 1939 1940 1941 1942 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | < > | 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void ListUpdate( ThreadSpecificData *tsdPtr ) { if (tsdPtr == NULL) { tsdPtr = TCL_TSD_INIT(&dataKey); } Tcl_MutexLock(&threadMutex); ListUpdateInner(tsdPtr); Tcl_MutexUnlock(&threadMutex); |
︙ | ︙ | |||
1966 1967 1968 1969 1970 1971 1972 | * Side effects: * Add the thread local storage to its list. * *---------------------------------------------------------------------- */ static void | | | < > | 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 | * 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(); |
︙ | ︙ | |||
1998 1999 2000 2001 2002 2003 2004 | * Side effects: * Remove the thread local storage from its list. * *---------------------------------------------------------------------- */ static void | | | < > | 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 | * 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); |
︙ | ︙ | |||
2027 2028 2029 2030 2031 2032 2033 | * Side effects: * Remove the thread local storage from its list. * *---------------------------------------------------------------------- */ static void | | | < > | 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 | * 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) { |
︙ | ︙ | |||
2063 2064 2065 2066 2067 2068 2069 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | < > | 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 | * 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. |
︙ | ︙ | |||
2091 2092 2093 2094 2095 2096 2097 | return 0; } /* * Allocate storage for passing thread id's to caller */ | | | 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 | return 0; } /* * Allocate storage for passing thread id's to caller */ *thrIdArray = (Tcl_ThreadId *)Tcl_Alloc(count * sizeof(Tcl_ThreadId)); /* * Second walk; fill-in the array with thread ID's */ for (tsdPtr = threadList, ii = 0; tsdPtr; tsdPtr = tsdPtr->nextPtr, ii++) { (*thrIdArray)[ii] = tsdPtr->threadId; |
︙ | ︙ | |||
2124 2125 2126 2127 2128 2129 2130 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | < > | 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int ThreadExists( Tcl_ThreadId thrId ) { ThreadSpecificData *tsdPtr; Tcl_MutexLock(&threadMutex); tsdPtr = ThreadExistsInner(thrId); Tcl_MutexUnlock(&threadMutex); return tsdPtr != NULL; |
︙ | ︙ | |||
2155 2156 2157 2158 2159 2160 2161 | * Side effects: * None. * *---------------------------------------------------------------------- */ static ThreadSpecificData * | | | < > | 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 | * 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; } } |
︙ | ︙ | |||
2186 2187 2188 2189 2190 2191 2192 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 | * 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); |
︙ | ︙ | |||
2233 2234 2235 2236 2237 2238 2239 | * The status of the exiting thread is left in the interp result * area, but only in the case of success. * *---------------------------------------------------------------------- */ static int | | | | < > | 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 | * 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 { |
︙ | ︙ | |||
2275 2276 2277 2278 2279 2280 2281 | * involved (specified and current) are modified. The channel is * moved, all event handling for the channel is killed. * *---------------------------------------------------------------------- */ static int | | | | | < > | 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 | * 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 |
︙ | ︙ | |||
2341 2342 2343 2344 2345 2346 2347 | ThreadCutChannel(interp, chan); /* * Wrap it into an event. */ | | | | 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 | ThreadCutChannel(interp, chan); /* * Wrap it into an event. */ resultPtr = (TransferResult *)Tcl_Alloc(sizeof(TransferResult)); evPtr = (TransferEvent *)Tcl_Alloc(sizeof(TransferEvent)); evPtr->chan = chan; evPtr->event.proc = TransferEventProc; evPtr->resultPtr = resultPtr; /* * Initialize the result fields. |
︙ | ︙ | |||
2452 2453 2454 2455 2456 2457 2458 | * The thread-global lists of all known channels (transferList) * is modified. All event handling for the channel is killed. * *---------------------------------------------------------------------- */ static int | | | | < > | 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 | * 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", TCL_AUTO_LENGTH)); } if (Tcl_IsChannelShared(chan)) { |
︙ | ︙ | |||
2480 2481 2482 2483 2484 2485 2486 | /* * Wrap it into the list of transfered channels. We generate no * events associated with the detached channel, thus really not * needing the transfer event structure allocated here. This * is done purely to avoid having yet another wrapper. */ | | | | 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 | /* * Wrap it into the list of transfered channels. We generate no * events associated with the detached channel, thus really not * needing the transfer event structure allocated here. This * is done purely to avoid having yet another wrapper. */ resultPtr = (TransferResult *)Tcl_Alloc(sizeof(TransferResult)); evPtr = (TransferEvent *)Tcl_Alloc(sizeof(TransferEvent)); evPtr->chan = chan; evPtr->event.proc = NULL; evPtr->resultPtr = resultPtr; /* * Initialize the result fields. This is not used. |
︙ | ︙ | |||
2538 2539 2540 2541 2542 2543 2544 | * The thread-global lists of all known channels (transferList) * is modified. * *---------------------------------------------------------------------- */ static int | | | | < > | 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 | * 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 |
︙ | ︙ | |||
2604 2605 2606 2607 2608 2609 2610 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | | < > | 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 | * 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; /* |
︙ | ︙ | |||
2666 2667 2668 2669 2670 2671 2672 | } } /* * Create the event for target thread event queue. */ | | | 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 | } } /* * Create the event for target thread event queue. */ eventPtr = (ThreadEvent *)Tcl_Alloc(sizeof(ThreadEvent)); eventPtr->sendData = send; eventPtr->clbkData = clbk; /* * Target thread about to service * another event */ |
︙ | ︙ | |||
2691 2692 2693 2694 2695 2696 2697 | if (eventPtr->clbkData) { Tcl_Preserve(eventPtr->clbkData->interp); } if ((flags & THREAD_SEND_WAIT) == 0) { resultPtr = NULL; eventPtr->resultPtr = NULL; } else { | | | 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 | if (eventPtr->clbkData) { Tcl_Preserve(eventPtr->clbkData->interp); } if ((flags & THREAD_SEND_WAIT) == 0) { resultPtr = NULL; eventPtr->resultPtr = NULL; } else { resultPtr = (ThreadEventResult *)Tcl_Alloc(sizeof(ThreadEventResult)); resultPtr->done = (Tcl_Condition)NULL; resultPtr->result = NULL; resultPtr->errorCode = NULL; resultPtr->errorInfo = NULL; resultPtr->dstThreadId = thrId; resultPtr->srcThreadId = Tcl_GetCurrentThread(); resultPtr->eventPtr = eventPtr; |
︙ | ︙ | |||
2909 2910 2911 2912 2913 2914 2915 | * * Side effects: * *---------------------------------------------------------------------- */ static int | | | | | | < > | 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 | * * 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); /* |
︙ | ︙ | |||
2981 2982 2983 2984 2985 2986 2987 | resultPtr->errorCode = NULL; resultPtr->errorInfo = NULL; resultPtr->dstThreadId = thrId; resultPtr->srcThreadId = Tcl_GetCurrentThread(); SpliceIn(resultPtr, resultList); } | | | 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 | resultPtr->errorCode = NULL; resultPtr->errorInfo = NULL; resultPtr->dstThreadId = thrId; resultPtr->srcThreadId = Tcl_GetCurrentThread(); SpliceIn(resultPtr, resultList); } evPtr = (ThreadEvent *)Tcl_Alloc(sizeof(ThreadEvent)); evPtr->event.proc = ThreadEventProc; evPtr->sendData = NULL; evPtr->clbkData = NULL; evPtr->resultPtr = resultPtr; Tcl_ThreadQueueEvent(thrId, (Tcl_Event*)evPtr, TCL_QUEUE_TAIL); Tcl_ThreadAlert(thrId); |
︙ | ︙ | |||
3024 3025 3026 3027 3028 3029 3030 | * * Side effects: * Fills out the ThreadEventResult struct. * *---------------------------------------------------------------------- */ static int | | | | < > | 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 | * * 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; |
︙ | ︙ | |||
3187 3188 3189 3190 3191 3192 3193 | * * Side effects: * *---------------------------------------------------------------------- */ static void | | | | | < > | 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 | * * 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"; |
︙ | ︙ | |||
3216 3217 3218 3219 3220 3221 3222 | } Tcl_IncrRefCount(resultPtr->result); resultPtr->code = code; if (errorCode != NULL) { size = strlen(errorCode) + 1; | | | | | | | | < > | 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 | } Tcl_IncrRefCount(resultPtr->result); resultPtr->code = code; if (errorCode != NULL) { size = strlen(errorCode) + 1; resultPtr->errorCode = (char *)memcpy(Tcl_Alloc(size), errorCode, size); } else { resultPtr->errorCode = NULL; } if (errorInfo != NULL) { size = strlen(errorInfo) + 1; resultPtr->errorInfo = (char *)memcpy(Tcl_Alloc(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. */ |
︙ | ︙ | |||
3333 3334 3335 3336 3337 3338 3339 | * * Side effects: * *---------------------------------------------------------------------- */ static int | | | | | | < > | 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 | * * 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); |
︙ | ︙ | |||
3403 3404 3405 3406 3407 3408 3409 | * * Side effects. * *---------------------------------------------------------------------- */ static void | | | < > | | 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 | * * Side effects. * *---------------------------------------------------------------------- */ static void ThreadIdleProc( void *clientData ) { int ret; ThreadSendData *sendPtr = (ThreadSendData *)clientData; ret = (*sendPtr->execProc)(sendPtr->interp, sendPtr); if (ret != TCL_OK) { ThreadErrorProc(sendPtr->interp); } Tcl_Release(sendPtr->interp); |
︙ | ︙ | |||
3435 3436 3437 3438 3439 3440 3441 | * Side effects: * Fills out the TransferResult struct. * *---------------------------------------------------------------------- */ static int | | | | < > | 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 | * 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; |
︙ | ︙ | |||
3475 3476 3477 3478 3479 3480 3481 | } } if (resultPtr) { Tcl_MutexLock(&threadMutex); resultPtr->resultCode = code; if (msg != NULL) { size_t size = strlen(msg)+1; | | | 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 | } } if (resultPtr) { Tcl_MutexLock(&threadMutex); resultPtr->resultCode = code; if (msg != NULL) { size_t size = strlen(msg)+1; resultPtr->resultMsg = (char *)memcpy(Tcl_Alloc(size), msg, size); } Tcl_ConditionNotify(&resultPtr->done); Tcl_MutexUnlock(&threadMutex); } return 1; } |
︙ | ︙ | |||
3500 3501 3502 3503 3504 3505 3506 | * * Side effects: * Clears up mem specified in clientData * *---------------------------------------------------------------------- */ static void | | | < > | | 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 | * * Side effects: * Clears up mem specified in clientData * *---------------------------------------------------------------------- */ static void ThreadFreeProc( void *clientData ) { /* * This will free send and/or callback structures * since both are the same in the beginning. */ ThreadSendData *anyPtr = (ThreadSendData *)clientData; if (anyPtr) { if (anyPtr->clientData) { (*anyPtr->freeProc)(anyPtr->clientData); } Tcl_Free(anyPtr); } |
︙ | ︙ | |||
3535 3536 3537 3538 3539 3540 3541 | * * Side effects: * It cleans up our events in the event queue for this thread. * *---------------------------------------------------------------------- */ static int | | | | < > | 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 | * * Side effects: * It cleans up our events in the event queue for this thread. * *---------------------------------------------------------------------- */ static int ThreadDeleteEvent( Tcl_Event *eventPtr, /* Really ThreadEvent */ void *clientData /* dummy */ ) { if (eventPtr->proc == ThreadEventProc) { /* * Regular script event. Just dispose memory */ ThreadEvent *evPtr = (ThreadEvent*)eventPtr; if (evPtr->sendData) { ThreadFreeProc(evPtr->sendData); |
︙ | ︙ | |||
3605 3606 3607 3608 3609 3610 3611 | * 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 | | | < > | | 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 | * 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( void *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; |
︙ | ︙ | |||
3695 3696 3697 3698 3699 3700 3701 | } 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. */ | | | 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 | } 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 *)Tcl_Alloc(1+strlen(diemsg)), diemsg); tResultPtr->resultCode = TCL_ERROR; Tcl_ConditionNotify(&tResultPtr->done); } } Tcl_MutexUnlock(&threadMutex); } |
︙ | ︙ | |||
3722 3723 3724 3725 3726 3727 3728 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | | < > | | | | | < > | | 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 | * 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; } |
︙ | ︙ | |||
3780 3781 3782 3783 3784 3785 3786 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | | < > | 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 | * 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); } |
︙ | ︙ | |||
3809 3810 3811 3812 3813 3814 3815 | * Events still pending in the thread event queue and ready to fire * are not processed. * *---------------------------------------------------------------------- */ static void | | | | < > | 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 | * 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( void *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 *)Tcl_Alloc(objv[ii+1]->length+1), val); } else if (OPT_CMP(opt, "-exitcmd")) { const char *val = Tcl_GetString(objv[ii+1]); exs = strcpy((char *)Tcl_Alloc(objv[ii+1]->length+1), val); } else { goto usage; } } /* * Do some consistency checking |
︙ | ︙ | |||
262 263 264 265 266 267 268 | maxw = minw; } /* * Allocate and initialize thread pool structure */ | | | 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 | maxw = minw; } /* * Allocate and initialize thread pool structure */ tpoolPtr = (ThreadPool *)Tcl_Alloc(sizeof(ThreadPool)); memset(tpoolPtr, 0, sizeof(ThreadPool)); tpoolPtr->minWorkers = minw; tpoolPtr->maxWorkers = maxw; tpoolPtr->idleTime = idle; tpoolPtr->initScript = cmd; tpoolPtr->exitScript = exs; |
︙ | ︙ | |||
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( void *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; |
︙ | ︙ | |||
452 453 454 455 456 457 458 | } } /* * Create new job ticket and put it on the list. */ | | | | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 | } } /* * Create new job ticket and put it on the list. */ rPtr = (TpoolResult *)Tcl_Alloc(sizeof(TpoolResult)); memset(rPtr, 0, sizeof(TpoolResult)); if (detached == 0) { jobId = ++tpoolPtr->jobId; rPtr->jobId = jobId; } rPtr->script = strcpy((char *)Tcl_Alloc(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( void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int ii, done; int wObjc; Tcl_WideInt jobId; char *tpoolName; Tcl_Obj *listVar = NULL; Tcl_Obj *waitList, *doneList, **wObjv; ThreadPool *tpoolPtr; |
︙ | ︙ | |||
613 614 615 616 617 618 619 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolCancelObjCmd( void *dummy, /* Not used. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[] /* Argument objects. */ ) { int ii; int wObjc; Tcl_WideInt jobId; char *tpoolName; Tcl_Obj *listVar = NULL; Tcl_Obj *doneList, *waitList, **wObjv; ThreadPool *tpoolPtr; |
︙ | ︙ | |||
710 711 712 713 714 715 716 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolGetObjCmd( void *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; |
︙ | ︙ | |||
805 806 807 808 809 810 811 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolReserveObjCmd( void *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 */ |
︙ | ︙ | |||
860 861 862 863 864 865 866 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolReleaseObjCmd( void *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 */ |
︙ | ︙ | |||
915 916 917 918 919 920 921 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolSuspendObjCmd( void *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 */ |
︙ | ︙ | |||
965 966 967 968 969 970 971 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolResumeObjCmd( void *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 */ |
︙ | ︙ | |||
1015 1016 1017 1018 1019 1020 1021 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | | | < > | 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 | * Side effects: * None. * *---------------------------------------------------------------------- */ static int TpoolNamesObjCmd( void *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); |
︙ | ︙ | |||
1053 1054 1055 1056 1057 1058 1059 | * * Side effects: * Informs waiter thread (if any) about the new worker thread. * *---------------------------------------------------------------------- */ static int | | | | < > | 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 | * * 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. |
︙ | ︙ | |||
1118 1119 1120 1121 1122 1123 1124 | * Side effects: * None. * *---------------------------------------------------------------------- */ static Tcl_ThreadCreateType | | | < > | | 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 | * Side effects: * None. * *---------------------------------------------------------------------- */ static Tcl_ThreadCreateType TpoolWorker( void *clientData ) { TpoolResult *rPtr = (TpoolResult *)clientData; ThreadPool *tpoolPtr = rPtr->tpoolPtr; int tout = 0; Tcl_Interp *interp; Tcl_Time waitTime, *idlePtr; const char *errMsg; |
︙ | ︙ | |||
1151 1152 1153 1154 1155 1156 1157 | } else { rPtr->retcode = 0; } #endif if (rPtr->retcode == 1) { errMsg = Tcl_GetString(Tcl_GetObjResult(interp)); | | | | 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 1179 1180 | } else { rPtr->retcode = 0; } #endif if (rPtr->retcode == 1) { errMsg = Tcl_GetString(Tcl_GetObjResult(interp)); rPtr->result = strcpy((char *)Tcl_Alloc(strlen(errMsg)+1), errMsg); Tcl_ConditionNotify(&tpoolPtr->cond); Tcl_MutexUnlock(&startMutex); goto out; } /* * Initialize the interpreter */ if (tpoolPtr->initScript) { TpoolEval(interp, tpoolPtr->initScript, TCL_AUTO_LENGTH, rPtr); if (rPtr->retcode != TCL_OK) { rPtr->retcode = 1; errMsg = Tcl_GetString(Tcl_GetObjResult(interp)); rPtr->result = strcpy((char *)Tcl_Alloc(strlen(errMsg)+1), errMsg); Tcl_ConditionNotify(&tpoolPtr->cond); Tcl_MutexUnlock(&startMutex); goto out; } } /* |
︙ | ︙ | |||
1237 1238 1239 1240 1241 1242 1243 | break; /* Kill worker because pool is going down */ } Tcl_MutexUnlock(&tpoolPtr->mutex); TpoolEval(interp, rPtr->script, rPtr->scriptLen, rPtr); Tcl_Free(rPtr->script); Tcl_MutexLock(&tpoolPtr->mutex); if (!rPtr->detached) { | | | | 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 | break; /* Kill worker because pool is going down */ } Tcl_MutexUnlock(&tpoolPtr->mutex); TpoolEval(interp, rPtr->script, rPtr->scriptLen, rPtr); Tcl_Free(rPtr->script); Tcl_MutexLock(&tpoolPtr->mutex); if (!rPtr->detached) { int isNew; Tcl_SetHashValue(Tcl_CreateHashEntry(&tpoolPtr->jobsDone, (void *)(size_t)rPtr->jobId, &isNew), rPtr); SignalWaiter(tpoolPtr); } else { Tcl_Free(rPtr); } } |
︙ | ︙ | |||
1288 1289 1290 1291 1292 1293 1294 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int | | | | < > | 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static int RunStopEvent( Tcl_Event *eventPtr, int mask ) { ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); tsdPtr->stop = 1; return 1; } /* |
︙ | ︙ | |||
1315 1316 1317 1318 1319 1320 1321 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | | < > | 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void PushWork( TpoolResult *rPtr, ThreadPool *tpoolPtr ) { SpliceIn(rPtr, tpoolPtr->workHead); if (tpoolPtr->workTail == NULL) { tpoolPtr->workTail = rPtr; } } /* |
︙ | ︙ | |||
1342 1343 1344 1345 1346 1347 1348 | * Side effects: * None. * *---------------------------------------------------------------------- */ static TpoolResult * | | | < > | 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 | * Side effects: * None. * *---------------------------------------------------------------------- */ static TpoolResult * PopWork( ThreadPool *tpoolPtr ) { TpoolResult *rPtr = tpoolPtr->workTail; if (rPtr == NULL) { return NULL; } tpoolPtr->workTail = rPtr->prevPtr; |
︙ | ︙ | |||
1376 1377 1378 1379 1380 1381 1382 | * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | < > | 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 | * 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; } } |
︙ | ︙ | |||
1404 1405 1406 1407 1408 1409 1410 | * Side effects: * None. * *---------------------------------------------------------------------- */ static TpoolWaiter* | | | < > | 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 | * Side effects: * None. * *---------------------------------------------------------------------- */ static TpoolWaiter* PopWaiter( ThreadPool *tpoolPtr ) { TpoolWaiter *waitPtr = tpoolPtr->waitTail; if (waitPtr == NULL) { return NULL; } tpoolPtr->waitTail = waitPtr->prevPtr; |
︙ | ︙ | |||
1438 1439 1440 1441 1442 1443 1444 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static ThreadPool* | | | < > | 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static ThreadPool* GetTpool( const char *tpoolName ) { ThreadPool *tpoolPtr; Tcl_MutexLock(&listMutex); tpoolPtr = GetTpoolUnl(tpoolName); Tcl_MutexUnlock(&listMutex); return tpoolPtr; |
︙ | ︙ | |||
1469 1470 1471 1472 1473 1474 1475 | * Side effects: * None. * *---------------------------------------------------------------------- */ static ThreadPool* | | | < > | 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 | * 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) { |
︙ | ︙ | |||
1503 1504 1505 1506 1507 1508 1509 | * * Side effects: * Many, depending on the script. * *---------------------------------------------------------------------- */ static int | | | | | | < > | | | | 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 1551 1552 | * * 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 *)Tcl_Alloc(1 + strlen(errorCode)); strcpy(rPtr->errorCode, errorCode); } if (errorInfo != NULL) { rPtr->errorInfo = (char *)Tcl_Alloc(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 *)Tcl_Alloc(1 + reslen), result); } return ret; } /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
1560 1561 1562 1563 1564 1565 1566 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | | < > | 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 | * * 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, TCL_AUTO_LENGTH)); } Tcl_Free(rPtr->errorCode); rPtr->errorCode = NULL; |
︙ | ︙ | |||
1612 1613 1614 1615 1616 1617 1618 | * * Side effects: * May tear-down the threadpool if refcount drops to 0 or below. * *---------------------------------------------------------------------- */ static int | | | < > | | < > | 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 1650 1651 | * * 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; |
︙ | ︙ | |||
1740 1741 1742 1743 1744 1745 1746 | * Side effects: * During the suspended state, pool worker threads wlll not timeout * even if the worker inactivity timer has been configured. * *---------------------------------------------------------------------- */ static void | | | < > | 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 | * 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); } /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
1765 1766 1767 1768 1769 1770 1771 | * * Side effects: * Pool workers may be started or awaken. * *---------------------------------------------------------------------- */ static void | | | < > | 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 | * * 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); } /* |
︙ | ︙ | |||
1790 1791 1792 1793 1794 1795 1796 | * * Side effects: * The waiter thread will exit from the event loop. * *---------------------------------------------------------------------- */ static void | | | < > | | 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 | * * 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; } evPtr = (Tcl_Event *)Tcl_Alloc(sizeof(Tcl_Event)); evPtr->proc = RunStopEvent; Tcl_ThreadQueueEvent(waitPtr->threadId,(Tcl_Event*)evPtr,TCL_QUEUE_TAIL); Tcl_ThreadAlert(waitPtr->threadId); } /* |
︙ | ︙ | |||
1829 1830 1831 1832 1833 1834 1835 | */ static void InitWaiter () { ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); if (tsdPtr->waitPtr == NULL) { | | | 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 | */ static void InitWaiter () { ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); if (tsdPtr->waitPtr == NULL) { tsdPtr->waitPtr = (TpoolWaiter *)Tcl_Alloc(sizeof(TpoolWaiter)); tsdPtr->waitPtr->prevPtr = NULL; tsdPtr->waitPtr->nextPtr = NULL; tsdPtr->waitPtr->threadId = Tcl_GetCurrentThread(); Tcl_CreateThreadExitHandler(ThrExitHandler, tsdPtr); } } |
︙ | ︙ | |||
1853 1854 1855 1856 1857 1858 1859 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static void | | | < > | | | < > | 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 | * * Side effects: * None. * *---------------------------------------------------------------------- */ static void ThrExitHandler( void *clientData ) { ThreadSpecificData *tsdPtr = (ThreadSpecificData *)clientData; Tcl_Free(tsdPtr->waitPtr); } /* *---------------------------------------------------------------------- * * AppExitHandler * * Deletes all threadpools on application exit. * * Results: * None. * * Side effects: * None. * *---------------------------------------------------------------------- */ static void AppExitHandler( void *clientData ) { ThreadPool *tpoolPtr; Tcl_MutexLock(&listMutex); /* * Restart with head of list each time until empty. [Bug 1427570] */ for (tpoolPtr = tpoolList; tpoolPtr; tpoolPtr = tpoolList) { |
︙ | ︙ | |||
1910 1911 1912 1913 1914 1915 1916 | * On first load, creates application exit handler to clean up * any threadpools left. * *---------------------------------------------------------------------- */ int | | | < > | 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 | * 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( void *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 *const cmdOpts[] = { |
︙ | ︙ | |||
240 241 242 243 244 245 246 | } } /* * Create the requested mutex */ | | | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 | } } /* * Create the requested mutex */ mutexPtr = (SpMutex *)Tcl_Alloc(sizeof(SpMutex)); mutexPtr->type = type; mutexPtr->bucket = NULL; mutexPtr->hentry = NULL; mutexPtr->lock = NULL; /* Will be auto-initialized */ /* * Generate Tcl name for this mutex |
︙ | ︙ | |||
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( void *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; |
︙ | ︙ | |||
397 398 399 400 401 402 403 | if (opt == (int)w_CREATE) { Tcl_Obj *nameObj; if (objc > 2) { Tcl_WrongNumArgs(interp, 1, objv, "create"); return TCL_ERROR; } | | | 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 | if (opt == (int)w_CREATE) { Tcl_Obj *nameObj; if (objc > 2) { Tcl_WrongNumArgs(interp, 1, objv, "create"); return TCL_ERROR; } mutexPtr = (SpMutex *)Tcl_Alloc(sizeof(SpMutex)); mutexPtr->type = WMUTEXID; mutexPtr->refcnt = 0; mutexPtr->bucket = NULL; mutexPtr->hentry = NULL; mutexPtr->lock = NULL; /* Will be auto-initialized */ nameObj = GetName(mutexPtr->type, (void*)mutexPtr); |
︙ | ︙ | |||
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( void *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 *const cmdOpts[] = { |
︙ | ︙ | |||
559 560 561 562 563 564 565 | if (opt == (int)c_CREATE) { Tcl_Obj *nameObj; if (objc > 2) { Tcl_WrongNumArgs(interp, 1, objv, "create"); return TCL_ERROR; } | | | 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 | if (opt == (int)c_CREATE) { Tcl_Obj *nameObj; if (objc > 2) { Tcl_WrongNumArgs(interp, 1, objv, "create"); return TCL_ERROR; } condvPtr = (SpCondv *)Tcl_Alloc(sizeof(SpCondv)); condvPtr->refcnt = 0; condvPtr->bucket = NULL; condvPtr->hentry = NULL; condvPtr->mutex = NULL; condvPtr->cond = NULL; /* Will be auto-initialized */ nameObj = GetName(CONDVID, (void*)condvPtr); |
︙ | ︙ | |||
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( void *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, 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++) { |
︙ | ︙ | |||
1359 1360 1361 1362 1363 1364 1365 | /* * Allocate the mutex structure on first access */ if (*muxPtr == NULL) { Tcl_MutexLock(&initMutex); if (*muxPtr == NULL) { | | | 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 | /* * Allocate the mutex structure on first access */ if (*muxPtr == NULL) { Tcl_MutexLock(&initMutex); if (*muxPtr == NULL) { *muxPtr = (Sp_ExclusiveMutex_ *)Tcl_Alloc(sizeof(Sp_ExclusiveMutex_)); memset(*muxPtr, 0, sizeof(Sp_ExclusiveMutex_)); } Tcl_MutexUnlock(&initMutex); } /* * Try locking if not currently locked by anybody. |
︙ | ︙ | |||
1524 1525 1526 1527 1528 1529 1530 | /* * Allocate the mutex structure on first access */ if (*muxPtr == (Sp_RecursiveMutex_*)0) { Tcl_MutexLock(&initMutex); if (*muxPtr == (Sp_RecursiveMutex_*)0) { | | | 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 | /* * Allocate the mutex structure on first access */ if (*muxPtr == (Sp_RecursiveMutex_*)0) { Tcl_MutexLock(&initMutex); if (*muxPtr == (Sp_RecursiveMutex_*)0) { *muxPtr = (Sp_RecursiveMutex_ *) Tcl_Alloc(sizeof(Sp_RecursiveMutex_)); memset(*muxPtr, 0, sizeof(Sp_RecursiveMutex_)); } Tcl_MutexUnlock(&initMutex); } rmPtr = *(Sp_RecursiveMutex_**)muxPtr; |
︙ | ︙ | |||
1696 1697 1698 1699 1700 1701 1702 | /* * Allocate the mutex structure on first access */ if (*muxPtr == (Sp_ReadWriteMutex_*)0) { Tcl_MutexLock(&initMutex); if (*muxPtr == (Sp_ReadWriteMutex_*)0) { | | | 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 | /* * Allocate the mutex structure on first access */ if (*muxPtr == (Sp_ReadWriteMutex_*)0) { Tcl_MutexLock(&initMutex); if (*muxPtr == (Sp_ReadWriteMutex_*)0) { *muxPtr = (Sp_ReadWriteMutex_ *) Tcl_Alloc(sizeof(Sp_ReadWriteMutex_)); memset(*muxPtr, 0, sizeof(Sp_ReadWriteMutex_)); } Tcl_MutexUnlock(&initMutex); } rwPtr = *(Sp_ReadWriteMutex_**)muxPtr; |
︙ | ︙ | |||
1751 1752 1753 1754 1755 1756 1757 | /* * Allocate the mutex structure on first access */ if (*muxPtr == (Sp_ReadWriteMutex_*)0) { Tcl_MutexLock(&initMutex); if (*muxPtr == (Sp_ReadWriteMutex_*)0) { | | | 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 | /* * Allocate the mutex structure on first access */ if (*muxPtr == (Sp_ReadWriteMutex_*)0) { Tcl_MutexLock(&initMutex); if (*muxPtr == (Sp_ReadWriteMutex_*)0) { *muxPtr = (Sp_ReadWriteMutex_ *) Tcl_Alloc(sizeof(Sp_ReadWriteMutex_)); memset(*muxPtr, 0, sizeof(Sp_ReadWriteMutex_)); } Tcl_MutexUnlock(&initMutex); } rwPtr = *(Sp_ReadWriteMutex_**)muxPtr; |
︙ | ︙ |
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.
︙ | ︙ | |||
153 154 155 156 157 158 159 | const char *cmdName, /* Name of command to register */ Tcl_ObjCmdProc *objProc, /* Object-based command procedure */ Tcl_CmdDeleteProc *delProc, /* Command delete procedure */ int aolSpecial) { size_t len = strlen(cmdName) + strlen(TSV_CMD_PREFIX) + 1; size_t len2 = strlen(cmdName) + strlen(TSV_CMD2_PREFIX) + 1; | | | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | const char *cmdName, /* Name of command to register */ Tcl_ObjCmdProc *objProc, /* Object-based command procedure */ Tcl_CmdDeleteProc *delProc, /* Command delete procedure */ int aolSpecial) { size_t len = strlen(cmdName) + strlen(TSV_CMD_PREFIX) + 1; size_t len2 = strlen(cmdName) + strlen(TSV_CMD2_PREFIX) + 1; SvCmdInfo *newCmd = (SvCmdInfo *)Tcl_Alloc(sizeof(SvCmdInfo) + len + len2); /* * Setup new command structure */ newCmd->cmdName = (char*)((char*)newCmd + sizeof(SvCmdInfo)); newCmd->cmdName2 = newCmd->cmdName + len; |
︙ | ︙ | |||
220 221 222 223 224 225 226 | */ void Sv_RegisterObjType( const Tcl_ObjType *typePtr, /* Type of object to register */ Tcl_DupInternalRepProc *dupProc) /* Custom object duplicator */ { | | | 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 | */ void Sv_RegisterObjType( const Tcl_ObjType *typePtr, /* Type of object to register */ Tcl_DupInternalRepProc *dupProc) /* Custom object duplicator */ { RegType *newType = (RegType *)Tcl_Alloc(sizeof(RegType)); /* * Setup new type structure */ newType->typePtr = typePtr; newType->dupIntRepProc = dupProc; |
︙ | ︙ | |||
259 260 261 262 263 264 265 | *----------------------------------------------------------------------------- */ void Sv_RegisterPsStore(const PsStore *psStorePtr) { | | | 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 | *----------------------------------------------------------------------------- */ void Sv_RegisterPsStore(const PsStore *psStorePtr) { PsStore *psPtr = (PsStore *)Tcl_Alloc(sizeof(PsStore)); *psPtr = *psStorePtr; /* * Plug-in in shared list */ |
︙ | ︙ | |||
467 468 469 470 471 472 473 | */ Tcl_MutexLock(&svMutex); for (tmpPtr = psStore; tmpPtr; tmpPtr = tmpPtr->nextPtr) { if (strcmp(tmpPtr->type, type) == 0) { tmpPtr->psHandle = tmpPtr->psOpen(addr); if (tmpPtr->psHandle) { | | | 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 | */ Tcl_MutexLock(&svMutex); for (tmpPtr = psStore; tmpPtr; tmpPtr = tmpPtr->nextPtr) { if (strcmp(tmpPtr->type, type) == 0) { tmpPtr->psHandle = tmpPtr->psOpen(addr); if (tmpPtr->psHandle) { psPtr = (PsStore *)Tcl_Alloc(sizeof(PsStore)); *psPtr = *tmpPtr; psPtr->nextPtr = NULL; } break; } } Tcl_MutexUnlock(&svMutex); |
︙ | ︙ | |||
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, TCL_AUTO_LENGTH)); 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 815 816 817 818 | */ 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 *)Tcl_Alloc(sizeof(Array)); arrayPtr->bucketPtr = bucketPtr; arrayPtr->entryPtr = hPtr; arrayPtr->psPtr = NULL; arrayPtr->bindAddr = NULL; Tcl_InitHashTable(&arrayPtr->vars, TCL_STRING_KEYS); Tcl_SetHashValue(hPtr, arrayPtr); |
︙ | ︙ | |||
902 903 904 905 906 907 908 | Container tmp[2]; size_t objSizePlusPadding = (size_t)(((char*)(tmp+1))-(char*)tmp); size_t bytesToAlloc = (OBJS_TO_ALLOC_EACH_TIME * objSizePlusPadding); char *basePtr; register Container *prevPtr = NULL, *objPtr = NULL; register int i; | | | 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 | Container tmp[2]; size_t objSizePlusPadding = (size_t)(((char*)(tmp+1))-(char*)tmp); size_t bytesToAlloc = (OBJS_TO_ALLOC_EACH_TIME * objSizePlusPadding); char *basePtr; register Container *prevPtr = NULL, *objPtr = NULL; register int i; basePtr = (char *)Tcl_Alloc(bytesToAlloc); memset(basePtr, 0, bytesToAlloc); objPtr = (Container*)basePtr; objPtr->chunkAddr = basePtr; /* Mark chunk address for reclaim */ for (i = 0; i < OBJS_TO_ALLOC_EACH_TIME; i++) { objPtr->nextPtr = prevPtr; |
︙ | ︙ | |||
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) { |
︙ | ︙ | |||
1053 1054 1055 1056 1057 1058 1059 | * Handle the string rep */ if (objPtr->bytes == NULL) { dupPtr->bytes = NULL; } else if (objPtr->bytes != Sv_tclEmptyStringRep) { /* A copy of TclInitStringRep macro */ | | | 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 | * Handle the string rep */ if (objPtr->bytes == NULL) { dupPtr->bytes = NULL; } else if (objPtr->bytes != Sv_tclEmptyStringRep) { /* A copy of TclInitStringRep macro */ dupPtr->bytes = (char *)Tcl_Alloc(objPtr->length + 1); if (objPtr->length > 0) { memcpy((void*)dupPtr->bytes,(void*)objPtr->bytes, (unsigned)objPtr->length); } dupPtr->length = objPtr->length; dupPtr->bytes[objPtr->length] = '\0'; } |
︙ | ︙ | |||
1139 1140 1141 1142 1143 1144 1145 | static int SvObjObjCmd( void *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( void *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 | 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); |
︙ | ︙ | |||
1312 1313 1314 1315 1316 1317 1318 | } 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) { | | | 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 | } 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, TCL_AUTO_LENGTH)); if (index == AGET) { elObj = (Container*)Tcl_GetHashValue(hPtr); Tcl_ListObjAppendElement(interp, resObj, Sv_DuplicateObj(elObj->tclObj)); |
︙ | ︙ | |||
1344 1345 1346 1347 1348 1349 1350 | * storage and cache all key/value pairs found there into tne * newly created shared array. */ PsStore *psPtr; Tcl_HashEntry *hPtr; size_t len; | | | 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 | * 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; } |
︙ | ︙ | |||
1373 1374 1375 1376 1377 1378 1379 | ret = TCL_ERROR; goto cmdExit; } if (arrayPtr) { Tcl_HashSearch search; hPtr = Tcl_FirstHashEntry(&arrayPtr->vars,&search); arrayPtr->psPtr = psPtr; | | | | | | 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 1404 | ret = TCL_ERROR; goto cmdExit; } if (arrayPtr) { Tcl_HashSearch search; hPtr = Tcl_FirstHashEntry(&arrayPtr->vars,&search); arrayPtr->psPtr = psPtr; arrayPtr->bindAddr = strcpy((char *)Tcl_Alloc(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 *)Tcl_Alloc(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) { |
︙ | ︙ | |||
1527 1528 1529 1530 1531 1532 1533 | 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) { | | | 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 | 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); } |
︙ | ︙ | |||
1746 1747 1748 1749 1750 1751 1752 | static int SvIncrObjCmd( void *arg, /* Pointer to object container */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { | | | | | 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 1789 | static int SvIncrObjCmd( void *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; } } |
︙ | ︙ | |||
1956 1957 1958 1959 1960 1961 1962 | static int SvMoveObjCmd( void *arg, /* Pointer to object container. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { | | | | | | 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 1994 | static int SvMoveObjCmd( void *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, TCL_AUTO_LENGTH)); return TCL_ERROR; } |
︙ | ︙ | |||
2187 2188 2189 2190 2191 2192 2193 | * Side effects * Many new command created in current interpreter. Global data * structures used by them initialized as well. * *----------------------------------------------------------------------------- */ int | | | < > | 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 | * 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 /* |
︙ | ︙ | |||
2276 2277 2278 2279 2280 2281 2282 | /* * Create array of buckets and initialize each bucket */ if (buckets == NULL) { Tcl_MutexLock(&bucketsMutex); if (buckets == NULL) { | | | 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 | /* * Create array of buckets and initialize each bucket */ if (buckets == NULL) { Tcl_MutexLock(&bucketsMutex); if (buckets == NULL) { buckets = (Bucket *)Tcl_Alloc(sizeof(Bucket) * NUMBUCKETS); for (i = 0; i < NUMBUCKETS; ++i) { bucketPtr = &buckets[i]; memset(bucketPtr, 0, sizeof(Bucket)); Tcl_InitHashTable(&bucketPtr->arrays, TCL_STRING_KEYS); Tcl_InitHashTable(&bucketPtr->handles, TCL_ONE_WORD_KEYS); } |
︙ | ︙ |
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.
︙ | ︙ | |||
121 122 123 124 125 126 127 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLpopObjCmd ( void *arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { int ret, off, llen, iarg = 0; size_t index = 0; Tcl_Obj *elPtr = NULL; Container *svObj = (Container*)arg; /* * Syntax: |
︙ | ︙ | |||
159 160 161 162 163 164 165 | } if (iarg) { ret = Tcl_GetIntForIndex(interp, objv[iarg], llen-1, &index); if (ret != TCL_OK) { goto cmd_err; } } | | | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 | } if (iarg) { ret = Tcl_GetIntForIndex(interp, objv[iarg], llen-1, &index); if (ret != TCL_OK) { goto cmd_err; } } if (index >= (size_t)llen) { goto cmd_ok; /* Ignore out-of bounds, like Tcl does */ } ret = Tcl_ListObjIndex(interp, svObj->tclObj, index, &elPtr); if (ret != TCL_OK) { goto cmd_err; } |
︙ | ︙ | |||
201 202 203 204 205 206 207 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLpushObjCmd ( void *arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { int off, ret, flg, llen; size_t index = 0; Tcl_Obj *args[1]; Container *svObj = (Container*)arg; /* * Syntax: |
︙ | ︙ | |||
236 237 238 239 240 241 242 | goto cmd_err; } if ((objc - off) == 2) { ret = Tcl_GetIntForIndex(interp, objv[off+1], llen, &index); if (ret != TCL_OK) { goto cmd_err; } | | | | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | goto cmd_err; } if ((objc - off) == 2) { ret = Tcl_GetIntForIndex(interp, objv[off+1], llen, &index); if (ret != TCL_OK) { goto cmd_err; } if (index == TCL_INDEX_NONE) { index = 0; } else if (index > (size_t)llen) { index = llen; } } args[0] = Sv_DuplicateObj(objv[off]); ret = Tcl_ListObjReplace(interp, svObj->tclObj, index, 0, 1, args); if (ret != TCL_OK) { |
︙ | ︙ | |||
274 275 276 277 278 279 280 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLappendObjCmd( void *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 ...? |
︙ | ︙ | |||
334 335 336 337 338 339 340 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLreplaceObjCmd( void *arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { const char *firstArg; size_t argLen; int ret, off, llen, ndel, nargs, i, j; size_t first, last; Tcl_Obj **args = NULL; Container *svObj = (Container*)arg; |
︙ | ︙ | |||
376 377 378 379 380 381 382 | ret = Tcl_GetIntForIndex(interp, objv[off+1], llen-1, &last); if (ret != TCL_OK) { goto cmd_err; } firstArg = Tcl_GetString(objv[off]); argLen = objv[off]->length; | | | | | | | 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 | ret = Tcl_GetIntForIndex(interp, objv[off+1], llen-1, &last); if (ret != TCL_OK) { goto cmd_err; } firstArg = Tcl_GetString(objv[off]); argLen = objv[off]->length; if (first == TCL_INDEX_NONE) { first = 0; } if (llen && first >= (size_t)llen && strncmp(firstArg, "end", argLen)) { Tcl_AppendResult(interp, "list doesn't have element ", firstArg, NULL); goto cmd_err; } if (last >= (size_t)llen) { last = llen - 1; } if (first + 1 <= last + 1) { ndel = last - first + 1; } else { ndel = 0; } nargs = objc - (off + 2); if (nargs) { args = (Tcl_Obj**)Tcl_Alloc(nargs * sizeof(Tcl_Obj*)); for(i = off + 2, j = 0; i < objc; i++, j++) { args[j] = Sv_DuplicateObj(objv[i]); } } ret = Tcl_ListObjReplace(interp, svObj->tclObj, first, ndel, nargs, args); if (args) { |
︙ | ︙ | |||
434 435 436 437 438 439 440 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | | | 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLrangeObjCmd( void *arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { int ret, off, llen, nargs, j; size_t first, last, i; Tcl_Obj **elPtrs, **args; Container *svObj = (Container*)arg; /* * Syntax: * tsv::lrange array key first last * $list lrange first last |
︙ | ︙ | |||
471 472 473 474 475 476 477 | if (ret != TCL_OK) { goto cmd_err; } ret = Tcl_GetIntForIndex(interp, objv[off+1], llen-1, &last); if (ret != TCL_OK) { goto cmd_err; } | | | | | | 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 | if (ret != TCL_OK) { goto cmd_err; } ret = Tcl_GetIntForIndex(interp, objv[off+1], llen-1, &last); if (ret != TCL_OK) { goto cmd_err; } if (first == TCL_INDEX_NONE) { first = 0; } if (last >= (size_t)llen) { last = llen - 1; } if (first + 1 > last + 1) { goto cmd_ok; } nargs = last - first + 1; args = (Tcl_Obj **)Tcl_Alloc(nargs * sizeof(Tcl_Obj *)); for (i = first, j = 0; i <= last; i++, j++) { args[j] = Sv_DuplicateObj(elPtrs[i]); } Tcl_ResetResult(interp); Tcl_SetListObj(Tcl_GetObjResult(interp), nargs, args); Tcl_Free(args); |
︙ | ︙ | |||
516 517 518 519 520 521 522 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLinsertObjCmd( void *arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { int off, ret, flg, llen, nargs, i, j; size_t index = 0; Tcl_Obj **args; Container *svObj = (Container*)arg; /* * Syntax: |
︙ | ︙ | |||
550 551 552 553 554 555 556 | if (ret != TCL_OK) { goto cmd_err; } ret = Tcl_GetIntForIndex(interp, objv[off], llen, &index); if (ret != TCL_OK) { goto cmd_err; } | | | | | 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 | if (ret != TCL_OK) { goto cmd_err; } ret = Tcl_GetIntForIndex(interp, objv[off], llen, &index); if (ret != TCL_OK) { goto cmd_err; } if (index == TCL_INDEX_NONE) { index = 0; } else if (index > (size_t)llen) { index = llen; } nargs = objc - (off + 1); args = (Tcl_Obj **)Tcl_Alloc(nargs * sizeof(Tcl_Obj *)); for (i = off + 1, j = 0; i < objc; i++, j++) { args[j] = Sv_DuplicateObj(objv[i]); } ret = Tcl_ListObjReplace(interp, svObj->tclObj, index, 0, nargs, args); if (ret != TCL_OK) { for (i = off + 1, j = 0; i < objc; i++, j++) { Tcl_DecrRefCount(args[j]); |
︙ | ︙ | |||
596 597 598 599 600 601 602 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLlengthObjCmd( void *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 |
︙ | ︙ | |||
645 646 647 648 649 650 651 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLsearchObjCmd( void *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 *const modes[] = {"-exact", "-glob", "-regexp", NULL}; |
︙ | ︙ | |||
751 752 753 754 755 756 757 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLindexObjCmd( void *arg, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ) { Tcl_Obj **elPtrs; int ret, off, llen; size_t index; Container *svObj = (Container*)arg; /* * Syntax: |
︙ | ︙ | |||
784 785 786 787 788 789 790 | if (ret != TCL_OK) { goto cmd_err; } ret = Tcl_GetIntForIndex(interp, objv[off], llen-1, &index); if (ret != TCL_OK) { goto cmd_err; } | | | 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 | if (ret != TCL_OK) { goto cmd_err; } ret = Tcl_GetIntForIndex(interp, objv[off], llen-1, &index); if (ret != TCL_OK) { goto cmd_err; } if (index < (size_t)llen) { Tcl_SetObjResult(interp, Sv_DuplicateObj(elPtrs[index])); } return Sv_PutContainer(interp, svObj, SV_UNCHANGED); cmd_err: return Sv_PutContainer(interp, svObj, SV_ERROR); |
︙ | ︙ | |||
812 813 814 815 816 817 818 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int | | | | | | < > | 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 | * Side effects: * See the user documentation. * *----------------------------------------------------------------------------- */ static int SvLsetObjCmd( void *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 |
︙ | ︙ | |||
876 877 878 879 880 881 882 | * available to Tcl API programmer. We could include the tclInt.h and * get the copy more efficient using list internals, but ... * *----------------------------------------------------------------------------- */ static void | | | | < > | | 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 | * 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; int llen; Tcl_Obj *elObj, **newObjList; Tcl_ListObjLength(NULL, srcPtr, &llen); if (llen == 0) { (*srcPtr->typePtr->dupIntRepProc)(srcPtr, copyPtr); copyPtr->refCount = 0; return; } newObjList = (Tcl_Obj **)Tcl_Alloc(llen*sizeof(Tcl_Obj *)); for (i = 0; i < llen; i++) { Tcl_ListObjIndex(NULL, srcPtr, i, &elObj); newObjList[i] = Sv_DuplicateObj(elObj); } Tcl_SetListObj(copyPtr, llen, newObjList); |
︙ | ︙ | |||
919 920 921 922 923 924 925 | * Actual return value of this procedure is irrelevant to the caller, * and it should be either NULL or non-NULL. * *---------------------------------------------------------------------- */ static Tcl_Obj* | | | | | | | < > | 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 | * 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; size_t index; Tcl_Obj **elemPtrs, *chainPtr, *subListPtr; /* * Determine whether the index arg designates a list * or a single index. |
︙ | ︙ | |||
992 993 994 995 996 997 998 | break; } /* * Check that the index is in range. */ | | | 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 | break; } /* * Check that the index is in range. */ if (index >= (size_t)elemCount) { Tcl_SetObjResult(interp, Tcl_NewStringObj("list index out of range", -1)); result = TCL_ERROR; break; } /* |
︙ | ︙ |