Open Source Projects Europe

--- a/src/utils/debuglog.cpp
+++ b/src/utils/log.h
@@ -1,484 +1,180 @@
-/* Copyright (C) 2006 J.F.Dockes 
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
+/* Copyright (C) 2014 J.F.Dockes
+ *	 This program is free software; you can redistribute it and/or modify
+ *	 it under the terms of the GNU General Public License as published by
+ *	 the Free Software Foundation; either version 2 of the License, or
+ *	 (at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ *	 This program is distributed in the hope that it will be useful,
+ *	 but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *	 GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *	 You should have received a copy of the GNU General Public License
+ *	 along with this program; if not, write to the
+ *	 Free Software Foundation, Inc.,
+ *	 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-#ifndef TEST_DEBUGLOG
+#ifndef _LOG_H_X_INCLUDED_
+#define _LOG_H_X_INCLUDED_
 
-#define __USE_GNU
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <safefcntl.h> // in case O_APPEND is in there
-#ifdef INCLUDE_NEW_H
-#include <new.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
+#include <fstream> 
+#include <iostream>
 #include <string>
-#include <set>
-using std::set;
-using std::string;
+#include <mutex>
 
-#include "debuglog.h"
-#include "pathut.h"
-#include "smallut.h"
-#include "ptmutex.h"
-
-#ifndef freeZ 
-#define freeZ(X) {if (X) {free(X);X=0;}}
+#ifndef LOGGER_THREADSAFE
+#define LOGGER_THREADSAFE 1
 #endif
 
-using namespace std;
-namespace DebugLog {
+#if LOGGER_THREADSAFE
+#include <mutex>
+#endif
 
-bool DebugLog::isspecialname(const char *logname) 
-{
-    return !strcmp(logname, "stdout") || !strcmp(logname, "stderr");
-}
+// Can't use the symbolic Logger::LLXX names in preproc. 6 is LLDEB1
+#ifndef LOGGER_STATICVERBOSITY
+#define LOGGER_STATICVERBOSITY 5
+#endif
 
-class DebugLogWriter {
-  public:
-    virtual ~DebugLogWriter() {}
-    virtual int put(const char *s) = 0;
+class Logger {
+public:
+    /** Initialize logging to file name. Use "stderr" for stderr
+       output. Creates the singleton logger object */
+    static Logger *getTheLog(const std::string& fn);
+
+    bool reopen(const std::string& fn);
+    
+    std::ostream& getstream() {
+        return m_tocerr ? std::cerr : m_stream;
+    }
+    enum LogLevel {LLNON=0, LLFAT=1, LLERR=2, LLINF=3, LLDEB=4,
+                   LLDEB0=5, LLDEB1=6, LLDEB2=7};
+    void setLogLevel(LogLevel level) {
+        m_loglevel = level;
+    }
+    int getloglevel() {
+        return m_loglevel;
+    }
+
+#if LOGGER_THREADSAFE
+    std::mutex& getmutex() {
+        return m_mutex;
+    }
+#endif
+    
+private:
+    bool m_tocerr;
+    int m_loglevel;
+    std::string m_fn;
+    std::ofstream m_stream;
+#if LOGGER_THREADSAFE
+    std::mutex m_mutex;
+#endif
+
+    Logger(const std::string& fn);
+    Logger(const Logger &);
+    Logger& operator=(const Logger &);
 };
 
