Changeset 4a2fee47 in rtems for cpukit

Timestamp:

Feb 6, 2007, 10:54:34 PM (13 years ago)

Author:

Till Straumann <strauman@…>

Children:

356914bb

Parents:

edffc8ed

Message:

2007-02-06 Till Straumann <strauman@…>

• libcsupport/src/gxx_wrappers.c: fix PR#690. Supply taskvar dtor to plug memory leak. Applied patch attached to PR#690.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• libcsupport/src/gxx_wrappers.c (modified) (9 diffs)

cpukit/ChangeLog

@@ +1 @@
+2007-02-06      Till Straumann <strauman@slac.stanford.edu>
+
+        * libcsupport/src/gxx_wrappers.c: fix PR#690. Supply
+        taskvar dtor to plug memory leak. Applied patch attached
+        to PR#690.
+
 2007-02-06      Ralf Corsépius <ralf.corsepius@rtems.org>
 

cpukit/libcsupport/src/gxx_wrappers.c

@@ -41 +41 @@
  * These typedefs should match with the ones defined in the file
  * gcc/gthr-rtems.h in the gcc distribution.
- */
-typedef void *__gthread_key_t;
+ * FIXME: T.S, 2007/01/31: -> gcc/gthr-rtems.h still declares
+ *                            void * __gthread_key_t;
+ */
+typedef struct __gthread_key_ {
+        void *val;                 /* this is switched with the task      */
+        void (*dtor)(void*);   /* this remains in place for all tasks */
+} __gthread_key, *__gthread_key_t;
 typedef int   __gthread_once_t;
 typedef void *__gthread_mutex_t;
@@ -72 +77 @@
    {
       rtems_mode saveMode;
+      __gthread_once_t o;
       rtems_task_mode(RTEMS_NO_PREEMPT, RTEMS_PREEMPT_MASK, &saveMode);
-      if( *(volatile __gthread_once_t *)once == 0 )
+      if( (o = *(volatile __gthread_once_t *)once) == 0 )
       {
          *(volatile __gthread_once_t *)once = 1;
-         (*func)();
       }
       rtems_task_mode(saveMode, RTEMS_PREEMPT_MASK, &saveMode);
+      if ( o == 0 )
+         (*func)();
    }
    return 0;
@@ -92 +99 @@
    */
    /* Do not pull your hair, trust me this works. :-) */
-  __gthread_key_t *new_key = ( __gthread_key_t * )malloc( sizeof( __gthread_key_t ) );
-  *key = ( __gthread_key_t )new_key;
-  *new_key = NULL;
+  __gthread_key_t new_key = ( __gthread_key_t )malloc( sizeof( *new_key ) );
+  *key = new_key;
+  new_key->val  = NULL;
+  new_key->dtor = dtor;
 
 #ifdef DEBUG_GXX_WRAPPERS
@@ -100 +108 @@
 #endif
   /* register with RTEMS the buffer that will hold the key values */
-  if( rtems_task_variable_add( RTEMS_SELF, (void **)new_key, NULL ) == RTEMS_SUCCESSFUL )
+  if( rtems_task_variable_add( RTEMS_SELF, (void **)new_key, dtor ) == RTEMS_SUCCESSFUL )
        return 0;
   return -1;
@@ -110 +118 @@
   printk( "gxx_wrappers: dtor key=%x, ptr=%x\n", key, ptr );
 #endif
-   *(void **)key = 0;
+   key->val  = 0;
    return 0;
 }
@@ -122 +130 @@
   if( rtems_task_variable_delete( RTEMS_SELF, (void **)key ) == RTEMS_SUCCESSFUL )
   {
+     /* Hmm - hopefully all tasks using this key have gone away... */
      if( key ) free( (void *)key );
      return 0;
@@ -137 +146 @@
   {
     /* We do not have to do this, but what the heck ! */
-     p= *( void **)key;
+     p= key->val;
   }
   else
@@ -144 +153 @@
      * threads are using at the moment of this call
      */
-    if( rtems_task_variable_add( RTEMS_SELF, (void **)key, NULL ) != RTEMS_SUCCESSFUL )
+    if( rtems_task_variable_add( RTEMS_SELF, (void **)key, key->dtor ) != RTEMS_SUCCESSFUL )
     {
        rtems_panic ("rtems_gxx_getspecific");
     }
-    *( void ** )key = (void *)0;
+    key->val = (void *)0;
   }
 
@@ -164 +173 @@
 #endif
   /* register with RTEMS the buffer that will hold the key values */
-  if( rtems_task_variable_add( RTEMS_SELF, (void **)key, NULL ) == RTEMS_SUCCESSFUL )
+  if( rtems_task_variable_add( RTEMS_SELF, (void **)key, key->dtor ) == RTEMS_SUCCESSFUL )
   {
     /* now let's set the proper value */
-    *( void ** )key = (void *)ptr;
+    key->val =  (void *)ptr;
      return 0;
   }