[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-410-gb20288c

[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 has been updated
       via  b20288c2bafa04403eed42319cbf348032e167d9 (commit)
      from  7743007e15ef137f75e0a291efe9870ff352f6ba (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 b20288c2bafa04403eed42319cbf348032e167d9
Author: Michael Chase-Salerno <br...@li...>
Date:   Tue Mar 12 18:37:00 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 e69ff80..328fa4a 100644
--- a/support.c
+++ b/support.c
@@ -403,7 +403,6 @@ __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(),
@@ -420,7 +419,7 @@ __cleanup_mt(void *ptr)
 
     if (mt) { free(mt); mt = NULL; }
   }
-  _SFCB_EXIT();
+  return;
 }
 
 static managed_thread *__memInit(int dontforce);
@@ -450,7 +449,6 @@ uninitGarbageCollector()
 static managed_thread *
 __init_mt()
 {
-  _SFCB_ENTER(TRACE_MEMORYMGR, "managed_thread");
   managed_thread *mt =
       (managed_thread *) calloc(1, sizeof(managed_thread) + 8);
 
@@ -467,7 +465,7 @@ __init_mt()
 
   CMPI_BrokerExt_Ftab->setThreadSpecific(__mm_key, mt);
 
-  _SFCB_RETURN(mt);
+  return(mt);
 }
 
 /**
@@ -489,7 +487,6 @@ __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 95191a0..1eef7e5 100644
--- a/trace.c
+++ b/trace.c
@@ -118,6 +118,7 @@ void
 _sfcb_trace_stop()
 {
   shmctl(shmid, IPC_RMID, 0);
+  shmdt(vpDP);
   _sfcb_debug = 0;
 }
 


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