Tcl Source Code

Hex Artifact Content
Login

Artifact c37b120f2c23a4e5f9d1f6c45b61aaf016583ca3:

Attachment "pthread-callback.patch" to ticket [3cc1d91345] added by gustafn2 2016-09-26 18:23:51. (unpublished)
0000: 49 6e 64 65 78 3a 20 75 6e 69 78 2f 74 63 6c 55  Index: unix/tclU
0010: 6e 69 78 54 68 72 64 2e 63 0a 3d 3d 3d 3d 3d 3d  nixThrd.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 3d 3d 0a 2d 2d 2d  ============.---
0060: 20 75 6e 69 78 2f 74 63 6c 55 6e 69 78 54 68 72   unix/tclUnixThr
0070: 64 2e 63 0a 2b 2b 2b 20 75 6e 69 78 2f 74 63 6c  d.c.+++ unix/tcl
0080: 55 6e 69 78 54 68 72 64 2e 63 0a 40 40 20 2d 37  UnixThrd.c.@@ -7
0090: 32 30 2c 31 39 20 2b 37 32 30 2c 32 30 20 40 40  20,19 +720,20 @@
00a0: 0a 20 54 63 6c 70 46 72 65 65 41 6c 6c 6f 63 43  . TclpFreeAllocC
00b0: 61 63 68 65 28 0a 20 20 20 20 20 76 6f 69 64 20  ache(.     void 
00c0: 2a 70 74 72 29 0a 20 7b 0a 20 20 20 20 20 69 66  *ptr). {.     if
00d0: 20 28 70 74 72 20 21 3d 20 4e 55 4c 4c 29 20 7b   (ptr != NULL) {
00e0: 0a 20 09 2f 2a 0a 2d 09 20 2a 20 43 61 6c 6c 65  . ./*.-. * Calle
00f0: 64 20 62 79 20 74 68 65 20 70 74 68 72 65 61 64  d by the pthread
0100: 20 6c 69 62 20 77 68 65 6e 20 61 20 74 68 72 65   lib when a thre
0110: 61 64 20 65 78 69 74 73 0a 2b 09 20 2a 20 43 61  ad exits.+. * Ca
0120: 6c 6c 65 64 20 62 79 20 54 63 6c 46 69 6e 61 6c  lled by TclFinal
0130: 69 7a 65 54 68 72 65 61 64 41 6c 6c 6f 63 54 68  izeThreadAllocTh
0140: 72 65 61 64 28 29 20 64 75 72 69 6e 67 20 74 68  read() during th
0150: 65 20 74 68 72 65 61 64 0a 2b 09 20 2a 20 66 69  e thread.+. * fi
0160: 6e 61 6c 69 7a 61 74 69 6f 6e 20 69 6e 69 74 69  nalization initi
0170: 61 74 65 64 20 66 72 6f 6d 20 54 63 6c 5f 46 69  ated from Tcl_Fi
0180: 6e 61 6c 69 7a 65 54 68 72 65 61 64 28 29 0a 20  nalizeThread(). 
0190: 09 20 2a 2f 0a 20 0a 20 09 54 63 6c 46 72 65 65  . */. . .TclFree
01a0: 41 6c 6c 6f 63 43 61 63 68 65 28 70 74 72 29 3b  AllocCache(ptr);
01b0: 0a 20 09 70 74 68 72 65 61 64 5f 73 65 74 73 70  . .pthread_setsp
01c0: 65 63 69 66 69 63 28 6b 65 79 2c 20 4e 55 4c 4c  ecific(key, NULL
01d0: 29 3b 0a 20 0a 20 20 20 20 20 7d 20 65 6c 73 65  );. .     } else
01e0: 20 69 66 20 28 69 6e 69 74 69 61 6c 69 7a 65 64   if (initialized
01f0: 29 20 7b 0a 20 09 2f 2a 0a 2d 09 20 2a 20 43 61  ) {. ./*.-. * Ca
0200: 6c 6c 65 64 20 62 79 20 75 73 20 69 6e 20 54 63  lled by us in Tc
0210: 6c 46 69 6e 61 6c 69 7a 65 54 68 72 65 61 64 41  lFinalizeThreadA
0220: 6c 6c 6f 63 28 29 20 64 75 72 69 6e 67 20 74 68  lloc() during th
0230: 65 20 6c 69 62 72 61 72 79 0a 2b 09 20 2a 20 43  e library.+. * C
0240: 61 6c 6c 65 64 20 62 79 20 54 63 6c 46 69 6e 61  alled by TclFina
0250: 6c 69 7a 65 54 68 72 65 61 64 41 6c 6c 6f 63 28  lizeThreadAlloc(
0260: 29 20 64 75 72 69 6e 67 20 74 68 65 20 70 72 6f  ) during the pro
0270: 63 65 73 73 0a 20 09 20 2a 20 66 69 6e 61 6c 69  cess. . * finali
0280: 7a 61 74 69 6f 6e 20 69 6e 69 74 69 61 74 65 64  zation initiated
0290: 20 66 72 6f 6d 20 54 63 6c 5f 46 69 6e 61 6c 69   from Tcl_Finali
02a0: 7a 65 28 29 0a 20 09 20 2a 2f 0a 20 0a 20 09 70  ze(). . */. . .p
02b0: 74 68 72 65 61 64 5f 6b 65 79 5f 64 65 6c 65 74  thread_key_delet
02c0: 65 28 6b 65 79 29 3b 0a 20 09 69 6e 69 74 69 61  e(key);. .initia
02d0: 6c 69 7a 65 64 20 3d 20 30 3b 0a 40 40 20 2d 37  lized = 0;.@@ -7
02e0: 34 33 2c 31 31 20 2b 37 34 34 2c 31 31 20 40 40  43,11 +744,11 @@
02f0: 0a 20 54 63 6c 70 47 65 74 41 6c 6c 6f 63 43 61  . TclpGetAllocCa
0300: 63 68 65 28 76 6f 69 64 29 0a 20 7b 0a 20 20 20  che(void). {.   
0310: 20 20 69 66 20 28 21 69 6e 69 74 69 61 6c 69 7a    if (!initializ
0320: 65 64 29 20 7b 0a 20 09 70 74 68 72 65 61 64 5f  ed) {. .pthread_
0330: 6d 75 74 65 78 5f 6c 6f 63 6b 28 61 6c 6c 6f 63  mutex_lock(alloc
0340: 4c 6f 63 6b 50 74 72 29 3b 0a 20 09 69 66 20 28  LockPtr);. .if (
0350: 21 69 6e 69 74 69 61 6c 69 7a 65 64 29 20 7b 0a  !initialized) {.
0360: 2d 09 20 20 20 20 70 74 68 72 65 61 64 5f 6b 65  -.    pthread_ke
0370: 79 5f 63 72 65 61 74 65 28 26 6b 65 79 2c 20 54  y_create(&key, T
0380: 63 6c 70 46 72 65 65 41 6c 6c 6f 63 43 61 63 68  clpFreeAllocCach
0390: 65 29 3b 0a 2b 09 20 20 20 20 70 74 68 72 65 61  e);.+.    pthrea
03a0: 64 5f 6b 65 79 5f 63 72 65 61 74 65 28 26 6b 65  d_key_create(&ke
03b0: 79 2c 20 4e 55 4c 4c 29 3b 0a 20 09 20 20 20 20  y, NULL);. .    
03c0: 69 6e 69 74 69 61 6c 69 7a 65 64 20 3d 20 31 3b  initialized = 1;
03d0: 0a 20 09 7d 0a 20 09 70 74 68 72 65 61 64 5f 6d  . .}. .pthread_m
03e0: 75 74 65 78 5f 75 6e 6c 6f 63 6b 28 61 6c 6c 6f  utex_unlock(allo
03f0: 63 4c 6f 63 6b 50 74 72 29 3b 0a 20 20 20 20 20  cLockPtr);.     
0400: 7d 0a 20 20 20 20 20 72 65 74 75 72 6e 20 70 74  }.     return pt
0410: 68 72 65 61 64 5f 67 65 74 73 70 65 63 69 66 69  hread_getspecifi
0420: 63 28 6b 65 79 29 3b 0a 0a                       c(key);..