-class DLFWImpl {
-    char *filename;
-    FILE *fp;
-    int truncate;
- public:
-    // Open output file if needed, return 0 if ok
-    void maybeopenfp() {
-	if (fp)
-	    return;
-	if (filename == 0)
-	    return;
-	if (!strcmp(filename, "stdout")) {
-	    fp = stdout;
-	} else if (!strcmp(filename, "stderr")) {
-	    fp = stderr;
-	} else {
-	    fp = fopen(filename, (truncate) ? "w" : "a");
-	    if (fp) {
-		setvbuf(fp, 0, _IOLBF, BUFSIZ);
-#if defined(O_APPEND) && !defined(_WIN32)
-		{
-		    int flgs = 0;
-		    fcntl(fileno(fp), F_GETFL, &flgs);
-		    fcntl(fileno(fp), F_SETFL, flgs|O_APPEND);
-		}
-#endif
-	    } else {
-                fprintf(stderr, "Debuglog: could not open [%s] errno %d\n",
-                        filename, errno);
-            }
-	}
-	return;
-    }
+#define LOGGER_PRT (Logger::getTheLog("")->getstream())
 
-    void maybeclosefp() { 
-#ifdef DEBUGDEBUG
-	fprintf(stderr, "DebugLogImpl::maybeclosefp: filename %p, fp %p\n",
-		filename, fp);
-#endif
-	// Close current file if open, and not stdout/stderr
-	if (fp && (filename == 0 || 
-		   (strcmp(filename, "stdout") && 
-		    strcmp(filename, "stderr")))) {
-	    fclose(fp);
-	}
-	fp = 0; 
-	freeZ(filename);
-    }
-
- public:
-
-    DLFWImpl() 
-	: filename(0), fp(0), truncate(1) 
-    {
-	setfilename("stderr", 0);
-    }
-    ~DLFWImpl() { 
-	maybeclosefp();
-    }
-    int setfilename(const char *fn, int trnc) {
-	maybeclosefp();
-	filename = strdup(fn);
-	truncate = trnc;
-	maybeopenfp();
-	return 0;
-    }
-    const char *getfilename() {
-	return filename;
-    }
-    int put(const char *s) {
-	maybeopenfp();
-	if (fp)
-	    return fputs(s, fp);
-	return -1;
-    }
-};
-
-class DebugLogFileWriter : public DebugLogWriter {
-    DLFWImpl *impl;
-    PTMutexInit loglock;
-  public:
-    DebugLogFileWriter()
-    {
-	impl = new DLFWImpl;
-    }
-
-    virtual ~DebugLogFileWriter() 
-    { 
-	delete impl;
-    }
-
-    virtual int setfilename(const char *fn, int trnc) 
-    {
-	PTMutexLocker lock(loglock);
-	return impl ? impl->setfilename(fn, trnc) : -1;
-    }
-    virtual const char *getfilename() 
-    {
-	PTMutexLocker lock(loglock);
-	return impl ? impl->getfilename() : 0;
-    }
-    virtual int reopen()
-    {
-	PTMutexLocker lock(loglock);
-	if (!impl)
-	    return -1;
-	string fn = impl->getfilename();
-	return impl->setfilename(fn.c_str(), 1);
-    }
-    virtual int put(const char *s) 
-    {
-	PTMutexLocker lock(loglock);
-	return impl ? impl->put(s) : -1;
-    };
-};
-
-
-static set<string> yesfiles;
-static void initfiles()
-{
-    const char *cp = getenv("DEBUGLOG_FILES");
-    if (!cp)
-	return;
-    vector<string> files;
-    stringToTokens(cp, files, ",");
-    yesfiles.insert(files.begin(), files.end());
-}
-static bool fileInFiles(const string& file)
-{
-    string sf = path_getsimple(file);
-    if (yesfiles.find(sf) != yesfiles.end()) {
-	//fprintf(stderr, "Debug ON: %s \n", file.c_str());
-	return true;
-    }
-    //fprintf(stderr, "Debug OFF: %s \n", file.c_str());
-    return false;
-}
-
-#ifdef _WIN32
-#include <windows.h>
-static void datestring(char *d, int sz) {
-    SYSTEMTIME buf;
-    GetLocalTime(&buf);
-    int year = buf.wYear % 100;
-
-    snprintf(d, sz, "%02d%02d%02d%02d%02d%02d", year, int(buf.wMonth),
-	    int(buf.wDay), int(buf.wHour), int(buf.wMinute), int(buf.wSecond));
-}
-#define vsnprintf _vsnprintf
-
-#else // !WINDOWS ->
-
-#include <time.h>
-static void datestring(char *d, int sz)
-{
-    struct tm *tmp;
-    time_t tim = time((time_t*)0);
-    tmp = localtime(&tim);
-    int year = tmp->tm_year % 100;
-    snprintf(d, sz, "%02d%02d%02d%02d%02d%02d", year, tmp->tm_mon+1,
-	    tmp->tm_mday, tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
-}
-
-#endif // !WINDOWS
-
-void 
-DebugLog::prolog(int lev, const char *f, int line) 
-{
-    if (!writer)
-	return;
-    if (!yesfiles.empty() && !fileInFiles(f)) {
-	fileyes = false;
-	return;
-    } else {
-	fileyes = true;
-    }
-    if (dodate) {
-	char dts[100];
-	datestring(dts, 100);
-	writer->put(dts);
-    }
-    char buf[100];
-    sprintf(buf, ":%d:", lev);
-    writer->put(buf);
-#if DEBUGLOG_SHOW_PID
-    sprintf(buf, "%d:", getpid());
-    writer->put(buf);
-#endif
-#if DEBUGLOG_SHOW_THREAD
-    sprintf(buf, "%lx:", (unsigned long)pthread_self());
-    writer->put(buf);
-#endif
-    writer->put(f);
-    sprintf(buf, ":%d:", line);
-    writer->put(buf);
-}
-
-void 
-DebugLog::log(const char *s ...)
-{
-    if (!writer || !fileyes)
-	return;
-    va_list ap;
-    va_start(ap,s);
-
-#ifdef HAVE_VASPRINTF_nono // not sure vasprintf is really such a great idea
-    char *buf;
-    vasprintf(&buf, s, ap);
-    if (buf) {
+#if LOGGER_THREADSAFE
+#define LOGGER_LOCK \
+    std::unique_lock<std::mutex> lock(Logger::getTheLog("")->getmutex())
 #else
-    char buf[4096];
-    // It's possible that they also wouldn't have vsnprintf but what then ?
-    vsnprintf(buf, 4096, s, ap);
-    {
-#endif
-	writer->put(buf);
-    }
-
-#ifdef HAVE_VASPRINTF_nono
-    if (buf)
-	free(buf);
-#endif
-}
-
-void 
-DebugLog::setloglevel(int lev)
-{
-    debuglevel = lev;
-    while (!levels.empty())
-	levels.pop();
-    pushlevel(lev);
-}
-
-void DebugLog::pushlevel(int lev)
-{
-    debuglevel = lev;
-    levels.push(lev);
-}
-
-void DebugLog::poplevel()
-{
-    if (levels.empty()) 
-	debuglevel = 0;
-    if (levels.size() > 1)
-	levels.pop();
-    debuglevel =  levels.top();
-}
-
-
-////////////////////////////////////////////////////////////
-// Global functions
-//////////////////////////////////////
-static DebugLogFileWriter lwriter;
-static DebugLogFileWriter *theWriter = &lwriter;
-
-const char *getfilename() 
-{
-    return theWriter ? theWriter->getfilename() : 0;
-}
-
-int setfilename(const char *fname, int trnc)
-{
-    return theWriter ? theWriter->setfilename(fname, trnc) : -1;
-}
-
-int reopen()
-{
-    return theWriter ? theWriter->reopen() : -1;
-
-}
-
-#if DEBUGLOG_USE_THREADS
-#include <pthread.h>
-static pthread_key_t dbl_key;
-static pthread_once_t key_once = PTHREAD_ONCE_INIT;
-
-static void thrdatadel(void *data)
-{
-    //    fprintf(stderr, "DebugLog:: thrdatadel: %p\n", data);
-    DebugLog *dbl = (DebugLog *)data;
-    delete dbl;
-    pthread_setspecific(dbl_key, 0);
-}
-static void once_routine(void)
-{
-    int status;
-    status = pthread_key_create(&dbl_key, thrdatadel);
-    if (status != 0) {
-	fprintf(stderr, "debuglog: cant initialize pthread "
-		"thread private storage key\n");
-	abort();
-    }
-}
-
-DebugLog *getdbl() 
-{
-    int status = pthread_once(&key_once, once_routine);
-    if (status != 0) {
-	fprintf(stderr, "debuglog: cant initialize pthread "
-		"thread private storage key (pthread_once)\n");
-	abort();
-    }
-    DebugLog *dbl;
-    if (!(dbl = (DebugLog *)pthread_getspecific(dbl_key))) {
-	if ((dbl = new DebugLog) == 0) {
-	    fprintf(stderr, "debuglog: new DebugLog returned 0! ");
-	    abort();
-	}
-
-	dbl->setwriter(theWriter);
-	initfiles();
-	status = pthread_setspecific(dbl_key, dbl);
-	if (status) {
-	    fprintf(stderr, "debuglog: cant initialize pthread "
-		    "thread private storage key (pthread_setspecific)\n");
-	    abort();
-	}
-    }
-    return dbl;
-}
-
-#else // No threads ->
-
-static DebugLog *dbl;
-DebugLog *getdbl() 
-{
-    if (!dbl) {
-	dbl = new DebugLog;
-	dbl->setwriter(theWriter);
-	initfiles();
-    }
-    return dbl;
-}
+#define LOGGER_LOCK
 #endif
 
-}
-
-////////////////////////////////////////// TEST DRIVER //////////////////
-#else /* TEST_DEBUGLOG */
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _WIN32
-#include <windows.h>
-static inline unsigned int sleep(unsigned int s) {Sleep(s * 1000); return 0;}
-#else
-#include <unistd.h>
-#endif
-#include <string.h>
-
-#include "debuglog.h"
-
-#if DEBUGLOG_USE_THREADS
-//#define TEST_THREADS
+#ifndef LOGGER_LOCAL_LOGINC
+#define LOGGER_LOCAL_LOGINC 0
 #endif
 
-#ifdef TEST_THREADS 
-#include <pthread.h>
+#define LOGGER_LEVEL (Logger::getTheLog("")->getloglevel() + \
+                      LOGGER_LOCAL_LOGINC)
+
+#define LOGGER_DOLOG(L,X) LOGGER_PRT << ":" << L << ":" <<            \
+                                  __FILE__ << ":" << __LINE__ << "::" << X
+
+#if LOGGER_STATICVERBOSITY >= 7
+#define LOGDEB2(X) {                                                    \
+        if (LOGGER_LEVEL >= Logger::LLDEB2) {                           \
+            LOGGER_LOCK;                                                \
+            LOGGER_DOLOG(Logger::LLDEB2, X);                            \
+        }                                                               \
+    }
+#else
+#define LOGDEB2(X)
 #endif
 
