* Rewrote vCtdlLogPrintf() to NOT use any buffers at all, only v*printf() type functi...

[citadel.git] / citadel / sysdep.c

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index deb7f91826729ffa3c38790c1753a5f048f92d23..9dce3a3ae0a94c973a897e31407417fcdb1a8c53 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -93,7 +93,7 @@ int verbosity = DEFAULT_VERBOSITY;            /* Logging level */
 
 int syslog_facility = LOG_DAEMON;
 int enable_syslog = 0;
-
+int print_to_logfile = 1;
 
 /*
  * CtdlLogPrintf()  ...   Write logging information
@@ -113,69 +113,54 @@ void vCtdlLogPrintf(enum LogLevel loglevel, const char *format, va_list arg_ptr)
        }
 
        /* stderr output code */
-       if (enable_syslog || running_as_daemon) return;
+       if (enable_syslog || !print_to_logfile) return;
 
        /* if we run in forground and syslog is disabled, log to terminal */
        if (loglevel <= verbosity) { 
                struct timeval tv;
                struct tm tim;
                time_t unixtime;
-               StrBuf *lBuf;
                CitContext *CCC = CC;
-               
+               ThreadTSD *cTSD = CTP;
+               CtdlThreadNode *node = NULL;
+               long lwpid = 0;
+
+               if (cTSD != NULL) {
+                       node = cTSD->self;
+               }
+
+               if ((node != NULL) && (node->reltid != 0)) {
+                       lwpid = node->reltid;
+               }
+
                gettimeofday(&tv, NULL);
+
                /* Promote to time_t; types differ on some OSes (like darwin) */
                unixtime = tv.tv_sec;
                localtime_r(&unixtime, &tim);
 
-               if (CCC != NULL)
-                       lBuf = CCC->lBuf;
-               else 
-                       lBuf = NewStrBuf();
-               if (lBuf == NULL) {
-                       char buf[SIZ], buf2[SIZ];
-                       
-                       if ((CCC != NULL) && (CCC->cs_pid != 0)) {
-                               sprintf(buf,
-                                       "%04d/%02d/%02d %2d:%02d:%02d.%06ld xx [%3d] ",
-                                       tim.tm_year + 1900, tim.tm_mon + 1,
-                                       tim.tm_mday, tim.tm_hour, tim.tm_min,
-                                       tim.tm_sec, (long)tv.tv_usec,
-                                       CCC->cs_pid);
-                       } else {
-                               sprintf(buf,
-                                       "%04d/%02d/%02d %2d:%02d:%02d.%06ld xx ",
-                                       tim.tm_year + 1900, tim.tm_mon + 1,
-                                       tim.tm_mday, tim.tm_hour, tim.tm_min,
-                                       tim.tm_sec, (long)tv.tv_usec);
-                       }
-                       vsnprintf(buf2, SIZ, format, arg_ptr);   
+               fprintf(stderr,
+                       "%04d/%02d/%02d %2d:%02d:%02d.%06ld ",
+                       tim.tm_year + 1900, tim.tm_mon + 1,
+                       tim.tm_mday, tim.tm_hour, tim.tm_min,
+                       tim.tm_sec, (long)tv.tv_usec
+               );
 
-                       fprintf(stderr, "%s%s", buf, buf2);
+               if (lwpid != 0) {
+                       fprintf(stderr, "[LWP:%ld] ", lwpid);
                }
-               else {
-                       StrBufPrintf(lBuf,
-                                    "%04d/%02d/%02d %2d:%02d:%02d.%06ld ",
-                                    tim.tm_year + 1900, tim.tm_mon + 1,
-                                    tim.tm_mday, tim.tm_hour, tim.tm_min,
-                                    tim.tm_sec, (long)tv.tv_usec);
-                               
-                       if (CCC != NULL) {
-                               if (CCC->cs_pid != 0)
-                                       StrBufAppendPrintf(lBuf,
-                                                          "[%3d] ",
-                                                          CCC->cs_pid);
-                               else if (CCC->user.usernum != 0)
-                                       StrBufAppendPrintf(lBuf,
-                                                          "[:%d] ",
-                                                          CCC->user.usernum);
+                       
+               if (CCC != NULL) {
+                       if (CCC->cs_pid != 0) {
+                               fprintf(stderr, "[%3d] ", CCC->cs_pid);
+                       }
+                       else if (CCC->user.usernum != 0) {
+                               fprintf(stderr, "[:%ld] ", CCC->user.usernum);
                        }
-                       StrBufVAppendPrintf(lBuf, format, arg_ptr);   
-                       fwrite(ChrPtr(lBuf), 1, StrLength(lBuf), stderr);
                }
-               fflush(stderr);
-               if (CCC == NULL) FreeStrBuf(&lBuf);
 
+               vfprintf(stderr, format, arg_ptr);   
+               fflush(stderr);
        }
 }   
 
@@ -1346,6 +1331,10 @@ void *select_on_master (void *arg)
        int m;
        int i;
        int retval;
+       struct CitContext select_on_master_CC;
+
+       CtdlFillSystemContext(&select_on_master_CC, "select_on_master");
+       citthread_setspecific(MyConKey, (void *)&select_on_master_CC);
 
        while (!CtdlThreadCheckStop()) {
                /* Initialize the fdset. */
@@ -1449,6 +1438,8 @@ void *select_on_master (void *arg)
                        }
                }
        }
+       CtdlClearSystemContext();
+
        return NULL;
 }