Whamcloud - gitweb
use special macro for print time_t, cleanup in includes.
[fs/lustre-release.git] / lnet / libcfs / debug.c
index 09db54e..4b275e6 100644 (file)
 # define EXPORT_SYMTAB
 #endif
 
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kmod.h>
-#include <linux/notifier.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/stat.h>
-#include <linux/errno.h>
-#include <linux/smp_lock.h>
-#include <linux/unistd.h>
-#include <linux/interrupt.h>
-#include <asm/system.h>
-#include <asm/uaccess.h>
-#include <linux/completion.h>
-
-#include <linux/fs.h>
-#include <linux/stat.h>
-#include <asm/uaccess.h>
-#include <asm/segment.h>
-#include <linux/miscdevice.h>
-
-# define DEBUG_SUBSYSTEM S_PORTALS
-
-#include <linux/kp30.h>
-#include <linux/portals_compat25.h>
-
-#define DEBUG_OVERFLOW 1024
-static char *debug_buf = NULL;
-static unsigned long debug_size = 0;
-static atomic_t debug_off_a = ATOMIC_INIT(0);
-static int debug_wrapped;
-wait_queue_head_t debug_ctlwq;
-#define DAEMON_SND_SIZE      (64 << 10)
-
-/*
- * used by the daemon to keep track the offset into debug_buffer for the next
- * write to the file.  Usually, the daemon is to write out buffer
- * from debug_daemon_next_write upto debug_off
- *  variable usage
- *      Reader - portals_debug_msg()
- *      Writer - portals_debug_daemon()
- *               portals_debug_daemon_start() during daemon init time
- *               portals_debug_daemon_continue() to reset to debug_off
- *               portals_debug_clear_buffer() reset to debug_off for clear
- *      Note that *_start(), *_continue() & *clear_buffer() should serialized;
- */
-static atomic_t   debug_daemon_next_write;
-
-/*
- * A debug_daemon can be in following states
- *      stopped - stopped state means there is no debug_daemon running.
- *                accordingly, it must be in paused state
- *                a daemon is in !stopped && !paused state after
- *                "lctl debug_daemon start" creates debug_daemon successfully
- *                Variable Usage
- *                      Reader - portals_debug_daemon()
- *                               portals_debug_set_daemon() routines
- *                      Writer - portals_debug_set_daemon() routines
- *                              portals_debug_daemon() on IO error
- *      paused -  a debug_daemon state is changed from !paused into paused
- *                when "lctl debug_daemon paused" is issued
- *                "lctl debug_daemon continue" gets a daemon into !paused mode
- *                      Reader - portals_debug_set_daemon() routines
- *                               portals_debug_msg()
- *                      Writer - portals_debug_set_daemon() on init
- *                               portals_debug_daemon()
- *
- *        Daemon  state diagram.
- *                      (stopped, paused)
- *                              |  <-- debug_daemon start
- *                              V
- *                      (!stopped, !paused)
- *                              |  <-- debug_daemon pause
- *                              V
- *                      (!stopped, paused)
- *                              |  <-- debug_daemon continue
- *                              V
- *                      (!stopped, !paused)
- *                              |  <-- debug_daemon stop
- *                              V
- *                      (stopped, paused)
- *      Overlapped - this is a state when CDEBUG is too fast for the daemon to
- *                   write out the debug_bufferr.  That is, debug_off is to
- *                   overlap debug_daemon_next_write;
- *                     Reader - portals_debug_msg()
- *                     Writer - portals_debug_msg()
- */
+# define DEBUG_SUBSYSTEM S_LNET
 
-/*
- * Description on Trace Daemon Synchronization
- *
- * Three categories of code are synchronizing between each other
- * 1.   lctl, portals_debug_set_daemon(), the user debug control code, 
- *      as well as portals_debug_clear_buffer()
- * 2.   CDEBUG, portals_debug_msg(), the debug put messages routine
- * 3.   Daemon, portals_debug_daemon(), to write out debug log file
- *
- *
- * Three different controls for synchronizations
- *
- * 1.   debug_daemon_semaphore
- *      The usage of this semaphore is to serialize multiple lctl controls 
- *      in manipulating debug daemon state.  The semaphore serves as the 
- *      gatekeeper to allow only one user control thread, at any giving time, 
- *      to access debug daemon state and keeps the other user control requests 
- *      in wait state until the current control request is serviced.
- *
- * 2.   wait_queue_head_t lctl (paired with lctl_event flag)
- *      Lctl event is the event between portals_debug_set_daemon() and 
- *      portals_debug_daemon().  Lctl is an indicator for portals_debug_daemon()
- *      to flush data out to file.  portals_debug_daemon() is to use lctl event
- *      as signal channel to wakeup portals_debug_set_daemon() upon flush 
- *      operation is done.
- *
- *      Producer :
- *              portals_debug_daemon() uses to wake up 
- *              portals_debug_set_daemon(), pause and stop, routines
- *      Consumer :
- *              portals_debug_set_daemon(), stop and pause operations, 
- *              wait and sleep on the event
- *
- * 3.   wait_queue_head_t daemon (paired with daemon_event flag)
- *      This is an event channel to wakeup portals_debug_daemon.  Daemon 
- *      wakes up to run whenever there is an event posted.   Daemon handles 
- *      2 types of operations . 1. Writes data out to debug file, 2. Flushes 
- *      file and terminates base on lctl event. 
- *      File operation -
- *              Daemon is normally in a sleep state.  
- *              Daemon is woken up through daemon event whenever CDEBUG is 
- *              putting data over any 64K boundary. 
- *      File flush and termination -
- *              On portals_debug_daemon_stop/pause() operations, lctl control 
- *              is to wake up daemon through daemon event.
- *
- *      We can't use sleep_on() and wake_up() to replace daemon event because 
- *      portals_debug_daemon() must catch the wakeup operation posted by 
- *      portals_debug_daemon_stop/pause().  Otherwise, stop and pause may 
- *      stuck in lctl wait event.
- *
- *      Producer :
- *           a. portals_debug_daemon_pause() and portals_debug_daemon_stop() 
- *              uses the event to wake up portals_debug_daemon()
- *           b. portals_debug_msg() uses the event to wake up 
- *              portals_debug_daemon() whenever the data output is acrossing 
- *              a 64K bytes boundary.
- *      Consumer :
- *              portals_debug_daemon() wakes up upon daemon event.
- *
- * Sequence for portals_debug_daemon_stop() operation
- *
- * _Portals_debug_daemon_stop()_          _Daemon_
- *                                      Wait_event(daemon) or running
- *      Paused = 1;
- *      Wakeup_event (daemon)
- *      Wait_event(lctl)
- *                                      Set force_flush flag if lctlevnt
- *                                      Flush data
- *                                      Wakeup_event (lctl)
- *                                      Wait_event(daemon)
- *      Stopped = 1;
- *      Wakeup_event (daemon)
- *      Wait_event(lctl)
- *                                      Exit daemon loop if (Stopped)
- *                                      Wakeup_event (lctl)
- *                                      Exit
- *      Return to user application
- *
- *
- * _Portals_debug_msg()_                  _Daemon_
- *                                      Wait_event(daemon) or running
- *      If (WriteStart<64K<WriteEnd)
- *         Wakeup_event(daemon)
- *                                      Do file IO
- *                                      Wait_event(daemon)
- */
-struct debug_daemon_state {
-        unsigned long overlapped;
-        unsigned long stopped;
-        atomic_t paused;
-        unsigned long   lctl_event;     /* event for lctl */
-        wait_queue_head_t lctl;
-        unsigned long   daemon_event;   /* event for daemon */
-        wait_queue_head_t daemon;
-};
-static struct debug_daemon_state debug_daemon_state;
-static DECLARE_MUTEX(debug_daemon_semaphore);
-
-static loff_t daemon_file_size_limit;
-char debug_daemon_file_path[1024] = "";
-
-spinlock_t portals_debug_lock = SPIN_LOCK_UNLOCKED;
+#include <stdarg.h>
+#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
+#include "tracefile.h"
+
+static char debug_file_name[1024];
+
+#ifdef __KERNEL__
+unsigned int libcfs_subsystem_debug = ~0;
+CFS_MODULE_PARM(libcfs_subsystem_debug, "i", int, 0644,
+                "Lustre kernel debug subsystem mask");
+EXPORT_SYMBOL(libcfs_subsystem_debug);
+
+unsigned int libcfs_debug = (D_EMERG | D_ERROR | D_WARNING | D_CONSOLE |
+                             D_NETERROR | D_HA | D_CONFIG | D_IOCTL);
+CFS_MODULE_PARM(libcfs_debug, "i", int, 0644,
+                "Lustre kernel debug mask");
+EXPORT_SYMBOL(libcfs_debug);
+
+int libcfs_debug_mb = -1;
+CFS_MODULE_PARM(libcfs_debug_mb, "i", int, 0644,
+                "Total debug buffer size.");
+EXPORT_SYMBOL(libcfs_debug_mb);
+
+unsigned int libcfs_printk = D_CANTMASK;
+CFS_MODULE_PARM(libcfs_printk, "i", uint, 0644,
+                "Lustre kernel debug console mask");
+EXPORT_SYMBOL(libcfs_printk);
+
+unsigned int libcfs_console_ratelimit = 1;
+CFS_MODULE_PARM(libcfs_console_ratelimit, "i", uint, 0644,
+                "Lustre kernel debug console ratelimit (0 to disable)");
+EXPORT_SYMBOL(libcfs_console_ratelimit);
+
+cfs_duration_t libcfs_console_max_delay;
+CFS_MODULE_PARM(libcfs_console_max_delay, "l", ulong, 0644,
+                "Lustre kernel debug console max delay (jiffies)");
+EXPORT_SYMBOL(libcfs_console_max_delay);
+
+cfs_duration_t libcfs_console_min_delay;
+CFS_MODULE_PARM(libcfs_console_min_delay, "l", ulong, 0644,
+                "Lustre kernel debug console min delay (jiffies)");
+EXPORT_SYMBOL(libcfs_console_min_delay);
+
+unsigned int libcfs_console_backoff = CDEBUG_DEFAULT_BACKOFF;
+CFS_MODULE_PARM(libcfs_console_backoff, "i", uint, 0644,
+                "Lustre kernel debug console backoff factor");
+EXPORT_SYMBOL(libcfs_console_backoff);
+
+unsigned int libcfs_debug_binary = 1;
+EXPORT_SYMBOL(libcfs_debug_binary);
+
+unsigned int libcfs_stack;
+EXPORT_SYMBOL(libcfs_stack);
+
+unsigned int portal_enter_debugger;
+EXPORT_SYMBOL(portal_enter_debugger);
+
+unsigned int libcfs_catastrophe;
+EXPORT_SYMBOL(libcfs_catastrophe);
+
+unsigned int libcfs_panic_on_lbug = 0;
+CFS_MODULE_PARM(libcfs_panic_on_lbug, "i", uint, 0644,
+                "Lustre kernel panic on LBUG");
+EXPORT_SYMBOL(libcfs_panic_on_lbug);
+
+atomic_t libcfs_kmemory = ATOMIC_INIT(0);
+EXPORT_SYMBOL(libcfs_kmemory);
+
+static cfs_waitq_t debug_ctlwq;
+
+#ifdef __arch_um__
+char debug_file_path[1024] = "/r/tmp/lustre-log";
+#else
 char debug_file_path[1024] = "/tmp/lustre-log";