-const int iloop = 5;
-void *thread_test(void *data)
-{
-    const char *s = (const char *)data;
-    int lev = atoi(s);
-    DebugLog::getdbl()->setloglevel(DEBDEB);
-    for (int i = 1; i < iloop;i++) {
-	switch (lev) {
-	case 1:	LOGFATAL(("Thread: %s count: %d\n", s, i));break;
-	case 2:	LOGERR(("Thread: %s count: %d\n", s, i));break;
-	default:
-	case 3:	LOGINFO(("Thread: %s count: %d\n", s, i));break;
-	}
-	sleep(1);
+#if LOGGER_STATICVERBOSITY >= 6
+#define LOGDEB1(X) {                                                    \
+        if (LOGGER_LEVEL >= Logger::LLDEB1) {                           \
+            LOGGER_LOCK;                                                \
+            LOGGER_DOLOG(Logger::LLDEB1, X);                            \
+        }                                                               \
     }
-    return 0;
-}
+#else
+#define LOGDEB1(X)
+#endif
 
+#if LOGGER_STATICVERBOSITY >= 5
+#define LOGDEB0(X) {                                                    \
+        if (LOGGER_LEVEL >= Logger::LLDEB0) {                           \
+            LOGGER_LOCK;                                                \
+            LOGGER_DOLOG(Logger::LLDEB0, X);                            \
+        }                                                               \
+    }
+#else
+#define LOGDEB0(X)
+#endif
 
