diff options
| author | Mike Stump <mrs@wrs.com> | 1998-12-04 00:28:34 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-12-03 17:28:34 -0700 |
| commit | 0fcff08299c93ab75e5af2c9c88fc2d437c64c68 (patch) | |
| tree | 110b6dc685ee9f0842de2dda6c788f9d5ffd6539 | |
| parent | 9f643ff81def49d34790b78d4ce68fe2b1bac4c0 (diff) | |
| download | gcc-0fcff08299c93ab75e5af2c9c88fc2d437c64c68.zip gcc-0fcff08299c93ab75e5af2c9c88fc2d437c64c68.tar.gz gcc-0fcff08299c93ab75e5af2c9c88fc2d437c64c68.tar.bz2 | |
gthr-vxworks.h (__ehdtor): Fix memory leak.
* gthr-vxworks.h (__ehdtor): Fix memory leak. The delete hook
runs in the context of the deleter, not the deletee, so we must
use taskVarGet to find the correct memory to free.
(__gthread_key_create): Initialize the task
variable subsystem so that the task variable is still active when
the delete hook is run.
From-SVN: r24079
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/gthr-vxworks.h | 18 |
2 files changed, 23 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f7ad211..1231b9f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +Thu Dec 3 11:19:50 1998 Mike Stump <mrs@wrs.com> + + * gthr-vxworks.h (__ehdtor): Fix memory leak. The delete hook + runs in the context of the deleter, not the deletee, so we must + use taskVarGet to find the correct memory to free. + (__gthread_key_create): Initialize the task + variable subsystem so that the task variable is still active when + the delete hook is run. + 1998-12-03 Joseph S. Myers <jsm28@cam.ac.uk> * pdp11.h (TARGET_40_PLUS): Fix typo. diff --git a/gcc/gthr-vxworks.h b/gcc/gthr-vxworks.h index 9876646..6d51ded 100644 --- a/gcc/gthr-vxworks.h +++ b/gcc/gthr-vxworks.h @@ -60,11 +60,16 @@ extern __gthread_key_t eh_context_key; don't map well enough onto VxWorks. */ static void -__ehdtor () +__ehdtor (void *pTcb) { - if (eh_context_key) - free ((void*)eh_context_key); - eh_context_key = 0; + int tid = (int) pTcb; + void *p = (void*)taskVarGet(tid, &eh_context_key); + if (p != (void*)-1) + { + if (p) + free (p); + taskVarSet(tid, &eh_context_key, 0); + } } /* This only works for the code in libgcc2.c. */ @@ -74,6 +79,11 @@ __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *)) { *key = 0; + /* Do this first so that the task variables are visible during the + running of the delete hook. */ + + taskVarInit(); + /* We don't have a way to track dtor here, so instead, we register a generic routine that can cleanup any task. */ |