Artifact
b0651fe174028b7ea12b2bb22695e55a181bfec8:
Attachment "tclThreadAlloc.patch" to
ticket [3613497fff]
added by
gneumann
2013-05-17 15:32:54.
0000: 2d 2d 2d 20 74 63 6c 38 2e 35 2e 31 34 2f 67 65 --- tcl8.5.14/ge
0010: 6e 65 72 69 63 2f 74 63 6c 54 68 72 65 61 64 41 neric/tclThreadA
0020: 6c 6c 6f 63 2e 63 2d 6f 72 69 67 09 32 30 31 33 lloc.c-orig.2013
0030: 2d 30 35 2d 31 37 20 30 39 3a 34 32 3a 30 35 2e -05-17 09:42:05.
0040: 30 30 30 30 30 30 30 30 30 20 2b 30 32 30 30 0a 000000000 +0200.
0050: 2b 2b 2b 20 74 63 6c 38 2e 35 2e 31 34 2f 67 65 +++ tcl8.5.14/ge
0060: 6e 65 72 69 63 2f 74 63 6c 54 68 72 65 61 64 41 neric/tclThreadA
0070: 6c 6c 6f 63 2e 63 09 32 30 31 33 2d 30 35 2d 31 lloc.c.2013-05-1
0080: 37 20 31 30 3a 30 35 3a 30 36 2e 30 30 30 30 30 7 10:05:06.00000
0090: 30 30 30 30 20 2b 30 32 30 30 0a 40 40 20 2d 32 0000 +0200.@@ -2
00a0: 38 31 2c 37 20 2b 32 38 31 2c 31 34 20 40 40 0a 81,7 +281,14 @@.
00b0: 20 20 2a 0a 20 20 2a 2d 2d 2d 2d 2d 2d 2d 2d 2d *. *---------
00c0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
00d0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
00e0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
00f0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a 20 20 -------------.
0100: 2a 2f 0a 2d 0a 2b 23 69 66 20 64 65 66 69 6e 65 */.-.+#if define
0110: 64 28 53 59 53 54 45 4d 5f 4d 41 4c 4c 4f 43 29 d(SYSTEM_MALLOC)
0120: 0a 2b 63 68 61 72 20 2a 0a 2b 54 63 6c 70 41 6c .+char *.+TclpAl
0130: 6c 6f 63 28 0a 2b 20 20 20 20 75 6e 73 69 67 6e loc(.+ unsign
0140: 65 64 20 69 6e 74 20 6e 75 6d 42 79 74 65 73 29 ed int numBytes)
0150: 20 20 20 20 20 2f 2a 20 4e 75 6d 62 65 72 20 6f /* Number o
0160: 66 20 62 79 74 65 73 20 74 6f 20 61 6c 6c 6f 63 f bytes to alloc
0170: 61 74 65 2e 20 2a 2f 0a 2b 7b 0a 2b 20 20 20 20 ate. */.+{.+
0180: 72 65 74 75 72 6e 20 28 63 68 61 72 2a 29 20 6d return (char*) m
0190: 61 6c 6c 6f 63 28 6e 75 6d 42 79 74 65 73 29 3b alloc(numBytes);
01a0: 0a 2b 7d 0a 2b 23 65 6c 73 65 20 0a 20 63 68 61 .+}.+#else . cha
01b0: 72 20 2a 0a 20 54 63 6c 70 41 6c 6c 6f 63 28 0a r *. TclpAlloc(.
01c0: 20 20 20 20 20 75 6e 73 69 67 6e 65 64 20 69 6e unsigned in
01d0: 74 20 72 65 71 53 69 7a 65 29 0a 40 40 20 2d 33 t reqSize).@@ -3
01e0: 34 35 2c 36 20 2b 33 35 32 2c 37 20 40 40 0a 20 45,6 +352,7 @@.
01f0: 20 20 20 20 7d 0a 20 20 20 20 20 72 65 74 75 72 }. retur
0200: 6e 20 42 6c 6f 63 6b 32 50 74 72 28 62 6c 6f 63 n Block2Ptr(bloc
0210: 6b 50 74 72 2c 20 62 75 63 6b 65 74 2c 20 72 65 kPtr, bucket, re
0220: 71 53 69 7a 65 29 3b 0a 20 7d 0a 2b 23 65 6e 64 qSize);. }.+#end
0230: 69 66 0a 20 0c 0a 20 2f 2a 0a 20 20 2a 2d 2d 2d if. .. /*. *---
0240: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0250: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0260: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0270: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0280: 2d 2d 2d 0a 40 40 20 2d 33 36 31 2c 37 20 2b 33 ---.@@ -361,7 +3
0290: 36 39 2c 31 35 20 40 40 0a 20 20 2a 0a 20 20 2a 69,15 @@. *. *
02a0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
02b0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
02c0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
02d0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
02e0: 2d 2d 2d 2d 2d 2d 0a 20 20 2a 2f 0a 2d 0a 2b 23 ------. */.-.+#
02f0: 69 66 20 64 65 66 69 6e 65 64 28 53 59 53 54 45 if defined(SYSTE
0300: 4d 5f 4d 41 4c 4c 4f 43 29 0a 2b 76 6f 69 64 0a M_MALLOC).+void.
0310: 2b 54 63 6c 70 46 72 65 65 28 0a 2b 20 20 20 20 +TclpFree(.+
0320: 63 68 61 72 20 2a 70 74 72 29 20 20 20 20 20 20 char *ptr)
0330: 20 20 20 2f 2a 20 50 6f 69 6e 74 65 72 20 74 6f /* Pointer to
0340: 20 6d 65 6d 6f 72 79 20 74 6f 20 66 72 65 65 2e memory to free.
0350: 20 2a 2f 0a 2b 7b 0a 2b 20 20 20 20 66 72 65 65 */.+{.+ free
0360: 28 70 74 72 29 3b 0a 2b 20 20 20 20 72 65 74 75 (ptr);.+ retu
0370: 72 6e 3b 0a 2b 7d 0a 2b 23 65 6c 73 65 20 0a 20 rn;.+}.+#else .
0380: 76 6f 69 64 0a 20 54 63 6c 70 46 72 65 65 28 0a void. TclpFree(.
0390: 20 20 20 20 20 63 68 61 72 20 2a 70 74 72 29 0a char *ptr).
03a0: 40 40 20 2d 34 30 34 2c 36 20 2b 34 32 30 2c 37 @@ -404,6 +420,7
03b0: 20 40 40 0a 20 09 50 75 74 42 6c 6f 63 6b 73 28 @@. .PutBlocks(
03c0: 63 61 63 68 65 50 74 72 2c 20 62 75 63 6b 65 74 cachePtr, bucket
03d0: 2c 20 62 75 63 6b 65 74 49 6e 66 6f 5b 62 75 63 , bucketInfo[buc
03e0: 6b 65 74 5d 2e 6e 75 6d 4d 6f 76 65 29 3b 0a 20 ket].numMove);.
03f0: 20 20 20 20 7d 0a 20 7d 0a 2b 23 65 6e 64 69 66 }. }.+#endif
0400: 0a 20 0c 0a 20 2f 2a 0a 20 20 2a 2d 2d 2d 2d 2d . .. /*. *-----
0410: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0420: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0430: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0440: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0450: 2d 0a 40 40 20 2d 34 32 30 2c 37 20 2b 34 33 37 -.@@ -420,7 +437
0460: 2c 31 35 20 40 40 0a 20 20 2a 0a 20 20 2a 2d 2d ,15 @@. *. *--
0470: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0480: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0490: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
04a0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
04b0: 2d 2d 2d 2d 0a 20 20 2a 2f 0a 2d 0a 2b 23 69 66 ----. */.-.+#if
04c0: 20 64 65 66 69 6e 65 64 28 53 59 53 54 45 4d 5f defined(SYSTEM_
04d0: 4d 41 4c 4c 4f 43 29 0a 2b 63 68 61 72 20 2a 0a MALLOC).+char *.
04e0: 2b 54 63 6c 70 52 65 61 6c 6c 6f 63 28 0a 2b 20 +TclpRealloc(.+
04f0: 20 20 20 63 68 61 72 20 2a 6f 6c 64 50 74 72 2c char *oldPtr,
0500: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 2f 2a /*
0510: 20 50 6f 69 6e 74 65 72 20 74 6f 20 61 6c 6c 6f Pointer to allo
0520: 63 65 64 20 62 6c 6f 63 6b 2e 20 2a 2f 0a 2b 20 ced block. */.+
0530: 20 20 20 75 6e 73 69 67 6e 65 64 20 69 6e 74 20 unsigned int
0540: 6e 75 6d 42 79 74 65 73 29 20 20 20 20 20 2f 2a numBytes) /*
0550: 20 4e 65 77 20 73 69 7a 65 20 6f 66 20 6d 65 6d New size of mem
0560: 6f 72 79 2e 20 2a 2f 0a 2b 7b 0a 2b 20 20 20 20 ory. */.+{.+
0570: 72 65 74 75 72 6e 20 72 65 61 6c 6c 6f 63 28 6f return realloc(o
0580: 6c 64 50 74 72 2c 20 6e 75 6d 42 79 74 65 73 29 ldPtr, numBytes)
0590: 3b 0a 2b 7d 0a 2b 23 65 6c 73 65 0a 20 63 68 61 ;.+}.+#else. cha
05a0: 72 20 2a 0a 20 54 63 6c 70 52 65 61 6c 6c 6f 63 r *. TclpRealloc
05b0: 28 0a 20 20 20 20 20 63 68 61 72 20 2a 70 74 72 (. char *ptr
05c0: 2c 0a 40 40 20 2d 35 30 31 2c 36 20 2b 35 32 36 ,.@@ -501,6 +526
05d0: 2c 37 20 40 40 0a 20 20 20 20 20 7d 0a 20 20 20 ,7 @@. }.
05e0: 20 20 72 65 74 75 72 6e 20 6e 65 77 50 74 72 3b return newPtr;
05f0: 0a 20 7d 0a 2b 23 65 6e 64 69 66 0a 20 0c 0a 20 . }.+#endif. ..
0600: 2f 2a 0a 20 20 2a 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d /*. *----------
0610: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0620: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0630: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0640: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a ------------.