[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master_1.3, updated. 7021583c6feabc014d0cf277469999397b2d05ea

[Michael Chase-S. <mc...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".

The branch, master_1.3 has been updated
       via  7021583c6feabc014d0cf277469999397b2d05ea (commit)
      from  832300434ba887029c7990c3d28821ebf09ea845 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7021583c6feabc014d0cf277469999397b2d05ea
Author: Michael Chase-Salerno <br...@li...>
Date:   Wed Mar 13 12:08:45 2013 -0400

    [sfcb-tix:#28] Further shm trace id leak

-----------------------------------------------------------------------

Summary of changes:
 support.c |    7 ++-----
 trace.c   |    1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/support.c b/support.c
index cdda9fb..86994eb 100644
--- a/support.c
+++ b/support.c
@@ -402,7 +402,6 @@ static void __flush_mt(managed_thread * mt)
  
 static void __cleanup_mt(void *ptr)
 {
-   _SFCB_ENTER(TRACE_MEMORYMGR, "__cleanup_mt");
    managed_thread *mt = (managed_thread *) ptr;
    
    //   fprintf(stderr,"---- %d/%d cleanup_mt %x, %x\n", getpid(), pthread_self(), mt , (mt?mt->hc.memEncObjs:NULL));
@@ -417,7 +416,7 @@ static void __cleanup_mt(void *ptr)
        { free(mt->hc.memEncObjs); mt->hc.memEncObjs = NULL; }
      if (mt) { free(mt); mt = NULL; }
    }
-   _SFCB_EXIT();
+   return;
 }
 
 static managed_thread *__memInit(int dontforce);
@@ -441,7 +440,6 @@ void uninitGarbageCollector()
 
 static managed_thread *__init_mt()
 {
-   _SFCB_ENTER(TRACE_MEMORYMGR, "managed_thread");
    managed_thread *mt = (managed_thread *) calloc(1, sizeof(managed_thread)+8);
 
    //   fprintf(stderr,"---- %d/%d init_mt \n", getpid(), pthread_self());
@@ -457,7 +455,7 @@ static managed_thread *__init_mt()
 
    CMPI_BrokerExt_Ftab->setThreadSpecific(__mm_key, mt);
 
-   _SFCB_RETURN(mt);
+   return(mt);
 }
 
 /**
@@ -477,7 +475,6 @@ static void __init_mm()
  */
 static managed_thread *__memInit(int dontforce)
 {
-   _SFCB_ENTER(TRACE_MEMORYMGR, "__memInit");
    managed_thread *mt;
 
    CMPI_BrokerExt_Ftab->threadOnce(&__once, __init_mm);
diff --git a/trace.c b/trace.c
index b0baa31..5da60cc 100644
--- a/trace.c
+++ b/trace.c
@@ -110,6 +110,7 @@ void _sfcb_trace_start(int n)
 void _sfcb_trace_stop()
 {
   shmctl(shmid, IPC_RMID, 0);
+  shmdt(vpDP);
   _sfcb_debug = 0;
 }
 


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker