Merge pull request #14 from v-chojas/fix-trace-refcount

Fix tracing with multiple environments
lurcher · May 7, 2018 · 8656d0f · 8656d0f
2 parents 4318216 + edc50eb
commit 8656d0f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/DriverManager/__info.c b/DriverManager/__info.c
@@ -474,7 +474,7 @@
 
 static char const rcsid[]= "$RCSfile: __info.c,v $ $Revision: 1.50 $";
 
-struct log_structure log_info = { NULL, NULL, 0 };
+struct log_structure log_info = { NULL, NULL, 0, 0 };
 
 SQLINTEGER ODBCSharedTraceFlag = 0;
 
@@ -5815,6 +5815,7 @@ void  dm_log_open( char *program_name,
      */
 
     log_info.pid_logging = pid_logging;
+    log_info.ref_count++;
 }
 
 void dm_log_write( char *function_name, int line, int type, int severity,
@@ -5954,9 +5955,16 @@ void dm_log_write_diag( char *message )
 
 void dm_log_close( void )
 {
-    free( log_info.program_name );
-    free( log_info.log_file_name );
-    log_info.program_name = NULL;
-    log_info.log_file_name = NULL;
-    log_info.log_flag = 0;
+    if ( !log_info.ref_count )
+        return;
+
+    log_info.ref_count--;
+    if ( !log_info.ref_count )
+    {
+        free( log_info.program_name );
+        free( log_info.log_file_name );
+        log_info.program_name = NULL;
+        log_info.log_file_name = NULL;
+        log_info.log_flag = 0;
+    }
 }
diff --git a/DriverManager/drivermanager.h b/DriverManager/drivermanager.h
@@ -209,7 +209,7 @@ struct log_structure
     int     log_flag;
     int     pid_logging;            /* the log path specifies a directory, and a */
                                     /* log file per pid is created */
-
+    int     ref_count;              /* number of times dm_log_open()'d without dm_log_close() */
 };
 
 extern struct log_structure log_info;