-char debug_file_name[1024];
-int handled_panic; /* to avoid recursive calls to notifiers */
-char portals_upcall[1024] = "/usr/lib/lustre/portals_upcall";
+#endif
+CFS_MODULE_PARM(debug_file_path, "s", charp, 0644,
+                "Path for dumping debug logs, "
+                "set 'NONE' to prevent log dumping");
 
+int libcfs_panic_in_progress;
 
-int portals_do_debug_dumplog(void *arg)
+/* libcfs_debug_token2mask() expects the returned
+ * string in lower-case */
+const char *
+libcfs_debug_subsys2str(int subsys)
 {
-        struct file *file;
-        void *journal_info;
-        int rc;
-        mm_segment_t oldfs;
-        unsigned long debug_off;
-
-        kportal_daemonize("");
-
-        reparent_to_init();
-        journal_info = current->journal_info;
-        current->journal_info = NULL;
-        sprintf(debug_file_name, "%s.%ld", debug_file_path, CURRENT_SECONDS);
-        file = filp_open(debug_file_name, O_CREAT|O_EXCL|O_RDWR, 0644);
-
-        if (!file || IS_ERR(file)) {
-                CERROR("cannot open %s for dumping: %ld\n", debug_file_name,
-                       PTR_ERR(file));
-                GOTO(out, PTR_ERR(file));
-        } else {
-                printk(KERN_ALERT "LustreError: dumping log to %s ... writing ...\n",
-                       debug_file_name);
-        }
-
-        debug_off = atomic_read(&debug_off_a);
-        oldfs = get_fs();
-        set_fs(get_ds());
-        if (debug_wrapped) {
-                rc = file->f_op->write(file, debug_buf + debug_off + 1,
-                                       debug_size-debug_off-1, &file->f_pos);
-                rc += file->f_op->write(file, debug_buf, debug_off + 1,
-                                        &file->f_pos);
-        } else {
-                rc = file->f_op->write(file, debug_buf, debug_off,&file->f_pos);
+        switch (subsys) {
+        default:
+                return NULL;
+        case S_UNDEFINED:
+                return "undefined";
+        case S_MDC:
+                return "mdc";
+        case S_MDS:
+                return "mds";
+        case S_OSC:
+                return "osc";
+        case S_OST:
+                return "ost";
+        case S_CLASS:
+                return "class";
+        case S_LOG:
+                return "log";
+        case S_LLITE:
+                return "llite";
+        case S_RPC:
+                return "rpc";
+        case S_LNET:
+                return "lnet";
+        case S_LND:
+                return "lnd";
+        case S_PINGER:
+                return "pinger";
+        case S_FILTER:
+                return "filter";
+        case S_ECHO:
+                return "echo";
+        case S_LDLM:
+                return "ldlm";
+        case S_LOV:
+                return "lov";
+        case S_LMV:
+                return "lmv";
+        case S_SEC:
+                return "sec";
+        case S_GSS:
+                return "gss";
+        case S_MGC:
+                return "mgc";
+        case S_MGS:
+                return "mgs";
+        case S_FID:
+                return "fid";
+        case S_FLD:
+                return "fld";
         }
-        printk("LustreError: wrote %d bytes\n", rc);
-        set_fs(oldfs);
-
-        rc = file->f_op->fsync(file, file->f_dentry, 1);
-        if (rc)
-                CERROR("sync returns %d\n", rc);
-        filp_close(file, 0);
-out:
-        current->journal_info = journal_info;
-        wake_up(&debug_ctlwq);
-        return 0;
 }
 
-int portals_debug_daemon(void *arg)
+/* libcfs_debug_token2mask() expects the returned
+ * string in lower-case */
+const char *
+libcfs_debug_dbg2str(int debug)
 {
-        struct file *file;
-        void *journal_info;
-        mm_segment_t oldfs;
-        unsigned long force_flush = 0;
-        unsigned long size, off, flags;
-        int rc;
-
-        kportal_daemonize("ldebug_daemon");
-        reparent_to_init();
-        journal_info = current->journal_info;
-        current->journal_info = NULL;
-
-        file = filp_open(debug_daemon_file_path,
-                         O_CREAT|O_TRUNC|O_RDWR|O_LARGEFILE, 0644);
-
-        if (!file || IS_ERR(file)) {
-                CERROR("cannot open %s for logging", debug_daemon_file_path);
-                GOTO(out1, PTR_ERR(file));
+        switch (debug) {
+        default:
+                return NULL;
+        case D_TRACE:
+                return "trace";
+        case D_INODE:
+                return "inode";
+        case D_SUPER:
+                return "super";
+        case D_EXT2:
+                return "ext2";
+        case D_MALLOC:
+                return "malloc";
+        case D_CACHE:
+                return "cache";
+        case D_INFO:
+                return "info";
+        case D_IOCTL:
+                return "ioctl";
+        case D_NETERROR:
+                return "neterror";
+        case D_NET:
+                return "net";
+        case D_WARNING:
+                return "warning";
+        case D_BUFFS:
+                return "buffs";
+        case D_OTHER:
+                return "other";
+        case D_DENTRY:
+                return "dentry";
+        case D_NETTRACE:
+                return "nettrace";
+        case D_PAGE:
+                return "page";
+        case D_DLMTRACE:
+                return "dlmtrace";
+        case D_ERROR:
+                return "error";
+        case D_EMERG:
+                return "emerg";
+        case D_HA:
+                return "ha";
+        case D_RPCTRACE:
+                return "rpctrace";
+        case D_VFSTRACE:
+                return "vfstrace";
+        case D_READA:
+                return "reada";
+        case D_MMAP:
+                return "mmap";
+        case D_CONFIG:
+                return "config";
+        case D_CONSOLE:
+                return "console";
+        case D_QUOTA:
+                return "quota";
+        case D_SEC:
+                return "sec";
         }
-        printk(KERN_INFO "daemon dumping log to %s\n", debug_daemon_file_path);
-
-        debug_daemon_state.overlapped = 0;
-        debug_daemon_state.stopped = 0;
+}
 
-        spin_lock_irqsave(&portals_debug_lock, flags);
-        off = atomic_read(&debug_off_a) + 1;
-        if (debug_wrapped)
-                off = (off >= debug_size)? 0 : off;
-        else
-                off = 0;
-        atomic_set(&debug_daemon_next_write, off);
-        atomic_set(&debug_daemon_state.paused, 0);
-        spin_unlock_irqrestore(&portals_debug_lock, flags);
-
-        oldfs = get_fs();
-        set_fs(KERNEL_DS);
-        while (1) {
-                unsigned long ending;
-                unsigned long start, tail;
-                long delta;
-
-                debug_daemon_state.daemon_event = 0;
-
-                ending = atomic_read(&debug_off_a);
-                start = atomic_read(&debug_daemon_next_write);
-
-                /* check if paused is imposed by lctl ? */
-                force_flush = !debug_daemon_state.lctl_event;
-
-                delta = ending - start;
-                tail = debug_size - start;
-                size = (delta >= 0) ? delta : tail;
-                while (size && (force_flush || (delta < 0) ||
-                                (size >= DAEMON_SND_SIZE))) {
-                        if (daemon_file_size_limit) {
-                               int ssize = daemon_file_size_limit - file->f_pos;
-                               if (size > ssize)
-                                        size = ssize;
+int
+libcfs_debug_mask2str(char *str, int size, int mask, int is_subsys)
+{
+        const char *(*fn)(int bit) = is_subsys ? libcfs_debug_subsys2str :
+                                                 libcfs_debug_dbg2str;
+        int           len = 0;
+        const char   *token;
+        int           bit;
+        int           i;
+
+        if (mask == 0) {                        /* "0" */
+                if (size > 0)
+                        str[0] = '0';
+                len = 1;
+        } else {                                /* space-separated tokens */
+                for (i = 0; i < 32; i++) {
+                        bit = 1 << i;
+
+                        if ((mask & bit) == 0)
+                                continue;
+
+                        token = fn(bit);
+                        if (token == NULL)              /* unused bit */
+                                continue;
+
+                        if (len > 0) {                  /* separator? */
+                                if (len < size)
+                                        str[len] = ' ';
+                                len++;
                         }
 
-                        rc = file->f_op->write(file, debug_buf+start,
-                                               size, &file->f_pos);
-                        if (rc < 0) {
-                                printk(KERN_ALERT "LustreError: Debug_daemon "
-                                       "write error %d\n", rc);
-                                goto out;
-                        }
-                        start += rc;
-                        delta = ending - start;
-                        tail = debug_size - start;
-                        if (tail == 0)
-                                start = 0;
-                        if (delta >= 0)
-                                size = delta;
-                        else
-                                size = (tail == 0) ? ending : tail;
-                        if (daemon_file_size_limit == file->f_pos) {
-                                // file wrapped around
-                                file->f_pos = 0;
+                        while (*token != 0) {
+                                if (len < size)
+                                        str[len] = *token;
+                                token++;
+                                len++;
                         }
                 }
-                atomic_set(&debug_daemon_next_write, start);
-                if (force_flush) {
-                        rc = file->f_op->fsync(file, file->f_dentry, 1);
-                        if (rc < 0) {
-                                printk(KERN_ALERT "LustreError: Debug_daemon "
-                                       "sync error %d\n", rc);
-                                goto out;
-                        }
-                        if (debug_daemon_state.stopped)
-                               break;
-                        debug_daemon_state.lctl_event = 1;
-                        wake_up(&debug_daemon_state.lctl);
-                }
-                wait_event(debug_daemon_state.daemon,
-                           debug_daemon_state.daemon_event);
-                }
-out:
-        atomic_set(&debug_daemon_state.paused, 1);
-        debug_daemon_state.stopped = 1;
-        set_fs(oldfs);
-        filp_close(file, 0);
-        current->journal_info = journal_info;
-out1:
-        debug_daemon_state.lctl_event = 1;
-        wake_up(&debug_daemon_state.lctl);
-        return 0;
-}
-
-void portals_debug_print(void)
-{
-        unsigned long dumplen = 64 * 1024;
-        char *start1, *start2;
-        char *end1, *end2;
-        unsigned long debug_off = atomic_read(&debug_off_a);
-
-        start1 = debug_buf + debug_off - dumplen;
-        if (start1 < debug_buf) {
-                start1 += debug_size;
-                end1 = debug_buf + debug_size - 1;
-                start2 = debug_buf;
-                end2 = debug_buf + debug_off;
-        } else {
-                end1 = debug_buf + debug_off;
-                start2 = debug_buf + debug_off;
-                end2 = debug_buf + debug_off;
         }
 
-        while (start1 < end1) {
-                int count = MIN(1024, end1 - start1);
-                printk("LustreError: %*s", count, start1);
-                start1 += 1024;
-        }
-        while (start2 < end2) {
-                int count = MIN(1024, end2 - start2);
-                printk("LustreError: %*s", count, start2);
-                start2 += 1024;
-        }
+        /* terminate 'str' */
+        if (len < size)
+                str[len] = 0;
+        else
+                str[size - 1] = 0;
+
+        return len;
 }
 
-void portals_debug_dumplog(void)
+int
+libcfs_debug_token2mask(int *mask, const char *str, int len, int is_subsys)
 {
-        int rc;
-        ENTRY;
+        const char *(*fn)(int bit) = is_subsys ? libcfs_debug_subsys2str :
+                                                 libcfs_debug_dbg2str;
+        int           i;
+        int           j;
+        int           bit;
+        const char   *token;
+
+        /* match against known tokens */
+        for (i = 0; i < 32; i++) {
+                bit = 1 << i;
+
+                token = fn(bit);
+                if (token == NULL)              /* unused? */
+                        continue;
+
+                /* strcasecmp */
+                for (j = 0; ; j++) {
+                        if (j == len) {         /* end of token */
+                                if (token[j] == 0) {
+                                        *mask = bit;
+                                        return 0;
+                                }
+                                break;
+                        }
 
-        init_waitqueue_head(&debug_ctlwq);
+                        if (token[j] == 0)
+                                break;
 
-        rc = kernel_thread(portals_do_debug_dumplog,
-                           NULL, CLONE_VM | CLONE_FS | CLONE_FILES);
-        if (rc < 0) {
-                printk(KERN_ERR "LustreError: cannot start log dump thread: "
-                       "%d\n", rc);
-                return;
+                        if (str[j] == token[j])
+                                continue;
+
+                        if (str[j] < 'A' || 'Z' < str[j])
+                                break;
+
+                        if (str[j] - 'A' + 'a' != token[j])
+                                break;
+                }
         }
-        sleep_on(&debug_ctlwq);
+
+        return -EINVAL;                         /* no match */
 }
 
-int portals_debug_daemon_start(char *file, unsigned int size)
+int
+libcfs_debug_str2mask(int *mask, const char *str, int is_subsys)
 {
-        int rc;
+        int         m = 0;
+        char        op = 0;
+        int         matched;
+        int         n;
+        int         t;
 
-        if (!debug_daemon_state.stopped)
-                return -EALREADY;
+        /* Allow a number for backwards compatibility */
 
-        if (file != NULL)
-                strncpy(debug_daemon_file_path, file, 1024);
+        for (n = strlen(str); n > 0; n--)
+                if (!isspace(str[n-1]))
+                        break;
+        matched = n;
 
-        init_waitqueue_head(&debug_daemon_state.lctl);
-        init_waitqueue_head(&debug_daemon_state.daemon);
+        if ((t = sscanf(str, "%i%n", &m, &matched)) >= 1 &&
+            matched == n) {
+                *mask = m;
+                return 0;
+        }
 
-        daemon_file_size_limit = size << 20;
+        /* <str> must be a list of debug tokens or numbers separated by
+         * whitespace and optionally an operator ('+' or '-').  If an operator
+         * appears first in <str>, '*mask' is used as the starting point
+         * (relative), otherwise 0 is used (absolute).  An operator applies to
+         * all following tokens up to the next operator. */
 
-        debug_daemon_state.lctl_event = 0;
-        rc = kernel_thread(portals_debug_daemon, NULL, 0);
-        if (rc < 0) {
-                printk(KERN_ERR "LustreError: cannot start debug daemon thread\n");
-                strncpy(debug_daemon_file_path, "\0", 1);
-                return rc;
-        }
-        wait_event(debug_daemon_state.lctl, debug_daemon_state.lctl_event);
-        return 0;
-}
+        matched = 0;
+        while (*str != 0) {
+                while (isspace(*str)) /* skip whitespace */
+                        str++;
 
-int portals_debug_daemon_pause(void)
-{
-        if (atomic_read(&debug_daemon_state.paused))
-                return -EALREADY;
-
-        atomic_set(&debug_daemon_state.paused, 1);
-        debug_daemon_state.lctl_event = 0;
-        debug_daemon_state.daemon_event = 1;
-        wake_up(&debug_daemon_state.daemon);
-        wait_event(debug_daemon_state.lctl, debug_daemon_state.lctl_event);
-        return 0;
-}
+                if (*str == 0)
+                        break;
 
-int portals_debug_daemon_continue(void)
-{
-        if (!atomic_read(&debug_daemon_state.paused))
-                return -EINVAL;
-        if (debug_daemon_state.stopped)
-                return -EINVAL;
+                if (*str == '+' || *str == '-') {
+                        op = *str++;
 
-        debug_daemon_state.overlapped = 0;
-        atomic_set(&debug_daemon_next_write, atomic_read(&debug_off_a));
-        atomic_set(&debug_daemon_state.paused, 0);
-        return 0;
-}
+                        /* op on first token == relative */
+                        if (!matched)
+                                m = *mask;
 
-int portals_debug_daemon_stop(void)
-{
-        if (debug_daemon_state.stopped)
-                return -EALREADY;
+                        while (isspace(*str)) /* skip whitespace */
+                                str++;
 
-        if (!atomic_read(&debug_daemon_state.paused))
-                portals_debug_daemon_pause();
+                        if (*str == 0)          /* trailing op */
+                                return -EINVAL;
+                }
 
-        debug_daemon_state.lctl_event = 0;
-        debug_daemon_state.stopped = 1;
+                /* find token length */
+                for (n = 0; str[n] != 0 && !isspace(str[n]); n++);
 
-        debug_daemon_state.daemon_event = 1;
-        wake_up(&debug_daemon_state.daemon);
-        wait_event(debug_daemon_state.lctl, debug_daemon_state.lctl_event);
+                /* match token */
+                if (libcfs_debug_token2mask(&t, str, n, is_subsys) != 0)
+                        return -EINVAL;
 
-        debug_daemon_file_path[0] = '\0';
-        return 0;
-}
+                matched = 1;
+                if (op == '-')
+                        m &= ~t;
+                else
+                        m |= t;
 
-int portals_debug_set_daemon(unsigned int cmd, unsigned int length,
-                             char *filename, unsigned int size)
-{
-        int rc = -EINVAL;
-
-        down(&debug_daemon_semaphore);
-        switch (cmd) {
-                case DEBUG_DAEMON_START:
-                        if (length && (filename[length -1] != '\0')) {
-                                CERROR("Invalid filename for debug_daemon\n");
-                                rc = -EINVAL;
-                                break;
-                        }
-                        rc = portals_debug_daemon_start(filename, size);
-                        break;
-                case DEBUG_DAEMON_STOP:
-                        rc = portals_debug_daemon_stop();
-                        break;
-                case DEBUG_DAEMON_PAUSE:
-                        rc = portals_debug_daemon_pause();
-                        break;
-                case DEBUG_DAEMON_CONTINUE:
-                        rc = portals_debug_daemon_continue();
-                        break;
-                default:
-                        CERROR("unknown set_daemon cmd\n");
+                str += n;
         }
-        up(&debug_daemon_semaphore);
-        return rc;
+
+        if (!matched)
+                return -EINVAL;
+
+        *mask = m;
+        return 0;
 }
 
-static int panic_dumplog(struct notifier_block *self, unsigned long unused1,
-                         void *unused2)
+void libcfs_debug_dumplog_internal(void *arg)
 {
-        if (handled_panic)
-                return 0;
-        else
-                handled_panic = 1;
+        CFS_DECL_JOURNAL_DATA;
 
-        if (in_interrupt()) {
-                portals_debug_print();
-                return 0;
+        CFS_PUSH_JOURNAL;
+
+        if (strncmp(debug_file_path, "NONE", 4) != 0) {
+                snprintf(debug_file_name, sizeof(debug_file_path) - 1,
+                         "%s.%ld.%ld", debug_file_path, cfs_time_current_sec(),
+                         (long)arg);
+                printk(KERN_ALERT "LustreError: dumping log to %s\n",
+                       debug_file_name);
+                tracefile_dump_all_pages(debug_file_name);
         }
+        CFS_POP_JOURNAL;
+}
 
-        while (current->lock_depth >= 0)
-                unlock_kernel();
-        portals_debug_dumplog();
+int libcfs_debug_dumplog_thread(void *arg)
+{
+        cfs_daemonize("");
+        libcfs_debug_dumplog_internal(arg);
+        cfs_waitq_signal(&debug_ctlwq);
         return 0;
 }
 
-static struct notifier_block lustre_panic_notifier = {
-        notifier_call :     panic_dumplog,
-        next :              NULL,
-        priority :          10000
-};
-
-int portals_debug_init(unsigned long bufsize)
+void libcfs_debug_dumplog(void)
 {
-        unsigned long debug_off = atomic_read(&debug_off_a);
-        if (debug_buf != NULL)
-                return -EALREADY;
-
-        atomic_set(&debug_daemon_state.paused, 1);
-        debug_daemon_state.stopped = 1;
-
-        debug_buf = vmalloc(bufsize + DEBUG_OVERFLOW);
-        if (debug_buf == NULL)
-                return -ENOMEM;
-        memset(debug_buf, 0, debug_size);
-        debug_wrapped = 0;
+        int            rc;
+        cfs_waitlink_t wait;
+        ENTRY;
 
-        //printk(KERN_INFO "Portals: allocated %lu byte debug buffer at %p.\n",
-               //bufsize, debug_buf);
-        atomic_set(&debug_off_a, debug_off);
-        notifier_chain_register(&panic_notifier_list, &lustre_panic_notifier);
-        debug_size = bufsize;
+        /* we're being careful to ensure that the kernel thread is
+         * able to set our state to running as it exits before we
+         * get to schedule() */
+        cfs_waitlink_init(&wait);
+        set_current_state(TASK_INTERRUPTIBLE);
+        cfs_waitq_add(&debug_ctlwq, &wait);
+
+        rc = cfs_kernel_thread(libcfs_debug_dumplog_thread,
+                               (void *)(long)cfs_curproc_pid(),
+                               CLONE_VM | CLONE_FS | CLONE_FILES);
+        if (rc < 0)
+                printk(KERN_ERR "LustreError: cannot start log dump thread: "
+                       "%d\n", rc);
+        else
+                cfs_waitq_wait(&wait, CFS_TASK_INTERRUPTIBLE);
 
-        return 0;
+        /* be sure to teardown if kernel_thread() failed */
+        cfs_waitq_del(&debug_ctlwq, &wait);
+        set_current_state(TASK_RUNNING);
 }
 
-int portals_debug_cleanup(void)
+int libcfs_debug_init(unsigned long bufsize)
 {
-        notifier_chain_unregister(&panic_notifier_list, &lustre_panic_notifier);
-        if (debug_buf == NULL)
-                return -EINVAL;
+        int    rc = 0;
+        int    max = libcfs_debug_mb;
+
+        cfs_waitq_init(&debug_ctlwq);
+        libcfs_console_max_delay = CDEBUG_DEFAULT_MAX_DELAY;
+        libcfs_console_min_delay = CDEBUG_DEFAULT_MIN_DELAY;
+        /* If libcfs_debug_mb is set to an invalid value or uninitialized
+         * then just make the total buffers smp_num_cpus * TCD_MAX_PAGES */
+        if (max > trace_max_debug_mb() || max < num_possible_cpus()) {
+                max = TCD_MAX_PAGES;
+        } else {
+                max = (max / num_possible_cpus());
+                max = (max << (20 - CFS_PAGE_SHIFT));
+        }
+        rc = tracefile_init(max);
 
-        down(&debug_daemon_semaphore);
-        portals_debug_daemon_stop();
+        if (rc == 0)
+                libcfs_register_panic_notifier();
 
-        vfree(debug_buf);
-        atomic_set(&debug_off_a, 0);
-        up(&debug_daemon_semaphore);
+        return rc;
+}
 
+int libcfs_debug_cleanup(void)
+{
+        libcfs_unregister_panic_notifier();
+        tracefile_exit();
         return 0;
 }
 
-int portals_debug_clear_buffer(void)
+int libcfs_debug_clear_buffer(void)
 {
-        unsigned long flags;
-        unsigned long state;
-
-        if (debug_buf == NULL)
-                return -EINVAL;
-
-        down(&debug_daemon_semaphore);
-        state = atomic_read(&debug_daemon_state.paused);
-        if (!state)
-                portals_debug_daemon_pause();
-        spin_lock_irqsave(&portals_debug_lock, flags);
-        atomic_set(&debug_off_a, 0);
-        debug_wrapped = 0;
-        atomic_set(&debug_daemon_next_write, 0);
-        debug_daemon_state.overlapped = 0;
-        spin_unlock_irqrestore(&portals_debug_lock, flags);
-
-        if (!state)
-                atomic_set(&debug_daemon_state.paused, 0);
-        up(&debug_daemon_semaphore);
-
+        trace_flush_pages();
         return 0;
 }
 
-/* Debug markers, although printed by S_PORTALS
- * should not be be marked as such.
- */
+/* Debug markers, although printed by S_LNET
+ * should not be be marked as such. */
 #undef DEBUG_SUBSYSTEM
 #define DEBUG_SUBSYSTEM S_UNDEFINED
-int portals_debug_mark_buffer(char *text)
+int libcfs_debug_mark_buffer(char *text)
 {
-        if (debug_buf == NULL)
-                return -EINVAL;
-
-        CDEBUG(0, "********************************************************\n");
-        CWARN("DEBUG MARKER: %s\n", text);
-        CDEBUG(0, "********************************************************\n");
+        CDEBUG(D_TRACE,"***************************************************\n");
+        CDEBUG(D_WARNING, "DEBUG MARKER: %s\n", text);
+        CDEBUG(D_TRACE,"***************************************************\n");
 
         return 0;
 }
 #undef DEBUG_SUBSYSTEM
-#define DEBUG_SUBSYSTEM S_PORTALS
+#define DEBUG_SUBSYSTEM S_LNET
 
-/* this copies a snapshot of the debug buffer into an array of pages
- * before doing the potentially blocking copy into userspace. it could
- * be warning userspace if things wrap heavily while its off copying. */
-__s32 portals_debug_copy_to_user(char *buf, unsigned long len)
+void libcfs_debug_set_level(unsigned int debug_level)
 {
-        int rc;
-        unsigned long total, debug_off, i, off, copied;
-        unsigned long flags;
-        struct page *page;
-        LIST_HEAD(my_pages);
-        struct list_head *pos, *n;
-
-        if (len < debug_size)
-                return -ENOSPC;
-
-        for (i = 0 ; i < debug_size; i += PAGE_SIZE) {
-                page = alloc_page(GFP_NOFS);
-                if (page == NULL) {
-                        rc = -ENOMEM;
-                        goto cleanup;
-                }
-                list_add(&page->list, &my_pages);
-        }
+        printk(KERN_WARNING "Lustre: Setting portals debug level to %08x\n",
+               debug_level);
+        libcfs_debug = debug_level;
+}
 
-        spin_lock_irqsave(&portals_debug_lock, flags);
-        debug_off = atomic_read(&debug_off_a);
+EXPORT_SYMBOL(libcfs_debug_dumplog);
+EXPORT_SYMBOL(libcfs_debug_set_level);
 
-        /* Sigh. If the buffer is empty, then skip to the end. */
-        if (debug_off == 0 && !debug_wrapped) {
-                spin_unlock_irqrestore(&portals_debug_lock, flags);
-                rc = 0;
-                goto cleanup;
-        }
 
-        if (debug_wrapped) {
-                off = debug_off + 1;
-                total = debug_size;
-        } else {
-                off = 0;
-                total = debug_off;
-        }
-        copied = 0;
-        list_for_each(pos, &my_pages) {
-                unsigned long to_copy;
-                void *addr;
-
-                page = list_entry(pos, struct page, list);
-                to_copy = min(total - off, PAGE_SIZE);
-                if (to_copy == 0) {
-                        off = 0;
-                        to_copy = min(debug_size - off, PAGE_SIZE);
-                }
-finish_partial:
-                addr = kmap_atomic(page, KM_USER0);
-                memcpy(addr, debug_buf + off, to_copy);
-                kunmap_atomic(addr, KM_USER0);
-                copied += to_copy;
-                if (copied >= total)
-                        break;
+#else /* !__KERNEL__ */
 
-                off += to_copy;
-                if (off >= debug_size) {
-                        off = 0;
-                        if (to_copy != PAGE_SIZE) {
-                                to_copy = PAGE_SIZE - to_copy;
-                                goto finish_partial;
-                        }
-                }
-        }
+#include <libcfs/libcfs.h>
 
-        spin_unlock_irqrestore(&portals_debug_lock, flags);
+#ifdef HAVE_CATAMOUNT_DATA_H
+#include <catamount/data.h>
+#include <catamount/lputs.h>
 
-        off = 0;
-        list_for_each(pos, &my_pages) {
-                unsigned long to_copy;
-                page = list_entry(pos, struct page, list);
+static char source_nid[16];
+/* 0 indicates no messages to console, 1 is errors, > 1 is all debug messages */
+static int toconsole = 1;
+unsigned int libcfs_console_ratelimit = 1;
+cfs_duration_t libcfs_console_max_delay;
+cfs_duration_t libcfs_console_min_delay;
+unsigned int libcfs_console_backoff = CDEBUG_DEFAULT_BACKOFF;
+#else /* !HAVE_CATAMOUNT_DATA_H */
+#ifdef HAVE_NETDB_H
+#include <sys/utsname.h>
+#endif /* HAVE_NETDB_H */
+struct utsname *tmp_utsname;
+static char source_nid[sizeof(tmp_utsname->nodename)];
+#endif /* HAVE_CATAMOUNT_DATA_H */
 
-                to_copy = min(copied - off, PAGE_SIZE);
-                rc = copy_to_user(buf + off, kmap(page), to_copy);
-                kunmap(page);
-                if (rc) {
-                        rc = -EFAULT;
-                        goto cleanup;
-                }
-                off += to_copy;
-                if (off >= copied)
-                        break;
-        }
-        rc = copied;
+static int source_pid;
+int smp_processor_id = 1;
+char debug_file_path[1024];
+FILE *debug_file_fd;
 
-cleanup:
-        list_for_each_safe(pos, n, &my_pages) {
-                page = list_entry(pos, struct page, list);
-                list_del(&page->list);
-                __free_page(page);
-        }
-        return rc;
+int portals_do_debug_dumplog(void *arg)
+{
+        printf("Look in %s\n", debug_file_name);
+        return 0;
 }
 
-/* FIXME: I'm not very smart; someone smarter should make this better. */
-void
-portals_debug_msg(int subsys, int mask, char *file, const char *fn,
-                  const int line, unsigned long stack, char *format, ...)
+
+void portals_debug_print(void)
 {
-        va_list       ap;
-        unsigned long flags;
-        int           max_nob;
-        int           prefix_nob;
-        int           msg_nob;
-        struct timeval tv;
-        unsigned long base_offset;
-        unsigned long debug_off;
+        return;
+}
 
-        if (debug_buf == NULL) {
-                printk("LustreError: portals_debug_msg: debug_buf is NULL!\n");
-                return;
-        }
 
-        spin_lock_irqsave(&portals_debug_lock, flags);
-        debug_off = atomic_read(&debug_off_a);
-        if (!atomic_read(&debug_daemon_state.paused)) {
-                unsigned long available;
-                long delta;
-                long v = atomic_read(&debug_daemon_next_write);
-
-                delta = debug_off - v;
-                available = (delta>=0) ? debug_size-delta : -delta;
-                // Check if we still have enough debug buffer for CDEBUG
-                if (available < DAEMON_SND_SIZE) {
-                        /* Drop CDEBUG packets until enough debug_buffer is
-                         * available */
-                        if (debug_daemon_state.overlapped)
-                                 goto out;
-                        /* If this is the first time, leave a marker in the
-                         * output */
-                        debug_daemon_state.overlapped = 1;
-                        format = "DEBUG MARKER: Debug buffer overlapped\n";
-                        printk(KERN_ERR "LustreError: debug daemon buffer "
-                               "overlapped\n");
-                } else  /* More space just became available */
-                        debug_daemon_state.overlapped = 0;
-        }
+void libcfs_debug_dumplog(void)
+{
+        printf("Look in %s\n", debug_file_name);
+        return;
+}
 
-        max_nob = debug_size - debug_off + DEBUG_OVERFLOW;
-        if (max_nob <= 0) {
-                spin_unlock_irqrestore(&portals_debug_lock, flags);
-                printk("LustreError: logic error in portals_debug_msg: "
-                       "< 0 bytes to write\n");
-                return;
+int libcfs_debug_init(unsigned long bufsize)
+{
+        char *debug_mask = NULL;
+        char *debug_subsys = NULL;
+        char *debug_filename;
+
+#ifdef HAVE_CATAMOUNT_DATA_H
+        char *debug_console = NULL;
+        char *debug_ratelimit = NULL;
+        char *debug_max_delay = NULL;
+        char *debug_min_delay = NULL;
+        char *debug_backoff = NULL;
+
+        libcfs_console_max_delay = CDEBUG_DEFAULT_MAX_DELAY;
+        libcfs_console_min_delay = CDEBUG_DEFAULT_MIN_DELAY;
+
+        snprintf(source_nid, sizeof(source_nid) - 1, "%u", _my_pnid);
+        source_pid = _my_pid;
+
+        debug_console = getenv("LIBLUSTRE_DEBUG_CONSOLE");
+        if (debug_console != NULL) {
+                toconsole = strtoul(debug_console, NULL, 0);
+                CDEBUG(D_INFO, "set liblustre toconsole to %u\n", toconsole);
+        }
+        debug_ratelimit = getenv("LIBLUSTRE_DEBUG_CONSOLE_RATELIMIT");
+        if (debug_ratelimit != NULL) {
+                libcfs_console_ratelimit = strtoul(debug_ratelimit, NULL, 0);
+                CDEBUG(D_INFO, "set liblustre console ratelimit to %u\n",
+                                libcfs_console_ratelimit);
+        }
+        debug_max_delay = getenv("LIBLUSTRE_DEBUG_CONSOLE_MAX_DELAY");
+        if (debug_max_delay != NULL)
+                libcfs_console_max_delay =
+                            cfs_time_seconds(strtoul(debug_max_delay, NULL, 0));
+        debug_min_delay = getenv("LIBLUSTRE_DEBUG_CONSOLE_MIN_DELAY");
+        if (debug_min_delay != NULL)
+                libcfs_console_min_delay =
+                            cfs_time_seconds(strtoul(debug_min_delay, NULL, 0));
+        if (debug_min_delay || debug_max_delay) {
+                if (!libcfs_console_max_delay || !libcfs_console_min_delay ||
+                    libcfs_console_max_delay < libcfs_console_min_delay) {
+                        libcfs_console_max_delay = CDEBUG_DEFAULT_MAX_DELAY;
+                        libcfs_console_min_delay = CDEBUG_DEFAULT_MIN_DELAY;
+                        CDEBUG(D_INFO, "LIBLUSTRE_DEBUG_CONSOLE_MAX_DELAY "
+                                       "should be greater than "
+                                       "LIBLUSTRE_DEBUG_CONSOLE_MIN_DELAY "
+                                       "and both parameters should be non-null"
+                                       ": restore default values\n");
+                } else {
+                        CDEBUG(D_INFO, "set liblustre console max delay to %lus"
+                                       " and min delay to %lus\n",
+                               (cfs_duration_t)
+                                     cfs_duration_sec(libcfs_console_max_delay),
+                               (cfs_duration_t)
+                                    cfs_duration_sec(libcfs_console_min_delay));
+                }
+        }
+        debug_backoff = getenv("LIBLUSTRE_DEBUG_CONSOLE_BACKOFF");
+        if (debug_backoff != NULL) {
+                libcfs_console_backoff = strtoul(debug_backoff, NULL, 0);
+                if (libcfs_console_backoff <= 0) {
+                        libcfs_console_backoff = CDEBUG_DEFAULT_BACKOFF;
+                        CDEBUG(D_INFO, "LIBLUSTRE_DEBUG_CONSOLE_BACKOFF <= 0: "
+                                       "restore default value\n");
+                } else {
+                        CDEBUG(D_INFO, "set liblustre console backoff to %u\n",
+                               libcfs_console_backoff);
+                }
         }
-
-        /* NB since we pass a non-zero sized buffer (at least) on the first
-         * print, we can be assured that by the end of all the snprinting,
-         * we _do_ have a terminated buffer, even if our message got truncated.
-         */
-
-        do_gettimeofday(&tv);
-
-        prefix_nob = snprintf(debug_buf + debug_off, max_nob,
-                              "%06x:%06x:%d:%lu.%06lu:%lu:%d:",
-                              subsys, mask, smp_processor_id(),
-                              tv.tv_sec, tv.tv_usec, stack, current->pid);
-        max_nob -= prefix_nob;
-
-#if defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20))
-        msg_nob = snprintf(debug_buf + debug_off + prefix_nob, max_nob,
-                           "%d:(%s:%d:%s()) ",
-                           current->thread.extern_pid, file, line, fn);
-#elif defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        msg_nob = snprintf(debug_buf + debug_off + prefix_nob, max_nob,
-                           "%d:(%s:%d:%s()) ",
-                           current->thread.mode.tt.extern_pid, file, line, fn);
 #else
-        msg_nob = snprintf(debug_buf + debug_off + prefix_nob, max_nob,
-                           "%d:(%s:%d:%s()) ",
-                           current->pid, file, line, fn);
-#endif
+        struct utsname myname;
 
-        va_start(ap, format);
-        msg_nob += vsnprintf(debug_buf + debug_off + prefix_nob + msg_nob,
-                             max_nob, format, ap);
-        max_nob -= msg_nob;
-        va_end(ap);
-
-        /* Print to console, while msg is contiguous in debug_buf */
-        /* NB safely terminated see above */
-        if ((mask & D_EMERG) != 0)
-                printk(KERN_EMERG "LustreError: %s",
-                       debug_buf + debug_off + prefix_nob);
-        else if ((mask & D_ERROR) != 0)
-                printk(KERN_ERR "LustreError: %s",
-                       debug_buf + debug_off + prefix_nob);
-        else if ((mask & D_WARNING) != 0)
-                printk(KERN_WARNING "Lustre: %s",
-                       debug_buf + debug_off + prefix_nob);
-        else if (portal_printk)
-                printk("<%d>Lustre: %s", portal_printk,
-                       debug_buf+debug_off+prefix_nob);
-        base_offset = debug_off & 0xFFFF;
-
-        debug_off += prefix_nob + msg_nob;
-        if (debug_off > debug_size) {
-                memcpy(debug_buf, debug_buf + debug_size,
-                       debug_off - debug_size + 1);
-                debug_off -= debug_size;
-                debug_wrapped = 1;
+        if (uname(&myname) == 0)
+                strcpy(source_nid, myname.nodename);
+        source_pid = getpid();
+#endif
+        /* debug masks */
+        debug_mask = getenv("LIBLUSTRE_DEBUG_MASK");
+        if (debug_mask)
+                libcfs_debug = (unsigned int) strtol(debug_mask, NULL, 0);
+
+        debug_subsys = getenv("LIBLUSTRE_DEBUG_SUBSYS");
+        if (debug_subsys)
+                libcfs_subsystem_debug =
+                                (unsigned int) strtol(debug_subsys, NULL, 0);
+
+        debug_filename = getenv("LIBLUSTRE_DEBUG_BASE");
+        if (debug_filename)
+                strncpy(debug_file_path,debug_filename,sizeof(debug_file_path));
+
+        debug_filename = getenv("LIBLUSTRE_DEBUG_FILE");
+        if (debug_filename)
+                strncpy(debug_file_name,debug_filename,sizeof(debug_file_path));
+
+        if (debug_file_name[0] == '\0' && debug_file_path[0] != '\0')
+                snprintf(debug_file_name, sizeof(debug_file_name) - 1,
+                         "%s-%s-"CFS_TIME_T".log", debug_file_path, source_nid, time(0));
+
+        if (strcmp(debug_file_name, "stdout") == 0 ||
+            strcmp(debug_file_name, "-") == 0) {
+                debug_file_fd = stdout;
+        } else if (strcmp(debug_file_name, "stderr") == 0) {
+                debug_file_fd = stderr;
+        } else if (debug_file_name[0] != '\0') {
+                debug_file_fd = fopen(debug_file_name, "w");
+                if (debug_file_fd == NULL)
+                        fprintf(stderr, "%s: unable to open '%s': %s\n",
+                                source_nid, debug_file_name, strerror(errno));
         }
 
-        atomic_set(&debug_off_a, debug_off);
-        if (!atomic_read(&debug_daemon_state.paused) &&
-            ((base_offset+prefix_nob+msg_nob) >= DAEMON_SND_SIZE)) {
-                debug_daemon_state.daemon_event = 1;
-                wake_up(&debug_daemon_state.daemon);
-        }
-out:
-        spin_unlock_irqrestore(&portals_debug_lock, flags);
+        if (debug_file_fd == NULL)
+                debug_file_fd = stdout;
+
+        return 0;
 }
 
-void portals_debug_set_level(unsigned int debug_level)
+int libcfs_debug_cleanup(void)
 {
-        printk("Lustre: Setting portals debug level to %08x\n", debug_level);
-        portal_debug = debug_level;
+        if (debug_file_fd != stdout && debug_file_fd != stderr)
+                fclose(debug_file_fd);
+        return 0;
 }
 
-void portals_run_upcall(char **argv)
+int libcfs_debug_clear_buffer(void)
 {
-        int   rc;
-        int   argc;
-        char *envp[] = {
-                "HOME=/",
-                "PATH=/sbin:/bin:/usr/sbin:/usr/bin",
-                NULL};
-        ENTRY;
-
-        argv[0] = portals_upcall;
-        argc = 1;
-        while (argv[argc] != NULL)
-                argc++;
-
-        LASSERT(argc >= 2);
-
-        rc = USERMODEHELPER(argv[0], argv, envp);
-        if (rc < 0) {
-                CERROR("Error %d invoking portals upcall %s %s%s%s%s%s%s%s%s; "
-                       "check /proc/sys/portals/upcall\n",
-                       rc, argv[0], argv[1],
-                       argc < 3 ? "" : ",", argc < 3 ? "" : argv[2],
-                       argc < 4 ? "" : ",", argc < 4 ? "" : argv[3],
-                       argc < 5 ? "" : ",", argc < 5 ? "" : argv[4],
-                       argc < 6 ? "" : ",...");
-        } else {
-                CERROR("Invoked portals upcall %s %s%s%s%s%s%s%s%s\n",
-                       argv[0], argv[1],
-                       argc < 3 ? "" : ",", argc < 3 ? "" : argv[2],
-                       argc < 4 ? "" : ",", argc < 4 ? "" : argv[3],
-                       argc < 5 ? "" : ",", argc < 5 ? "" : argv[4],
-                       argc < 6 ? "" : ",...");
-        }
+        return 0;
 }
 
-void portals_run_lbug_upcall(char *file, const char *fn, const int line)
+int libcfs_debug_mark_buffer(char *text)
 {
-        char *argv[6];
-        char buf[32];
-
-        ENTRY;
-        snprintf (buf, sizeof buf, "%d", line);
 
-        argv[1] = "LBUG";
-        argv[2] = file;
-        argv[3] = (char *)fn;
-        argv[4] = buf;
-        argv[5] = NULL;
+        fprintf(debug_file_fd, "*******************************************************************************\n");
+        fprintf(debug_file_fd, "DEBUG MARKER: %s\n", text);
+        fprintf(debug_file_fd, "*******************************************************************************\n");
 
-        portals_run_upcall (argv);
+        return 0;
 }
 
-char *portals_nid2str(int nal, ptl_nid_t nid, char *str)
+#ifdef HAVE_CATAMOUNT_DATA_H
+#define CATAMOUNT_MAXLINE (256-4)
+void catamount_printline(char *buf, size_t size)
 {
-        switch(nal){
-        case TCPNAL:
-                /* userspace NAL */
-        case SOCKNAL:
-                sprintf(str, "%u:%d.%d.%d.%d", (__u32)(nid >> 32),
-                        HIPQUAD(nid));
-                break;
-        case QSWNAL:
-        case GMNAL:
-        case IBNAL:
-        case SCIMACNAL:
-                sprintf(str, "%u:%u", (__u32)(nid >> 32), (__u32)nid);
-                break;
-        default:
-                return NULL;
-        }
-        return str;
+    char *pos = buf;
+    int prsize = size;
+
+    while (prsize > 0){
+        lputs(pos);
+        pos += CATAMOUNT_MAXLINE;
+        prsize -= CATAMOUNT_MAXLINE;
+    }
 }
+#endif
 
-#ifdef __KERNEL__
-#include <linux/lustre_version.h>
-#if (LUSTRE_KERNEL_VERSION >= 30)
-#warning "FIXME: remove workaround when l30 is widely used"
-char stack_backtrace[LUSTRE_TRACE_SIZE];
-spinlock_t stack_backtrace_lock = SPIN_LOCK_UNLOCKED;
-
-#if defined(__arch_um__)
+int
+libcfs_debug_vmsg2(cfs_debug_limit_state_t *cdls,
+                   int subsys, int mask,
+                   const char *file, const char *fn, const int line,
+                   const char *format1, va_list args,
+                   const char *format2, ...)
+{
+        struct timeval tv;
+        int            nob;
+        int            remain;
+        va_list        ap;
+        char           buf[CFS_PAGE_SIZE]; /* size 4096 used for compatimble
+                                            * with linux, where message can`t
+                                            * be exceed PAGE_SIZE */
+        int            console = 0;
+        char *prefix = "Lustre";
+
+#ifdef HAVE_CATAMOUNT_DATA_H
+        /* toconsole == 0 - all messages to debug_file_fd
+         * toconsole == 1 - warnings to console, all to debug_file_fd
+         * toconsole >  1 - all debug to console */
+        if (((mask & libcfs_printk) && toconsole == 1) || toconsole > 1)
+                console = 1;
+#endif
 
-extern int is_kernel_text_address(unsigned long addr);
+        if ((!console) && (!debug_file_fd)) {
+                return 0;
+        }
 
-char *portals_debug_dumpstack(void)
-{
-        asm("int $3");
-        return "dump stack";
-}
+        if (mask & (D_EMERG | D_ERROR))
+               prefix = "LustreError";
 
-#elif defined(__i386__)
+        nob = snprintf(buf, sizeof(buf), "%s: %u-%s:(%s:%d:%s()): ", prefix,
+                       source_pid, source_nid, file, line, fn);
 
-extern int is_kernel_text_address(unsigned long addr);
-extern int lookup_symbol(unsigned long address, char *buf, int buflen);
+        remain = sizeof(buf) - nob;
+        if (format1) {
+                nob += vsnprintf(&buf[nob], remain, format1, args);
+        }
 
-char *portals_debug_dumpstack(void)
-{
-        unsigned long esp = current->thread.esp;
-        unsigned long *stack = (unsigned long *)&esp;
-        int size;
-        unsigned long addr;
-        char *buf = stack_backtrace;
-        char *pbuf = buf;
-        static char buffer[512];
-        int rc = 0;
-
-        /* User space on another CPU? */
-        if ((esp ^ (unsigned long)current) & (PAGE_MASK<<1)){
-                buf[0] = '\0';
-                goto out;
+        remain = sizeof(buf) - nob;
+        if ((format2) && (remain > 0)) {
+                va_start(ap, format2);
+                nob += vsnprintf(&buf[nob], remain, format2, ap);
+                va_end(ap);
         }
 
-        size = sprintf(pbuf, " Call Trace: ");
-        pbuf += size;
-        while (((long) stack & (THREAD_SIZE-1)) != 0) {
-                addr = *stack++;
-                if (is_kernel_text_address(addr)) {
-                        rc = lookup_symbol(addr, buffer, 512);
-                        if (rc == -ENOSYS) {
-                                if (buf + LUSTRE_TRACE_SIZE <= pbuf + 12)
-                                        break;
-                                size = sprintf(pbuf, "[<%08lx>] ", addr);
+#ifdef HAVE_CATAMOUNT_DATA_H
+        if (console) {
+                /* check rate limit for console */
+                if (cdls != NULL) {
+                        if (libcfs_console_ratelimit &&
+                                cdls->cdls_next != 0 &&     /* not first time ever */
+                                !cfs_time_after(cfs_time_current(), cdls->cdls_next)) {
+
+                                /* skipping a console message */
+                                cdls->cdls_count++;
+                                goto out_file;
+                        }
+
+                        if (cfs_time_after(cfs_time_current(), cdls->cdls_next +
+                                           libcfs_console_max_delay +
+                                           cfs_time_seconds(10))) {
+                                /* last timeout was a long time ago */
+                                cdls->cdls_delay /= libcfs_console_backoff * 4;
                         } else {
-                                if (buf + LUSTRE_TRACE_SIZE
-                                            /* fix length + sizeof('\0') */
-                                    <= pbuf + strlen(buffer) + 28 + 1)
-                                        break;
-                                size = sprintf(pbuf, "([<%08lx>] %s (0x%p)) ",
-                                               addr, buffer, stack-1);
+                                cdls->cdls_delay *= libcfs_console_backoff;
+
+                                if (cdls->cdls_delay <
+                                                libcfs_console_min_delay)
+                                        cdls->cdls_delay =
+                                                libcfs_console_min_delay;
+                                else if (cdls->cdls_delay >
+                                                libcfs_console_max_delay)
+                                        cdls->cdls_delay =
+                                                libcfs_console_max_delay;
                         }
-                        pbuf += size;
+
+                        /* ensure cdls_next is never zero after it's been seen */
+                        cdls->cdls_next = (cfs_time_current() + cdls->cdls_delay) | 1;
                 }
-        }
-out:
-        return buf;
-}
 
-#else /* !__arch_um__ && !__i386__ */
+                if (cdls != NULL && cdls->cdls_count != 0) {
+                        char buf2[100];
+
+                        nob = snprintf(buf2, sizeof(buf2),
+                                       "Skipped %d previous similar message%s\n",
+                                       cdls->cdls_count, (cdls->cdls_count > 1) ? "s" : "");
 
-char *portals_debug_dumpstack(void)
+                        catamount_printline(buf2, nob);
+                        cdls->cdls_count = 0;
+                        goto out_file;
+                }
+                catamount_printline(buf, nob);
+       }
+out_file:
+        /* return on toconsole > 1, as we don't want the user getting
+        * spammed by the debug data */
+        if (toconsole > 1)
+                return 0;
+#endif
+        if (debug_file_fd == NULL)
+                return 0;
+
+        gettimeofday(&tv, NULL);
+
+        fprintf(debug_file_fd, CFS_TIME_T".%06lu:%u:%s:(%s:%d:%s()): %s",
+                tv.tv_sec, tv.tv_usec, source_pid, source_nid,
+                file, line, fn, buf);
+
+        return 0;
+}
+
+void
+libcfs_assertion_failed(const char *expr, const char *file, const char *func,
+                        const int line)
 {
-        char *buf = stack_backtrace;
-        buf[0] = '\0';
-        return buf;
+        libcfs_debug_msg(NULL, 0, D_EMERG, file, func, line,
+                         "ASSERTION(%s) failed\n", expr);
+        abort();
 }
 
-#endif /* __arch_um__ */
-EXPORT_SYMBOL(stack_backtrace_lock);
-EXPORT_SYMBOL(portals_debug_dumpstack);
-#endif /* LUSTRE_KERNEL_VERSION < 30 */
 #endif /* __KERNEL__ */
-
-EXPORT_SYMBOL(portals_debug_dumplog);
-EXPORT_SYMBOL(portals_debug_msg);
-EXPORT_SYMBOL(portals_debug_set_level);
-EXPORT_SYMBOL(portals_run_upcall);
-EXPORT_SYMBOL(portals_run_lbug_upcall);
-EXPORT_SYMBOL(portals_nid2str);