update Changes

[imager.git] / log.c

diff --git a/log.c b/log.c
index 7f3f663ec1585b087a4e65d4ecff8fd2ecd9ed45..62b8eab8c79132d5594b174916f306d5902155a2 100644 (file)
--- a/log.c
+++ b/log.c
@@ -11,15 +11,10 @@
 #define DTBUFF 50
 #define DATABUFF DTBUFF+3+10+1+5+1+1
 
-#if 0
-static int   log_level   = 0;
-static FILE *lg_file     = NULL;
-static char  date_buffer[DTBUFF];
-static char  data_buffer[DATABUFF];
-#endif
-
 #define LOG_DATE_FORMAT "%Y/%m/%d %H:%M:%S"
 
+static i_mutex_t log_mutex;
+
 static void
 im_vloog(pIMCTX, int level, const char *fmt, va_list ap);
 
@@ -30,21 +25,34 @@ im_vloog(pIMCTX, int level, const char *fmt, va_list ap);
 int
 im_init_log(pIMCTX, const char* name,int level) {
   i_clear_error();
+
+  if (!log_mutex) {
+    log_mutex = i_mutex_new();
+  }
+
+  if (aIMCTX->lg_file) {
+    if (aIMCTX->own_log)
+      fclose(aIMCTX->lg_file);
+    aIMCTX->lg_file = NULL;
+  }
+  
   aIMCTX->log_level = level;
   if (level < 0) {
     aIMCTX->lg_file = NULL;
   } else {
     if (name == NULL) {
       aIMCTX->lg_file = stderr;
+      aIMCTX->own_log = 0;
     } else {
       if (NULL == (aIMCTX->lg_file = fopen(name, "w+")) ) { 
        im_push_errorf(aIMCTX, errno, "Cannot open file '%s': (%d)", name, errno);
        return 0;
       }
+      aIMCTX->own_log = 1;
+      setvbuf(aIMCTX->lg_file, NULL, _IONBF, BUFSIZ);
     }
   }
   if (aIMCTX->lg_file) {
-    setvbuf(aIMCTX->lg_file, NULL, _IONBF, BUFSIZ);
     im_log((aIMCTX, 0,"Imager - log started (level = %d)\n", level));
   }
 
@@ -93,6 +101,8 @@ im_vloog(pIMCTX, int level, const char *fmt, va_list ap) {
 
   if (!aIMCTX->lg_file || level > aIMCTX->log_level)
     return;
+
+  i_mutex_lock(log_mutex);
   
   timi = time(NULL);
   str_tm = localtime(&timi);
@@ -101,6 +111,8 @@ im_vloog(pIMCTX, int level, const char *fmt, va_list ap) {
          aIMCTX->filename, aIMCTX->line, level);
   vfprintf(aIMCTX->lg_file, fmt, ap);
   fflush(aIMCTX->lg_file);
+
+  i_mutex_unlock(log_mutex);
 }
 
 void
@@ -157,7 +169,7 @@ void i_lhead(const char *file, int line) {
  * Logging is inactive - insert dummy functions
  */
 
-int i_init_log(const char* name,int onoff) {
+int im_init_log(pIMCTX, const char* name,int onoff) {
   i_clear_error();
   i_push_error(0, "Logging disabled");
   return 0;
@@ -170,7 +182,14 @@ void
 i_loog(int level,const char *fmt, ... ) {
 }
 
+void
+im_loog(pIMCTX, int level,const char *fmt, ... ) {
+}
+
 void
 i_lhead(const char *file, int line) { }
 
+void
+im_lhead(pIMCTX, const char *file, int line) { }
+
 #endif