-int
-main(int argc, char **argv)
-{
-#ifdef TEST_THREADS
-    pthread_t t1, t2, t3;
+#if LOGGER_STATICVERBOSITY >= 4
+#define LOGDEB(X) {                                                     \
+        if (LOGGER_LEVEL >= Logger::LLDEB) {                            \
+            LOGGER_LOCK;                                                \
+            LOGGER_DOLOG(Logger::LLDEB, X);                             \
+        }                                                               \
+    }
+#else
+#define LOGDEB(X)
+#endif
 
-    char name1[20];
-    strcpy(name1, "1");
-    pthread_create(&t1, 0, thread_test, name1);
+#if LOGGER_STATICVERBOSITY >= 3
+#define LOGINF(X) {                                                     \
+        if (LOGGER_LEVEL >= Logger::LLINF) {                            \
+            LOGGER_LOCK;                                                \
+            LOGGER_DOLOG(Logger::LLINF, X);                             \
+        }                                                               \
+    }
+#else
+#define LOGINF(X)
+#endif
+#define LOGINFO LOGINF
 
-    char name2[20];
-    strcpy(name2, "2");
-    pthread_create(&t2, 0, thread_test, name2);
+#if LOGGER_STATICVERBOSITY >= 2
+#define LOGERR(X) {                                                     \
+        if (LOGGER_LEVEL >= Logger::LLERR) {                            \
+            LOGGER_LOCK;                                                \
+            LOGGER_DOLOG(Logger::LLERR, X);                             \
+        }                                                               \
+    }
+#else
+#define LOGERR(X)
+#endif
 
