b=18498

[fs/lustre-release.git] / libcfs / libcfs / tracefile.h

diff --git a/libcfs/libcfs/tracefile.h b/libcfs/libcfs/tracefile.h
index dd25327..6bfdaaf 100644 (file)
--- a/libcfs/libcfs/tracefile.h
+++ b/libcfs/libcfs/tracefile.h
@@ -39,6 +39,14 @@
 
 #include <libcfs/libcfs.h>
 
+#if defined(__linux__)
+#include "linux/linux-tracefile.h"
+#elif defined(__WINNT__)
+#include "winnt/winnt-tracefile.h"
+#else
+#error Unsupported operating system.
+#endif
+
 /* trace file lock routines */
 
 #define TRACEFILE_NAME_SIZE 1024
@@ -105,6 +113,16 @@ extern int  trace_max_debug_mb(void);
 union trace_data_union {
        struct trace_cpu_data {
                /*
+                * Even though this structure is meant to be per-CPU, locking
+                * is needed because in some places the data may be accessed
+                * from other CPUs. This lock is directly used in trace_get_tcd
+                * and trace_put_tcd, which are called in libcfs_debug_vmsg2 and
+                * tcd_for_each_type_lock
+                */
+               spinlock_t              tcd_lock;
+               unsigned long           tcd_lock_flags;
+
+               /*
                 * pages with trace records not yet processed by tracefiled.
                 */
                struct list_head        tcd_pages;
@@ -176,9 +194,9 @@ extern union trace_data_union (*trace_data[TCD_MAX_TYPES])[NR_CPUS];
         for (j = 0, ((tcd) = &(*trace_data[i])[j].tcd);               \
              j < num_possible_cpus(); j++, (tcd) = &(*trace_data[i])[j].tcd)
 
-#define tcd_for_each_type_lock(tcd, i)                                \
+#define tcd_for_each_type_lock(tcd, i, cpu)                           \
     for (i = 0; trace_data[i] &&                                      \
-         (tcd = &(*trace_data[i])[smp_processor_id()].tcd) &&         \
+         (tcd = &(*trace_data[i])[cpu].tcd) &&                        \
          trace_lock_tcd(tcd); trace_unlock_tcd(tcd), i++)
 
 /* XXX nikita: this declaration is internal to tracefile.c and should probably
@@ -246,14 +264,51 @@ extern void set_ptldebug_header(struct ptldebug_header *header,
 extern void print_to_console(struct ptldebug_header *hdr, int mask, const char *buf,
                             int len, const char *file, const char *fn);
 
-extern struct trace_cpu_data *trace_get_tcd(void);
-extern void trace_put_tcd(struct trace_cpu_data *tcd);
 extern int trace_lock_tcd(struct trace_cpu_data *tcd);
 extern void trace_unlock_tcd(struct trace_cpu_data *tcd);
-extern char *trace_get_console_buffer(void);
-extern void trace_put_console_buffer(char *buffer);
 
-extern void trace_call_on_all_cpus(void (*fn)(void *arg), void *arg);
+/**
+ * trace_buf_type_t, trace_buf_idx_get() and trace_console_buffers[][]
+ * are not public libcfs API; they should be defined in
+ * platform-specific tracefile include files
+ * (see, for example, linux-tracefile.h).
+ */
+
+extern char *trace_console_buffers[NR_CPUS][TCD_TYPE_MAX];
+extern trace_buf_type_t trace_buf_idx_get(void);
+
+static inline char *
+trace_get_console_buffer(void)
+{
+        return trace_console_buffers[cfs_get_cpu()][trace_buf_idx_get()];
+}
+
+static inline void
+trace_put_console_buffer(char *buffer)
+{
+        cfs_put_cpu();
+}
+
+extern union trace_data_union (*trace_data[TCD_MAX_TYPES])[NR_CPUS];
+
+static inline struct trace_cpu_data *
+trace_get_tcd(void)
+{
+       struct trace_cpu_data *tcd =
+                &(*trace_data[trace_buf_idx_get()])[cfs_get_cpu()].tcd;
+
+       trace_lock_tcd(tcd);
+
+       return tcd;
+}
+
+static inline void
+trace_put_tcd (struct trace_cpu_data *tcd)
+{
+       trace_unlock_tcd(tcd);
+
+       cfs_put_cpu();
+}
 
 int trace_refill_stock(struct trace_cpu_data *tcd, int gfp,
                       struct list_head *stock);
@@ -265,21 +320,21 @@ extern void trace_assertion_failed(const char *str, const char *fn,
                                   const char *file, int line);
 
 /* ASSERTION that is safe to use within the debug system */
-#define __LASSERT(cond)                                                                \
-({                                                                             \
-       if (unlikely(!(cond))) {                                                \
-                trace_assertion_failed("ASSERTION("#cond") failed",            \
-                                      __FUNCTION__, __FILE__, __LINE__);       \
-       }                                                                       \
-})
-
-#define __LASSERT_TAGE_INVARIANT(tage)                 \
-({                                                     \
-        __LASSERT(tage != NULL);                       \
-        __LASSERT(tage->page != NULL);                 \
-        __LASSERT(tage->used <= CFS_PAGE_SIZE);                \
-        __LASSERT(cfs_page_count(tage->page) > 0);     \
-})
+#define __LASSERT(cond)                                                 \
+    do {                                                                \
+        if (unlikely(!(cond))) {                                        \
+                trace_assertion_failed("ASSERTION("#cond") failed",     \
+                                 __FUNCTION__, __FILE__, __LINE__);     \
+        }                                                               \
+    } while (0)
+
+#define __LASSERT_TAGE_INVARIANT(tage)                                  \
+    do {                                                                \
+        __LASSERT(tage != NULL);                                        \
+        __LASSERT(tage->page != NULL);                                  \
+        __LASSERT(tage->used <= CFS_PAGE_SIZE);                         \
+        __LASSERT(cfs_page_count(tage->page) > 0);                      \
+    } while (0)
 
 #endif /* LUSTRE_TRACEFILE_PRIVATE */