Tcl Source Code

Hex Artifact Content
Login

Artifact d1f3ad866ef4a1d67fd96549e0dbdc561a6b156a4fd70b271ecda9148fe06184:

Attachment "POC.diff" to ticket [893f8cc5db] added by chw 2025-08-23 05:01:29.
0000: 49 6e 64 65 78 3a 20 77 69 6e 2f 74 63 6c 57 69  Index: win/tclWi
0010: 6e 54 68 72 64 2e 63 0a 3d 3d 3d 3d 3d 3d 3d 3d  nThrd.c.========
0020: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0030: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0040: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d  ================
0050: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 0a 2d 2d 2d 20 77  ==========.--- w
0060: 69 6e 2f 74 63 6c 57 69 6e 54 68 72 64 2e 63 0a  in/tclWinThrd.c.
0070: 2b 2b 2b 20 77 69 6e 2f 74 63 6c 57 69 6e 54 68  +++ win/tclWinTh
0080: 72 64 2e 63 0a 40 40 20 2d 34 37 2c 31 30 20 2b  rd.c.@@ -47,10 +
0090: 34 37 2c 32 31 20 40 40 0a 20 20 20 20 20 43 52  47,21 @@.     CR
00a0: 49 54 49 43 41 4c 5f 53 45 43 54 49 4f 4e 20 63  ITICAL_SECTION c
00b0: 72 69 74 3b 0a 20 7d 20 61 6c 6c 6f 63 4c 6f 63  rit;. } allocLoc
00c0: 6b 3b 0a 20 73 74 61 74 69 63 20 54 63 6c 5f 4d  k;. static Tcl_M
00d0: 75 74 65 78 20 61 6c 6c 6f 63 4c 6f 63 6b 50 74  utex allocLockPt
00e0: 72 20 3d 20 26 61 6c 6c 6f 63 4c 6f 63 6b 3b 0a  r = &allocLock;.
00f0: 20 73 74 61 74 69 63 20 69 6e 74 20 61 6c 6c 6f   static int allo
0100: 63 4f 6e 63 65 20 3d 20 30 3b 0a 20 0a 2b 2f 2a  cOnce = 0;. .+/*
0110: 0a 2b 20 2a 20 41 6c 74 68 6f 75 67 68 20 43 52  .+ * Although CR
0120: 49 54 49 43 41 4c 5f 53 45 43 54 49 4f 4e 73 20  ITICAL_SECTIONs 
0130: 63 61 6e 20 62 65 20 6e 65 73 74 65 64 2c 20 77  can be nested, w
0140: 65 20 6e 65 65 64 20 74 6f 20 6b 65 65 70 20 74  e need to keep t
0150: 72 61 63 6b 0a 2b 20 2a 20 6f 66 20 74 68 65 69  rack.+ * of thei
0160: 72 20 6c 6f 63 6b 20 63 6f 75 6e 74 73 20 66 6f  r lock counts fo
0170: 72 20 63 6f 6e 64 69 74 69 6f 6e 20 76 61 72 69  r condition vari
0180: 61 62 6c 65 73 2e 0a 2b 20 2a 2f 0a 2b 0a 2b 74  ables..+ */.+.+t
0190: 79 70 65 64 65 66 20 73 74 72 75 63 74 20 57 4d  ypedef struct WM
01a0: 75 74 65 78 20 7b 0a 2b 20 20 20 20 43 52 49 54  utex {.+    CRIT
01b0: 49 43 41 4c 5f 53 45 43 54 49 4f 4e 20 63 72 69  ICAL_SECTION cri
01c0: 74 3b 0a 2b 20 20 20 20 76 6f 6c 61 74 69 6c 65  t;.+    volatile
01d0: 20 54 63 6c 5f 54 68 72 65 61 64 49 64 20 74 68   Tcl_ThreadId th
01e0: 72 65 61 64 3b 0a 2b 20 20 20 20 76 6f 6c 61 74  read;.+    volat
01f0: 69 6c 65 20 69 6e 74 20 63 6f 75 6e 74 65 72 3b  ile int counter;
0200: 0a 2b 7d 20 57 4d 75 74 65 78 3b 0a 2b 0a 20 23  .+} WMutex;.+. #
0210: 65 6e 64 69 66 20 2f 2a 20 54 43 4c 5f 54 48 52  endif /* TCL_THR
0220: 45 41 44 53 20 2a 2f 0a 20 0a 20 2f 2a 0a 20 20  EADS */. . /*.  
0230: 2a 20 54 68 65 20 6a 6f 69 6e 4c 6f 63 6b 20 73  * The joinLock s
0240: 65 72 69 61 6c 69 7a 65 73 20 43 72 65 61 74 65  erializes Create
0250: 2d 20 61 6e 64 20 45 78 69 74 54 68 72 65 61 64  - and ExitThread
0260: 2e 20 54 68 69 73 20 69 73 20 6e 65 63 65 73 73  . This is necess
0270: 61 72 79 20 74 6f 0a 20 20 2a 20 70 72 65 76 65  ary to.  * preve
0280: 6e 74 20 61 20 72 61 63 65 20 77 68 65 72 65 20  nt a race where 
0290: 61 20 6e 65 77 20 6a 6f 69 6e 61 62 6c 65 20 74  a new joinable t
02a0: 68 72 65 61 64 20 65 78 69 74 73 20 62 65 66 6f  hread exits befo
02b0: 72 65 20 74 68 65 20 63 72 65 61 74 69 6e 67 20  re the creating 
02c0: 74 68 72 65 61 64 0a 40 40 20 2d 35 35 31 2c 33  thread.@@ -551,3
02d0: 31 20 2b 35 36 32 2c 33 39 20 40 40 0a 20 20 2a  1 +562,39 @@.  *
02e0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
02f0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0300: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0310: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0320: 2d 2d 2d 2d 2d 2d 0a 20 20 2a 2f 0a 20 0a 20 76  ------.  */. . v
0330: 6f 69 64 0a 20 54 63 6c 5f 4d 75 74 65 78 4c 6f  oid. Tcl_MutexLo
0340: 63 6b 28 0a 2d 20 20 20 20 54 63 6c 5f 4d 75 74  ck(.-    Tcl_Mut
0350: 65 78 20 2a 6d 75 74 65 78 50 74 72 29 09 2f 2a  ex *mutexPtr)./*
0360: 20 54 68 65 20 6c 6f 63 6b 20 2a 2f 0a 2b 20 20   The lock */.+  
0370: 20 20 54 63 6c 5f 4d 75 74 65 78 20 2a 6d 75 74    Tcl_Mutex *mut
0380: 65 78 50 74 72 29 09 2f 2a 20 52 65 61 6c 6c 79  exPtr)./* Really
0390: 20 28 57 4d 75 74 65 78 20 2a 2a 29 20 2a 2f 0a   (WMutex **) */.
03a0: 20 7b 0a 2d 20 20 20 20 43 52 49 54 49 43 41 4c   {.-    CRITICAL
03b0: 5f 53 45 43 54 49 4f 4e 20 2a 63 73 50 74 72 3b  _SECTION *csPtr;
03c0: 0a 2b 20 20 20 20 57 4d 75 74 65 78 20 2a 77 6d  .+    WMutex *wm
03d0: 50 74 72 3b 0a 20 0a 20 20 20 20 20 69 66 20 28  Ptr;. .     if (
03e0: 2a 6d 75 74 65 78 50 74 72 20 3d 3d 20 4e 55 4c  *mutexPtr == NUL
03f0: 4c 29 20 7b 0a 20 09 54 63 6c 70 47 6c 6f 62 61  L) {. .TclpGloba
0400: 6c 4c 6f 63 6b 28 29 3b 0a 20 0a 20 09 2f 2a 0a  lLock();. . ./*.
0410: 20 09 20 2a 20 44 6f 75 62 6c 65 20 69 6e 73 69   . * Double insi
0420: 64 65 20 67 6c 6f 62 61 6c 20 6c 6f 63 6b 20 63  de global lock c
0430: 68 65 63 6b 20 74 6f 20 61 76 6f 69 64 20 61 20  heck to avoid a 
0440: 72 61 63 65 2e 0a 20 09 20 2a 2f 0a 20 0a 20 09  race.. . */. . .
0450: 69 66 20 28 2a 6d 75 74 65 78 50 74 72 20 3d 3d  if (*mutexPtr ==
0460: 20 4e 55 4c 4c 29 20 7b 0a 2d 09 20 20 20 20 63   NULL) {.-.    c
0470: 73 50 74 72 20 3d 20 28 43 52 49 54 49 43 41 4c  sPtr = (CRITICAL
0480: 5f 53 45 43 54 49 4f 4e 20 2a 29 20 54 63 6c 5f  _SECTION *) Tcl_
0490: 41 6c 6c 6f 63 28 73 69 7a 65 6f 66 28 43 52 49  Alloc(sizeof(CRI
04a0: 54 49 43 41 4c 5f 53 45 43 54 49 4f 4e 29 29 3b  TICAL_SECTION));
04b0: 0a 2d 09 20 20 20 20 49 6e 69 74 69 61 6c 69 7a  .-.    Initializ
04c0: 65 43 72 69 74 69 63 61 6c 53 65 63 74 69 6f 6e  eCriticalSection
04d0: 28 63 73 50 74 72 29 3b 0a 2d 09 20 20 20 20 2a  (csPtr);.-.    *
04e0: 6d 75 74 65 78 50 74 72 20 3d 20 28 54 63 6c 5f  mutexPtr = (Tcl_
04f0: 4d 75 74 65 78 29 20 63 73 50 74 72 3b 0a 2b 09  Mutex) csPtr;.+.
0500: 20 20 20 20 77 6d 50 74 72 20 3d 20 28 57 4d 75      wmPtr = (WMu
0510: 74 65 78 20 2a 29 20 54 63 6c 5f 41 6c 6c 6f 63  tex *) Tcl_Alloc
0520: 28 73 69 7a 65 6f 66 28 57 4d 75 74 65 78 29 29  (sizeof(WMutex))
0530: 3b 0a 2b 09 20 20 20 20 49 6e 69 74 69 61 6c 69  ;.+.    Initiali
0540: 7a 65 43 72 69 74 69 63 61 6c 53 65 63 74 69 6f  zeCriticalSectio
0550: 6e 28 26 77 6d 50 74 72 2d 3e 63 72 69 74 29 3b  n(&wmPtr->crit);
0560: 0a 2b 09 20 20 20 20 77 6d 50 74 72 2d 3e 74 68  .+.    wmPtr->th
0570: 72 65 61 64 20 3d 20 30 3b 0a 2b 09 20 20 20 20  read = 0;.+.    
0580: 77 6d 50 74 72 2d 3e 63 6f 75 6e 74 20 3d 20 30  wmPtr->count = 0
0590: 3b 0a 2b 09 20 20 20 20 2a 6d 75 74 65 78 50 74  ;.+.    *mutexPt
05a0: 72 20 3d 20 28 54 63 6c 5f 4d 75 74 65 78 29 20  r = (Tcl_Mutex) 
05b0: 77 6d 50 74 72 3b 0a 20 09 20 20 20 20 54 63 6c  wmPtr;. .    Tcl
05c0: 52 65 6d 65 6d 62 65 72 4d 75 74 65 78 28 6d 75  RememberMutex(mu
05d0: 74 65 78 50 74 72 29 3b 0a 20 09 7d 0a 20 09 54  texPtr);. .}. .T
05e0: 63 6c 70 47 6c 6f 62 61 6c 55 6e 6c 6f 63 6b 28  clpGlobalUnlock(
05f0: 29 3b 0a 2b 20 20 20 20 7d 20 65 6c 73 65 20 7b  );.+    } else {
0600: 0a 2b 09 77 6d 50 74 72 20 3d 20 2a 28 28 57 4d  .+.wmPtr = *((WM
0610: 75 74 65 78 20 2a 2a 29 6d 75 74 65 78 50 74 72  utex **)mutexPtr
0620: 29 3b 0a 20 20 20 20 20 7d 0a 2d 20 20 20 20 63  );.     }.-    c
0630: 73 50 74 72 20 3d 20 2a 28 28 43 52 49 54 49 43  sPtr = *((CRITIC
0640: 41 4c 5f 53 45 43 54 49 4f 4e 20 2a 2a 29 6d 75  AL_SECTION **)mu
0650: 74 65 78 50 74 72 29 3b 0a 2d 20 20 20 20 45 6e  texPtr);.-    En
0660: 74 65 72 43 72 69 74 69 63 61 6c 53 65 63 74 69  terCriticalSecti
0670: 6f 6e 28 63 73 50 74 72 29 3b 0a 2b 20 20 20 20  on(csPtr);.+    
0680: 69 66 20 28 77 6d 50 74 72 2d 3e 74 68 72 65 61  if (wmPtr->threa
0690: 64 20 21 3d 20 54 63 6c 5f 47 65 74 43 75 72 72  d != Tcl_GetCurr
06a0: 65 6e 74 54 68 72 65 61 64 28 29 20 7c 7c 20 77  entThread() || w
06b0: 6d 50 74 72 2d 3e 63 6f 75 6e 74 65 72 20 3d 3d  mPtr->counter ==
06c0: 20 30 29 20 7b 0a 2b 09 45 6e 74 65 72 43 72 69   0) {.+.EnterCri
06d0: 74 69 63 61 6c 53 65 63 74 69 6f 6e 28 26 77 6d  ticalSection(&wm
06e0: 50 74 72 2d 3e 63 72 69 74 29 3b 0a 2b 09 77 6d  Ptr->crit);.+.wm
06f0: 50 74 72 2d 3e 74 68 72 65 61 64 20 3d 20 54 63  Ptr->thread = Tc
0700: 6c 5f 47 65 74 43 75 72 72 65 6e 74 54 68 72 65  l_GetCurrentThre
0710: 61 64 28 29 3b 0a 2b 09 77 6d 50 74 72 2d 3e 63  ad();.+.wmPtr->c
0720: 6f 75 6e 74 65 72 20 3d 20 30 3b 0a 2b 20 20 20  ounter = 0;.+   
0730: 20 7d 0a 2b 20 20 20 20 77 6d 50 74 72 2d 3e 63   }.+    wmPtr->c
0740: 6f 75 6e 74 65 72 2b 2b 3b 0a 20 7d 0a 20 0c 0a  ounter++;. }. ..
0750: 20 2f 2a 0a 20 20 2a 2d 2d 2d 2d 2d 2d 2d 2d 2d   /*.  *---------
0760: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0770: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0780: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0790: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a 20 20  -------------.  
07a0: 2a 0a 40 40 20 2d 35 39 32 2c 31 35 20 2b 36 31  *.@@ -592,15 +61
07b0: 31 2c 31 39 20 40 40 0a 20 20 2a 2d 2d 2d 2d 2d  1,19 @@.  *-----
07c0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
07d0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
07e0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
07f0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0800: 2d 0a 20 20 2a 2f 0a 20 0a 20 76 6f 69 64 0a 20  -.  */. . void. 
0810: 54 63 6c 5f 4d 75 74 65 78 55 6e 6c 6f 63 6b 28  Tcl_MutexUnlock(
0820: 0a 2d 20 20 20 20 54 63 6c 5f 4d 75 74 65 78 20  .-    Tcl_Mutex 
0830: 2a 6d 75 74 65 78 50 74 72 29 09 2f 2a 20 54 68  *mutexPtr)./* Th
0840: 65 20 6c 6f 63 6b 20 2a 2f 0a 2b 20 20 20 20 54  e lock */.+    T
0850: 63 6c 5f 4d 75 74 65 78 20 2a 6d 75 74 65 78 50  cl_Mutex *mutexP
0860: 74 72 29 09 2f 2a 20 52 65 61 6c 6c 79 20 28 57  tr)./* Really (W
0870: 4d 75 74 65 78 20 2a 2a 29 20 2a 2f 0a 20 7b 0a  Mutex **) */. {.
0880: 2d 20 20 20 20 43 52 49 54 49 43 41 4c 5f 53 45  -    CRITICAL_SE
0890: 43 54 49 4f 4e 20 2a 63 73 50 74 72 20 3d 20 2a  CTION *csPtr = *
08a0: 28 28 43 52 49 54 49 43 41 4c 5f 53 45 43 54 49  ((CRITICAL_SECTI
08b0: 4f 4e 20 2a 2a 29 6d 75 74 65 78 50 74 72 29 3b  ON **)mutexPtr);
08c0: 0a 2b 20 20 20 20 57 4d 75 74 65 78 20 2a 77 6d  .+    WMutex *wm
08d0: 50 74 72 20 3d 20 2a 28 28 57 4d 75 74 65 78 20  Ptr = *((WMutex 
08e0: 2a 2a 29 6d 75 74 65 78 50 74 72 29 3b 0a 20 0a  **)mutexPtr);. .
08f0: 2d 20 20 20 20 4c 65 61 76 65 43 72 69 74 69 63  -    LeaveCritic
0900: 61 6c 53 65 63 74 69 6f 6e 28 63 73 50 74 72 29  alSection(csPtr)
0910: 3b 0a 2b 20 20 20 20 77 6d 50 74 72 2d 3e 63 6f  ;.+    wmPtr->co
0920: 75 6e 74 65 72 2d 2d 3b 0a 2b 20 20 20 20 69 66  unter--;.+    if
0930: 20 28 77 6d 50 74 72 2d 3e 63 6f 75 6e 74 65 72   (wmPtr->counter
0940: 20 3d 3d 20 30 29 20 7b 0a 2b 09 77 6d 50 74 72   == 0) {.+.wmPtr
0950: 2d 3e 74 68 72 65 61 64 20 3d 20 30 3b 0a 2b 09  ->thread = 0;.+.
0960: 4c 65 61 76 65 43 72 69 74 69 63 61 6c 53 65 63  LeaveCriticalSec
0970: 74 69 6f 6e 28 26 77 6d 50 74 72 2d 3e 63 72 69  tion(&wmPtr->cri
0980: 74 29 3b 0a 2b 20 20 20 20 7d 0a 20 7d 0a 20 0c  t);.+    }. }. .
0990: 0a 20 2f 2a 0a 20 20 2a 2d 2d 2d 2d 2d 2d 2d 2d  . /*.  *--------
09a0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
09b0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
09c0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
09d0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a 20  --------------. 
09e0: 20 2a 0a 40 40 20 2d 36 31 38 2c 31 37 20 2b 36   *.@@ -618,17 +6
09f0: 34 31 2c 31 38 20 40 40 0a 20 20 2a 2d 2d 2d 2d  41,18 @@.  *----
0a00: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0a10: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0a20: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0a30: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0a40: 2d 2d 0a 20 20 2a 2f 0a 20 0a 20 76 6f 69 64 0a  --.  */. . void.
0a50: 20 54 63 6c 70 46 69 6e 61 6c 69 7a 65 4d 75 74   TclpFinalizeMut
0a60: 65 78 28 0a 2d 20 20 20 20 54 63 6c 5f 4d 75 74  ex(.-    Tcl_Mut
0a70: 65 78 20 2a 6d 75 74 65 78 50 74 72 29 0a 2b 20  ex *mutexPtr).+ 
0a80: 20 20 20 54 63 6c 5f 4d 75 74 65 78 20 2a 6d 75     Tcl_Mutex *mu
0a90: 74 65 78 50 74 72 29 09 2f 2a 20 52 65 61 6c 6c  texPtr)./* Reall
0aa0: 79 20 28 57 4d 75 74 65 78 20 2a 2a 29 20 2a 2f  y (WMutex **) */
0ab0: 0a 20 7b 0a 2d 20 20 20 20 43 52 49 54 49 43 41  . {.-    CRITICA
0ac0: 4c 5f 53 45 43 54 49 4f 4e 20 2a 63 73 50 74 72  L_SECTION *csPtr
0ad0: 20 3d 20 2a 28 43 52 49 54 49 43 41 4c 5f 53 45   = *(CRITICAL_SE
0ae0: 43 54 49 4f 4e 20 2a 2a 29 6d 75 74 65 78 50 74  CTION **)mutexPt
0af0: 72 3b 0a 2b 20 20 20 20 57 4d 75 74 65 78 20 2a  r;.+    WMutex *
0b00: 77 6d 50 74 72 3b 0a 20 0a 2d 20 20 20 20 69 66  wmPtr;. .-    if
0b10: 20 28 63 73 50 74 72 20 21 3d 20 4e 55 4c 4c 29   (csPtr != NULL)
0b20: 20 7b 0a 2d 09 44 65 6c 65 74 65 43 72 69 74 69   {.-.DeleteCriti
0b30: 63 61 6c 53 65 63 74 69 6f 6e 28 63 73 50 74 72  calSection(csPtr
0b40: 29 3b 0a 2d 09 54 63 6c 5f 46 72 65 65 28 63 73  );.-.Tcl_Free(cs
0b50: 50 74 72 29 3b 0a 2b 20 20 20 20 69 66 20 28 6d  Ptr);.+    if (m
0b60: 75 74 65 78 50 74 72 20 21 3d 20 4e 55 4c 4c 29  utexPtr != NULL)
0b70: 20 7b 0a 2b 09 77 6d 50 74 72 20 3d 20 2a 28 28   {.+.wmPtr = *((
0b80: 57 4d 75 74 65 78 20 2a 2a 29 6d 75 74 65 78 50  WMutex **)mutexP
0b90: 74 72 29 3b 0a 2b 09 44 65 6c 65 74 65 43 72 69  tr);.+.DeleteCri
0ba0: 74 69 63 61 6c 53 65 63 74 69 6f 6e 28 26 77 6d  ticalSection(&wm
0bb0: 50 74 72 2d 3e 63 72 69 74 29 3b 0a 2b 09 54 63  Ptr->crit);.+.Tc
0bc0: 6c 5f 46 72 65 65 28 77 6d 50 74 72 29 3b 0a 20  l_Free(wmPtr);. 
0bd0: 09 2a 6d 75 74 65 78 50 74 72 20 3d 20 4e 55 4c  .*mutexPtr = NUL
0be0: 4c 3b 0a 20 20 20 20 20 7d 0a 20 7d 0a 20 0c 0a  L;.     }. }. ..
0bf0: 20 2f 2a 0a 40 40 20 2d 36 35 38 2c 31 33 20 2b   /*.@@ -658,13 +
0c00: 36 38 32 2c 31 34 20 40 40 0a 20 20 20 20 20 54  682,14 @@.     T
0c10: 63 6c 5f 43 6f 6e 64 69 74 69 6f 6e 20 2a 63 6f  cl_Condition *co
0c20: 6e 64 50 74 72 2c 09 2f 2a 20 52 65 61 6c 6c 79  ndPtr,./* Really
0c30: 20 28 57 69 6e 43 6f 6e 64 69 74 69 6f 6e 20 2a   (WinCondition *
0c40: 2a 29 20 2a 2f 0a 20 20 20 20 20 54 63 6c 5f 4d  *) */.     Tcl_M
0c50: 75 74 65 78 20 2a 6d 75 74 65 78 50 74 72 2c 09  utex *mutexPtr,.
0c60: 2f 2a 20 52 65 61 6c 6c 79 20 28 43 52 49 54 49  /* Really (CRITI
0c70: 43 41 4c 5f 53 45 43 54 49 4f 4e 20 2a 2a 29 20  CAL_SECTION **) 
0c80: 2a 2f 0a 20 20 20 20 20 63 6f 6e 73 74 20 54 63  */.     const Tc
0c90: 6c 5f 54 69 6d 65 20 2a 74 69 6d 65 50 74 72 29  l_Time *timePtr)
0ca0: 09 2f 2a 20 54 69 6d 65 6f 75 74 20 6f 6e 20 77  ./* Timeout on w
0cb0: 61 69 74 69 6e 67 20 70 65 72 69 6f 64 20 2a 2f  aiting period */
0cc0: 0a 20 7b 0a 20 20 20 20 20 57 69 6e 43 6f 6e 64  . {.     WinCond
0cd0: 69 74 69 6f 6e 20 2a 77 69 6e 43 6f 6e 64 50 74  ition *winCondPt
0ce0: 72 3b 09 2f 2a 20 50 65 72 2d 63 6f 6e 64 69 74  r;./* Per-condit
0cf0: 69 6f 6e 20 71 75 65 75 65 20 68 65 61 64 20 2a  ion queue head *
0d00: 2f 0a 2d 20 20 20 20 43 52 49 54 49 43 41 4c 5f  /.-    CRITICAL_
0d10: 53 45 43 54 49 4f 4e 20 2a 63 73 50 74 72 3b 09  SECTION *csPtr;.
0d20: 2f 2a 20 43 61 6c 6c 65 72 27 73 20 4d 75 74 65  /* Caller's Mute
0d30: 78 2c 20 61 66 74 65 72 20 63 61 73 74 69 6e 67  x, after casting
0d40: 20 2a 2f 0a 2b 20 20 20 20 57 4d 75 74 65 78 20   */.+    WMutex 
0d50: 2a 77 6d 50 74 72 3b 09 09 2f 2a 20 43 61 6c 6c  *wmPtr;../* Call
0d60: 65 72 27 73 20 4d 75 74 65 78 2c 20 61 66 74 65  er's Mutex, afte
0d70: 72 20 63 61 73 74 69 6e 67 20 2a 2f 0a 20 20 20  r casting */.   
0d80: 20 20 44 57 4f 52 44 20 77 74 69 6d 65 3b 09 09    DWORD wtime;..
0d90: 2f 2a 20 57 69 6e 64 6f 77 73 20 74 69 6d 65 20  /* Windows time 
0da0: 76 61 6c 75 65 20 2a 2f 0a 20 20 20 20 20 69 6e  value */.     in
0db0: 74 20 74 69 6d 65 6f 75 74 3b 09 09 2f 2a 20 54  t timeout;../* T
0dc0: 72 75 65 20 69 66 20 77 65 20 67 6f 74 20 61 20  rue if we got a 
0dd0: 74 69 6d 65 6f 75 74 20 2a 2f 0a 2b 20 20 20 20  timeout */.+    
0de0: 69 6e 74 20 63 6f 75 6e 74 65 72 3b 09 09 2f 2a  int counter;../*
0df0: 20 43 61 6c 6c 65 72 27 73 20 4d 75 74 65 78 20   Caller's Mutex 
0e00: 63 6f 75 6e 74 65 72 20 2a 2f 0a 20 20 20 20 20  counter */.     
0e10: 69 6e 74 20 64 6f 45 78 69 74 20 3d 20 30 3b 09  int doExit = 0;.
0e20: 09 2f 2a 20 54 72 75 65 20 69 66 20 77 65 20 6e  ./* True if we n
0e30: 65 65 64 20 74 6f 20 64 6f 20 65 78 69 74 20 73  eed to do exit s
0e40: 65 74 75 70 20 2a 2f 0a 20 20 20 20 20 54 68 72  etup */.     Thr
0e50: 65 61 64 53 70 65 63 69 66 69 63 44 61 74 61 20  eadSpecificData 
0e60: 2a 74 73 64 50 74 72 20 3d 20 54 43 4c 5f 54 53  *tsdPtr = TCL_TS
0e70: 44 5f 49 4e 49 54 28 26 64 61 74 61 4b 65 79 29  D_INIT(&dataKey)
0e80: 3b 0a 20 0a 20 20 20 20 20 2f 2a 0a 20 20 20 20  ;. .     /*.    
0e90: 20 20 2a 20 53 65 6c 66 20 69 6e 69 74 69 61 6c    * Self initial
0ea0: 69 7a 65 20 74 68 65 20 74 77 6f 20 70 61 72 74  ize the two part
0eb0: 73 20 6f 66 20 74 68 65 20 63 6f 6e 64 69 74 69  s of the conditi
0ec0: 6f 6e 2e 20 54 68 65 20 70 65 72 2d 63 6f 6e 64  on. The per-cond
0ed0: 69 74 69 6f 6e 20 61 6e 64 0a 40 40 20 2d 37 31  ition and.@@ -71
0ee0: 35 2c 31 31 20 2b 37 34 30 2c 31 31 20 40 40 0a  5,11 +740,11 @@.
0ef0: 20 09 20 20 20 20 2a 63 6f 6e 64 50 74 72 20 3d   .    *condPtr =
0f00: 20 28 54 63 6c 5f 43 6f 6e 64 69 74 69 6f 6e 29   (Tcl_Condition)
0f10: 20 77 69 6e 43 6f 6e 64 50 74 72 3b 0a 20 09 20   winCondPtr;. . 
0f20: 20 20 20 54 63 6c 52 65 6d 65 6d 62 65 72 43 6f     TclRememberCo
0f30: 6e 64 69 74 69 6f 6e 28 63 6f 6e 64 50 74 72 29  ndition(condPtr)
0f40: 3b 0a 20 09 7d 0a 20 09 54 63 6c 70 47 6c 6f 62  ;. .}. .TclpGlob
0f50: 61 6c 55 6e 6c 6f 63 6b 28 29 3b 0a 20 20 20 20  alUnlock();.    
0f60: 20 7d 0a 2d 20 20 20 20 63 73 50 74 72 20 3d 20   }.-    csPtr = 
0f70: 2a 28 28 43 52 49 54 49 43 41 4c 5f 53 45 43 54  *((CRITICAL_SECT
0f80: 49 4f 4e 20 2a 2a 29 6d 75 74 65 78 50 74 72 29  ION **)mutexPtr)
0f90: 3b 0a 2b 20 20 20 20 77 6d 50 74 72 20 3d 20 2a  ;.+    wmPtr = *
0fa0: 28 28 57 4d 75 74 65 78 20 2a 2a 29 6d 75 74 65  ((WMutex **)mute
0fb0: 78 50 74 72 29 3b 0a 20 20 20 20 20 77 69 6e 43  xPtr);.     winC
0fc0: 6f 6e 64 50 74 72 20 3d 20 2a 28 28 57 69 6e 43  ondPtr = *((WinC
0fd0: 6f 6e 64 69 74 69 6f 6e 20 2a 2a 29 63 6f 6e 64  ondition **)cond
0fe0: 50 74 72 29 3b 0a 20 20 20 20 20 69 66 20 28 74  Ptr);.     if (t
0ff0: 69 6d 65 50 74 72 20 3d 3d 20 4e 55 4c 4c 29 20  imePtr == NULL) 
1000: 7b 0a 20 09 77 74 69 6d 65 20 3d 20 49 4e 46 49  {. .wtime = INFI
1010: 4e 49 54 45 3b 0a 20 20 20 20 20 7d 20 65 6c 73  NITE;.     } els
1020: 65 20 7b 0a 20 09 77 74 69 6d 65 20 3d 20 28 44  e {. .wtime = (D
1030: 57 4f 52 44 29 74 69 6d 65 50 74 72 2d 3e 73 65  WORD)timePtr->se
1040: 63 20 2a 20 31 30 30 30 20 2b 20 28 44 57 4f 52  c * 1000 + (DWOR
1050: 44 29 74 69 6d 65 50 74 72 2d 3e 75 73 65 63 20  D)timePtr->usec 
1060: 2f 20 31 30 30 30 3b 0a 40 40 20 2d 37 35 30 2c  / 1000;.@@ -750,
1070: 31 31 20 2b 37 37 35 2c 31 34 20 40 40 0a 20 20  11 +775,14 @@.  
1080: 20 20 20 20 2a 20 77 61 69 74 73 20 61 72 65 20      * waits are 
1090: 64 75 62 69 6f 75 73 20 61 6e 79 77 61 79 2e 20  dubious anyway. 
10a0: 45 69 74 68 65 72 20 79 6f 75 20 68 61 76 65 20  Either you have 
10b0: 74 68 65 20 6c 6f 63 6b 69 6e 67 20 70 72 6f 74  the locking prot
10c0: 6f 63 6f 6c 20 77 72 6f 6e 67 0a 20 20 20 20 20  ocol wrong.     
10d0: 20 2a 20 61 6e 64 20 61 72 65 20 6d 61 73 6b 69   * and are maski
10e0: 6e 67 20 61 20 64 65 61 64 6c 6f 63 6b 2c 20 6f  ng a deadlock, o
10f0: 72 20 79 6f 75 20 61 72 65 20 75 73 69 6e 67 20  r you are using 
1100: 63 6f 6e 64 69 74 69 6f 6e 73 20 74 6f 20 70 61  conditions to pa
1110: 75 73 65 20 79 6f 75 72 0a 20 20 20 20 20 20 2a  use your.      *
1120: 20 74 68 72 65 61 64 2e 0a 20 20 20 20 20 20 2a   thread..      *
1130: 2f 0a 20 0a 2d 20 20 20 20 4c 65 61 76 65 43 72  /. .-    LeaveCr
1140: 69 74 69 63 61 6c 53 65 63 74 69 6f 6e 28 63 73  iticalSection(cs
1150: 50 74 72 29 3b 0a 2b 20 20 20 20 63 6f 75 6e 74  Ptr);.+    count
1160: 65 72 20 3d 20 77 6d 50 74 72 2d 3e 63 6f 75 6e  er = wmPtr->coun
1170: 74 65 72 3b 0a 2b 20 20 20 20 77 6d 50 74 72 2d  ter;.+    wmPtr-
1180: 3e 74 68 72 65 61 64 20 3d 20 30 3b 0a 2b 20 20  >thread = 0;.+  
1190: 20 20 77 6d 50 74 72 2d 3e 63 6f 75 6e 74 65 72    wmPtr->counter
11a0: 20 3d 20 30 3b 0a 2b 20 20 20 20 4c 65 61 76 65   = 0;.+    Leave
11b0: 43 72 69 74 69 63 61 6c 53 65 63 74 69 6f 6e 28  CriticalSection(
11c0: 26 77 6d 50 74 72 2d 3e 63 72 69 74 29 3b 0a 20  &wmPtr->crit);. 
11d0: 20 20 20 20 74 69 6d 65 6f 75 74 20 3d 20 30 3b      timeout = 0;
11e0: 0a 20 20 20 20 20 77 68 69 6c 65 20 28 21 74 69  .     while (!ti
11f0: 6d 65 6f 75 74 20 26 26 20 28 74 73 64 50 74 72  meout && (tsdPtr
1200: 2d 3e 66 6c 61 67 73 20 26 20 57 49 4e 5f 54 48  ->flags & WIN_TH
1210: 52 45 41 44 5f 42 4c 4f 43 4b 45 44 29 29 20 7b  READ_BLOCKED)) {
1220: 0a 20 09 52 65 73 65 74 45 76 65 6e 74 28 74 73  . .ResetEvent(ts
1230: 64 50 74 72 2d 3e 63 6f 6e 64 45 76 65 6e 74 29  dPtr->condEvent)
1240: 3b 0a 20 09 4c 65 61 76 65 43 72 69 74 69 63 61  ;. .LeaveCritica
1250: 6c 53 65 63 74 69 6f 6e 28 26 77 69 6e 43 6f 6e  lSection(&winCon
1260: 64 50 74 72 2d 3e 63 6f 6e 64 4c 6f 63 6b 29 3b  dPtr->condLock);
1270: 0a 20 09 69 66 20 28 57 61 69 74 46 6f 72 53 69  . .if (WaitForSi
1280: 6e 67 6c 65 4f 62 6a 65 63 74 45 78 28 74 73 64  ngleObjectEx(tsd
1290: 50 74 72 2d 3e 63 6f 6e 64 45 76 65 6e 74 2c 20  Ptr->condEvent, 
12a0: 77 74 69 6d 65 2c 0a 40 40 20 2d 37 39 33 2c 31  wtime,.@@ -793,1
12b0: 31 20 2b 38 32 31 2c 31 32 20 40 40 0a 20 09 20  1 +821,12 @@. . 
12c0: 20 20 20 74 73 64 50 74 72 2d 3e 66 6c 61 67 73     tsdPtr->flags
12d0: 20 3d 20 57 49 4e 5f 54 48 52 45 41 44 5f 52 55   = WIN_THREAD_RU
12e0: 4e 4e 49 4e 47 3b 0a 20 09 7d 0a 20 20 20 20 20  NNING;. .}.     
12f0: 7d 0a 20 0a 20 20 20 20 20 4c 65 61 76 65 43 72  }. .     LeaveCr
1300: 69 74 69 63 61 6c 53 65 63 74 69 6f 6e 28 26 77  iticalSection(&w
1310: 69 6e 43 6f 6e 64 50 74 72 2d 3e 63 6f 6e 64 4c  inCondPtr->condL
1320: 6f 63 6b 29 3b 0a 2d 20 20 20 20 45 6e 74 65 72  ock);.-    Enter
1330: 43 72 69 74 69 63 61 6c 53 65 63 74 69 6f 6e 28  CriticalSection(
1340: 63 73 50 74 72 29 3b 0a 2b 20 20 20 20 54 63 6c  csPtr);.+    Tcl
1350: 5f 4d 75 74 65 78 4c 6f 63 6b 28 6d 75 74 65 78  _MutexLock(mutex
1360: 50 74 72 29 3b 0a 2b 20 20 20 20 77 6d 50 74 72  Ptr);.+    wmPtr
1370: 2d 3e 63 6f 75 6e 74 65 72 20 3d 20 63 6f 75 6e  ->counter = coun
1380: 74 65 72 3b 0a 20 7d 0a 20 0c 0a 20 2f 2a 0a 20  ter;. }. .. /*. 
1390: 20 2a 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d   *--------------
13a0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
13b0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
13c0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
13d0: 2d 2d 2d 2d 2d 2d 2d 2d 0a 20 20 2a 0a 0a        --------.  *..