-    char name3[20];
-    strcpy(name3, "3");
-    pthread_create(&t3, 0, thread_test, name3);
+#if LOGGER_STATICVERBOSITY >= 1
+#define LOGFAT(X) {                                                     \
+        if (LOGGER_LEVEL >= Logger::LLFAT) {                            \
+            LOGGER_LOCK;                                                \
+            LOGGER_DOLOG(Logger::LLFAT, X);                             \
+        }                                                               \
+    }
+#else
+#define LOGFAT(X)
+#endif
+#define LOGFATAL LOGFAT
 
-    DebugLog::getdbl()->setloglevel(DEBDEB);
-    for (int i = 1; i < iloop;i++) {
-	LOGINFO(("LOGGING FROM MAIN\n"));
-	sleep(1);
-    }
-    sleep(2);
-    exit(0);
-#else
-    LOGFATAL(("FATAL\n","Val"));
-    DebugLog::getdbl()->logdate(1);
-    LOGERR(("ERR\n","Val"));
-    LOGINFO(("INFO\n","Val"));
-    LOGDEB0(("DEBUG %s\n","valeur"));
-
-    int lev;
-    printf("Testing push. Initial level: %d\n", DebugLog::getdbl()->getlevel());
-    for (lev = 0; lev < 4;lev++) {
-	DebugLog::getdbl()->pushlevel(lev);
-	printf("Lev now %d\n", DebugLog::getdbl()->getlevel());
-    }
-    printf("Testing pop\n");
-    for (lev = 0; lev < 7;lev++) {
-	DebugLog::getdbl()->poplevel();
-	printf("Lev now %d\n", DebugLog::getdbl()->getlevel());
-    }
-#endif
-}
-
-
-#endif /* TEST_DEBUGLOG */
+#endif /* _LOG_H_X_INCLUDED_ */

--- a/src/utils/debuglog.h
+++ b/src/utils/log.cpp
@@ -1,112 +1,65 @@
-/*
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
+/* Copyright (C) 2014 J.F.Dockes
+ *	 This program is free software; you can redistribute it and/or modify
+ *	 it under the terms of the GNU General Public License as published by
+ *	 the Free Software Foundation; either version 2 of the License, or
+ *	 (at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ *	 This program is distributed in the hope that it will be useful,
+ *	 but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *	 GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *	 You should have received a copy of the GNU General Public License
+ *	 along with this program; if not, write to the
+ *	 Free Software Foundation, Inc.,
+ *	 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-#ifndef _DEBUGLOG_H_
-#define _DEBUGLOG_H_
-/* Macros for log and debug messages */
-#include <stack>
 
