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

[Dave H. <hel...@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  b679d5586e75b1b0a3d328970a9853b6513d5ec8 (commit)
      from  6b1e4c5066a635fa941d054b054a8c3d40992a42 (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 b679d5586e75b1b0a3d328970a9853b6513d5ec8
Author: Dave Heller <hel...@us...>
Date:   Tue Aug 20 19:48:59 2013 -0400

    [ 3600125 ] Share client tracing shm segment

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

Summary of changes:
 trace.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/trace.c b/trace.c
index 5da60cc..e165e57 100644
--- a/trace.c
+++ b/trace.c
@@ -53,7 +53,7 @@ unsigned long _sfcb_trace_mask = 0;
 /* use pointer indirect _sfcb_trace_mask to allow shared memory flag */
 unsigned long *_ptr_sfcb_trace_mask = &_sfcb_trace_mask;
 void *vpDP = NULL;
-int shmid;
+int shmid=0;
 char *_SFCB_TRACE_FILE = NULL;
 int _SFCB_TRACE_TO_SYSLOG = 0;
 
@@ -122,7 +122,9 @@ void _sfcb_trace_init()
    FILE *ferr = NULL;
    int tryid = 0xDEB001;
 
-   while ((shmid = shmget(tryid, sizeof(unsigned long), (IPC_EXCL | IPC_CREAT | 0660))) < 0 && (errno == EEXIST)) tryid++;
+   if (shmid == 0) {
+     while ((shmid = shmget(tryid, sizeof(unsigned long), (IPC_EXCL | IPC_CREAT | 0660))) < 0 && (errno == EEXIST)) tryid++;
+   }
    mlogf(M_INFO,M_SHOW,"--- Shared memory ID for tracing: %x\n", tryid);
    if (shmid < 0) {
      mlogf(M_ERROR,M_SHOW, "shmget(%x) failed in %s at line %d.\n", tryid, __FILE__, __LINE__ );


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