Mercurial > cpython-lru_cache-weakref
annotate Python/thread_os2.h @ 8358:da4bdceeaad7 legacy-trunk
Another veeeeeery old patch...
Date: Thu, 14 Sep 1995 12:18:20 -0400
From: Alan Morse <alan@dvcorp.com>
To: python-list@cwi.nl
Subject: getargs bug in 1.2 and 1.3 BETA
We have found a bug in the part of the getargs code that we added
and submitted, and which was incorporated into 1.1.
The parsing of "O?" format specifiers is not handled correctly;
there is no "else" for the "if" and therefore it can never fail.
What's worse, the advancing of the varargs pointer is not
handled properly, so from then on it is out of sync, wreaking
all sorts of havoc. (If it had failed properly, then the out-of-sync
varargs would not have been an issue.)
Below is the context diff for the change.
Note that I have made a few stylistic changes beyond adding the
else case, namely:
1) Making the "O" case follow the convention established by the other
format specifiers of getting all their vararg arguments before
performing the test, rather than getting some before and some after
the test passes.
2) Making the logic of the tests parallel, so the "if" part indicates
that the format is accepted and the "else" part indicates that the
format has failed. They were inconsistent with each other and with the
the other format specifiers.
-Alan Morse (amorse@dvcorp.com)
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Fri, 15 May 1998 22:04:07 +0000 |
| parents | 5e31d381fa47 |
| children | 877d23bd5bdc |
| rev | line source |
|---|---|
| 2649 | 1 /*********************************************************** |
|
4503
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
2 Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam, |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
3 The Netherlands. |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
4 |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
5 All Rights Reserved |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
6 |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
7 Permission to use, copy, modify, and distribute this software and its |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
8 documentation for any purpose and without fee is hereby granted, |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
9 provided that the above copyright notice appear in all copies and that |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
10 both that copyright notice and this permission notice appear in |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
11 supporting documentation, and that the names of Stichting Mathematisch |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
12 Centrum or CWI or Corporation for National Research Initiatives or |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
13 CNRI not be used in advertising or publicity pertaining to |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
14 distribution of the software without specific, written prior |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
15 permission. |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
16 |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
17 While CWI is the initial source for this software, a modified version |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
18 is made available by the Corporation for National Research Initiatives |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
19 (CNRI) at the Internet address ftp://ftp.python.org. |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
20 |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
21 STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
22 REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
23 MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
24 CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
25 DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
26 PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
27 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
|
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
28 PERFORMANCE OF THIS SOFTWARE. |
| 2649 | 29 |
|
4503
65d2d8e67da3
New permission notice, includes CNRI.
Guido van Rossum <guido@python.org>
parents:
4371
diff
changeset
|
30 ******************************************************************/ |
| 2649 | 31 |
| 32 /* This code implemented by cvale@netcom.com */ | |
| 33 | |
| 34 #define INCL_DOSPROCESS | |
| 35 #define INCL_DOSSEMAPHORES | |
| 36 #include "os2.h" | |
| 37 #include "limits.h" | |
| 38 | |
| 39 #include "process.h" | |
| 40 | |
| 41 long get_thread_ident(void); | |
| 42 | |
| 43 | |
| 44 /* | |
| 45 * Initialization of the C package, should not be needed. | |
| 46 */ | |
| 47 static void _init_thread(void) | |
| 48 { | |
| 49 } | |
| 50 | |
| 51 /* | |
| 52 * Thread support. | |
| 53 */ | |
| 54 int start_new_thread(void (*func)(void *), void *arg) | |
| 55 { | |
| 56 int aThread; | |
| 57 int success = 1; | |
| 58 | |
|
6626
5e31d381fa47
os2 patch by Jeff Rush
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
59 aThread = _beginthread(func,NULL,65536,arg); |
| 2649 | 60 |
| 61 if( aThread == -1 ) { | |
| 62 success = 0; | |
| 63 fprintf(stderr,"aThread failed == %d",aThread); | |
| 64 dprintf(("_beginthread failed. return %ld\n", errno)); | |
| 65 } | |
| 66 | |
| 67 return success; | |
| 68 } | |
| 69 | |
| 70 long get_thread_ident(void) | |
| 71 { | |
| 72 PPIB pib; | |
| 73 PTIB tib; | |
| 74 | |
| 75 if (!initialized) | |
| 76 init_thread(); | |
| 77 | |
| 78 DosGetInfoBlocks(&tib,&pib); | |
| 79 return tib->tib_ptib2->tib2_ultid; | |
| 80 } | |
| 81 | |
| 82 static void do_exit_thread(int no_cleanup) | |
| 83 { | |
| 84 dprintf(("%ld: exit_thread called\n", get_thread_ident())); | |
| 85 if (!initialized) | |
| 86 if (no_cleanup) | |
| 87 _exit(0); | |
| 88 else | |
| 89 exit(0); | |
| 90 _endthread(); | |
| 91 } | |
| 92 | |
| 93 void exit_thread(void) | |
| 94 { | |
| 95 do_exit_thread(0); | |
| 96 } | |
| 97 | |
| 98 void _exit_thread(void) | |
| 99 { | |
| 100 do_exit_thread(1); | |
| 101 } | |
| 102 | |
| 103 #ifndef NO_EXIT_PROG | |
| 104 static void do_exit_prog(int status, int no_cleanup) | |
| 105 { | |
| 106 dprintf(("exit_prog(%d) called\n", status)); | |
| 107 if (!initialized) | |
| 108 if (no_cleanup) | |
| 109 _exit(status); | |
| 110 else | |
| 111 exit(status); | |
| 112 } | |
| 113 | |
| 114 void exit_prog(int status) | |
| 115 { | |
| 116 do_exit_prog(status, 0); | |
| 117 } | |
| 118 | |
| 119 void _exit_prog _P1(int status) | |
| 120 { | |
| 121 do_exit_prog(status, 1); | |
| 122 } | |
| 123 #endif /* NO_EXIT_PROG */ | |
| 124 | |
| 125 /* | |
| 126 * Lock support. It has too be implemented as semaphores. | |
| 127 * I [Dag] tried to implement it with mutex but I could find a way to | |
| 128 * tell whether a thread already own the lock or not. | |
| 129 */ | |
| 130 type_lock allocate_lock(void) | |
| 131 { | |
| 132 HMTX aLock; | |
| 133 APIRET rc; | |
| 134 | |
| 135 dprintf(("allocate_lock called\n")); | |
| 136 if (!initialized) | |
| 137 init_thread(); | |
| 138 | |
| 139 DosCreateMutexSem(NULL, /* Sem name */ | |
| 140 &aLock, /* the semaphone */ | |
| 141 0, /* shared ? */ | |
| 142 0); /* initial state */ | |
| 143 | |
| 144 dprintf(("%ld: allocate_lock() -> %lx\n", get_thread_ident(), (long)aLock)); | |
| 145 | |
| 146 return (type_lock) aLock; | |
| 147 } | |
| 148 | |
| 149 void free_lock(type_lock aLock) | |
| 150 { | |
| 151 dprintf(("%ld: free_lock(%lx) called\n", get_thread_ident(),(long)aLock)); | |
| 152 | |
| 153 DosCloseMutexSem((HMTX)aLock); | |
| 154 } | |
| 155 | |
| 156 /* | |
| 157 * Return 1 on success if the lock was acquired | |
| 158 * | |
| 159 * and 0 if the lock was not acquired. This means a 0 is returned | |
| 160 * if the lock has already been acquired by this thread! | |
| 161 */ | |
| 162 int acquire_lock(type_lock aLock, int waitflag) | |
| 163 { | |
| 164 int success = 1; | |
| 165 ULONG rc, count; | |
| 166 PID pid = 0; | |
| 167 TID tid = 0; | |
| 168 | |
| 169 dprintf(("%ld: acquire_lock(%lx, %d) called\n", get_thread_ident(), | |
| 170 (long)aLock, waitflag)); | |
| 171 | |
| 172 DosQueryMutexSem((HMTX)aLock,&pid,&tid,&count); | |
| 173 if( tid == get_thread_ident() ) { /* if we own this lock */ | |
| 174 success = 0; | |
| 175 } else { | |
| 176 rc = DosRequestMutexSem((HMTX) aLock, | |
| 177 (waitflag == 1 ? SEM_INDEFINITE_WAIT : 0)); | |
| 178 | |
| 179 if( rc != 0) { | |
| 180 success = 0; /* We failed */ | |
| 181 } | |
| 182 } | |
| 183 | |
| 184 dprintf(("%ld: acquire_lock(%lx, %d) -> %d\n", | |
| 185 get_thread_ident(),(long)aLock, waitflag, success)); | |
| 186 | |
| 187 return success; | |
| 188 } | |
| 189 | |
| 190 void release_lock(type_lock aLock) | |
| 191 { | |
| 192 dprintf(("%ld: release_lock(%lx) called\n", get_thread_ident(),(long)aLock)); | |
| 193 | |
| 194 if ( DosReleaseMutexSem( (HMTX) aLock ) != 0 ) { | |
| 195 dprintf(("%ld: Could not release_lock(%lx) error: %l\n", | |
| 196 get_thread_ident(), (long)aLock, GetLastError())); | |
| 197 } | |
| 198 } | |
| 199 | |
| 200 /* | |
| 201 * Semaphore support. | |
| 202 */ | |
| 203 type_sema allocate_sema(int value) | |
| 204 { | |
| 205 return (type_sema) 0; | |
| 206 } | |
| 207 | |
| 208 void free_sema(type_sema aSemaphore) | |
| 209 { | |
| 210 | |
| 211 } | |
| 212 | |
|
6626
5e31d381fa47
os2 patch by Jeff Rush
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
213 int down_sema(type_sema aSemaphore, int waitflag) |
| 2649 | 214 { |
|
4371
c277ee8c669c
Sjoerd's thread changes (including down_sema typo fix).
Guido van Rossum <guido@python.org>
parents:
2649
diff
changeset
|
215 return -1; |
| 2649 | 216 } |
| 217 | |
| 218 void up_sema(type_sema aSemaphore) | |
| 219 { | |
| 220 dprintf(("%ld: up_sema(%lx)\n", get_thread_ident(), (long)aSemaphore)); | |
| 221 } |