-namespace DebugLog {
+#include "log.h"
 
-#ifndef DEBUGLOG_USE_THREADS
-#define DEBUGLOG_USE_THREADS 1
+#include <errno.h>
+#include <fstream>
+
+using namespace std;
+
+Logger::Logger(const std::string& fn)
+    : m_tocerr(false), m_loglevel(LLDEB), m_fn(fn)
+{
+    reopen(fn);
+}
+
+bool Logger::reopen(const std::string& fn)
+{
+#if LOGGER_THREADSAFE
+    std::unique_lock<std::mutex> lock(m_mutex);
 #endif
+    if (!fn.empty()) {
+        m_fn = fn;
+    }
+    if (!m_tocerr && m_stream.is_open()) {
+        m_stream.close();
+    }
+    if (!m_fn.empty() && m_fn.compare("stderr")) {
+        m_stream.open(m_fn, std::fstream::out | std::ofstream::trunc);
+        if (!m_stream.is_open()) {
+            cerr << "Logger::Logger: log open failed: for [" <<
+                 fn << "] errno " << errno << endl;
+            m_tocerr = true;
+        } else {
+            m_tocerr = false;
+        }
+    } else {
+        m_tocerr = true;
+    }
+    return true;
+}
 
-#define DEBFATAL 1
-#define DEBERR   2
-#define DEBINFO  3
-#define DEBDEB   4
-#define DEBDEB0  5
-#define DEBDEB1  6
-#define DEBDEB2  7
-#define DEBDEB3  8
+static Logger *theLog;
 
-#ifndef STATICVERBOSITY
-#define STATICVERBOSITY DEBDEB0
-#endif
+Logger *Logger::getTheLog(const string& fn)
+{
+    if (theLog == 0)
+        theLog = new Logger(fn);
+    return theLog;
+}
 
-class DebugLogWriter;
-
-class DebugLog {
-    std::stack<int> levels;
-    int debuglevel;
-    int dodate;
-    DebugLogWriter *writer;
-    bool  fileyes;
-  public:
-    DebugLog() : debuglevel(10), dodate(0), writer(0), fileyes(true) {}
-    DebugLog(DebugLogWriter *w) : debuglevel(-1), dodate(0), writer(w),
-				  fileyes(true) {}
-    virtual ~DebugLog() {}
-    virtual void setwriter(DebugLogWriter *w) {writer = w;}
-    virtual DebugLogWriter *getwriter() {return writer;}
-    virtual void prolog(int lev, const char *srcfname, int line);
-    virtual void log(const char *s ...);
-    virtual void setloglevel(int lev);
-    inline int getlevel() {return debuglevel;}
-    virtual void pushlevel(int lev);
-    virtual void poplevel();
-    virtual void logdate(int onoff) {dodate = onoff;}
-    static bool isspecialname(const char *logname);
-};
-
-extern DebugLog *getdbl();
-extern const char *getfilename();
-extern int setfilename(const char *fname, int trnc = 1);
-extern int reopen();
-
-#if STATICVERBOSITY >= DEBFATAL
-#define LOGFATAL(X) {if (DebugLog::getdbl()->getlevel()>=DEBFATAL){DebugLog::getdbl()->prolog(DEBFATAL,__FILE__,__LINE__) ;DebugLog::getdbl()->log X;}}
-#else
-#define LOGFATAL(X)
-#endif
-#if STATICVERBOSITY >= DEBERR
-#define LOGERR(X) {if (DebugLog::getdbl()->getlevel()>=DEBERR){DebugLog::getdbl()->prolog(DEBERR,__FILE__,__LINE__) ;DebugLog::getdbl()->log X;}}
-#else
-#define LOGERR(X)
-#endif
-#if STATICVERBOSITY >= DEBINFO
-#define LOGINFO(X) {if (DebugLog::getdbl()->getlevel()>=DEBINFO){DebugLog::getdbl()->prolog(DEBINFO,__FILE__,__LINE__) ;DebugLog::getdbl()->log X;}}
-#else
-#define LOGINFO(X)
-#endif
-#if STATICVERBOSITY >= DEBDEB
-#define LOGDEB(X) {if (DebugLog::getdbl()->getlevel()>=DEBDEB){DebugLog::getdbl()->prolog(DEBDEB,__FILE__,__LINE__) ;DebugLog::getdbl()->log X;}}
-#else
-#define LOGDEB(X)
-#endif
-#if STATICVERBOSITY >= DEBDEB0
-#define LOGDEB0(X) {if (DebugLog::getdbl()->getlevel()>=DEBDEB0){DebugLog::getdbl()->prolog(DEBDEB0,__FILE__,__LINE__) ;DebugLog::getdbl()->log X;}}
-#else
-#define LOGDEB0(X)
-#endif
-#if STATICVERBOSITY >= DEBDEB1
-#define LOGDEB1(X) {if (DebugLog::getdbl()->getlevel()>=DEBDEB1){DebugLog::getdbl()->prolog(DEBDEB1,__FILE__,__LINE__) ;DebugLog::getdbl()->log X;}}
-#else
-#define LOGDEB1(X)
-#endif
-#if STATICVERBOSITY >= DEBDEB2
-#define LOGDEB2(X) {if (DebugLog::getdbl()->getlevel()>=DEBDEB2){DebugLog::getdbl()->prolog(DEBDEB2,__FILE__,__LINE__) ;DebugLog::getdbl()->log X;}}
-#else
-#define LOGDEB2(X)
-#endif
-#if STATICVERBOSITY >= DEBDEB3
-#define LOGDEB3(X) {if (DebugLog::getdbl()->getlevel()>=DEBDEB3){DebugLog::getdbl()->prolog(DEBDEB3,__FILE__,__LINE__) ;DebugLog::getdbl()->log X;}}
-#else
-#define LOGDEB3(X)
-#endif
-}
-#endif /* _DEBUGLOG_H_ */