Changeset 533 for trunk/client/src/debug.c

Timestamp:

Jan 26, 2011, 3:31:18 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.1: degug changes, attemp to fix the trap

File:

• trunk/client/src/debug.c (modified) (3 diffs)

trunk/client/src/debug.c

@@ -32 +32 @@
 
 int debuglevel = 9; // we set it to 9, so we get all messages
-char logfile[_MAX_PATH +1]  = {0};
-char debugfile[_MAX_PATH +1] = {0};
+char logfile[_MAX_PATH +1];
+char debugfile[_MAX_PATH +1];
 char logfilename[] = "log.ndpsmb";
-BOOL do_logging = FALSE;
-BOOL firstLogLine = TRUE;
+BOOL do_logging;
+BOOL firstLogLine;
+HMTX logMutex;
+char nameMutex[] = "\\SEM32\\NDPSMB";
 
 int debuglvl(int level)
@@ -48 +50 @@
 }
 
+void debugInit()
+{
+        *logfile = '\0';
+        *debugfile = '\0';
+        do_logging = FALSE;
+        firstLogLine = TRUE;
+        logMutex = NULLHANDLE;
+        struct stat filestat;
+        APIRET rc = NO_ERROR;
+
+        // create the debugfile name
+        strncat(debugfile, getenv("ETC"), 2);
+        strncat(debugfile, "\\", sizeof(debugfile) - strlen(debugfile) -1);
+        strncat(debugfile, "ndpsmb.dbg", sizeof(debugfile) - strlen(debugfile) -1);
+
+        // is the file around? if not we have no debug
+        if (stat(debugfile, &filestat) !=0)
+           return;
+
+        //create the logfile variable
+        char *env = getenv("LOGFILES");
+        if (env != NULL)
+        {
+           strncat(logfile, env, sizeof(logfile) -1);
+           strncat(logfile, "\\", sizeof(logfile) - strlen(logfile) -1);
+           strncat(logfile, logfilename, sizeof(logfile) - strlen(logfile) -1);  
+        }
+        else
+        {
+           strncat(logfile, logfilename, sizeof(logfile) -1);
+        }
+        // set the samba logging stuff
+        do_logging = TRUE;
+
+        // now we create a sem, so that logging from different threads works
+        rc = DosCreateMutexSem(nameMutex, &logMutex, 0, FALSE);
+        if (rc == ERROR_DUPLICATE_NAME)
+        {
+        rc = DosOpenMutexSem(nameMutex, &logMutex);
+        }
+
+        return;
+}
+
+void debugDelete()
+{
+        DosCloseMutexSem(logMutex);
+        return;
+}
+
 void debuglocal(int level, const char * fmt, ...)
 {
         FILE *f=NULL;
-        struct stat filestat;
 
-        // do we have to log at all (not needed atm)
-/*      if (!debuglvl(level))
+        // do we have to log at all
+        if (!do_logging)
         {
                 return;
-        }*/
+        }
 
-        // if the file ndpsmb.dbg is around we write a logfile
-        if (!debugfile[0])
+        // if the sem is created we request it
+        if (logMutex)
         {
-           strncpy(debugfile, getenv("ETC"), 2);
-           strncat(debugfile, "\\", sizeof(debugfile) - strlen(debugfile) -1);
-           strncat(debugfile, "ndpsmb.dbg", sizeof(debugfile) - strlen(debugfile) -1);
-        } /* endif */
-        
-        if (stat(debugfile, &filestat) !=0)
-           return;
-
-        //we create the logfile variable only once
-        if (!logfile[0])
-        {
-                char *env = getenv("LOGFILES");
-                if (env != NULL)
-                {
-                   strncpy(logfile, env, sizeof(logfile) -1);
-                   strncat(logfile, "\\", sizeof(logfile) - strlen(logfile) -1);
-                   strncat(logfile, logfilename, sizeof(logfile) - strlen(logfile) -1);  
-                }
-                else
-                {
-                   strncpy(logfile, logfilename, sizeof(logfile) -1);
-                }
-                // set the samba logging stuff
-                do_logging = TRUE;
-        } /* endif */
+           DosRequestMutexSem(logMutex, (ULONG) SEM_INDEFINITE_WAIT);
+        }
 
         do
@@ -121 +149 @@
                 if (logfile)
                 {
-                        fclose(f);
+//                      fflush(f);
+                        fclose(f);
                 }
         }
         while (0);
+
+        // if the sem is created we release it
+        if (logMutex)
+        {
+           DosReleaseMutexSem(logMutex);
+        }
+
+        return;
 }