Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 102432
b: refs/heads/master
c: 6063da9
h: refs/heads/master
v: v3
  • Loading branch information
Allan Stephens authored and David S. Miller committed May 5, 2008
1 parent 1c504ea commit ba17f64
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 51 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7d3aa71239f588215b5a7c359f05155b192d8081
refs/heads/master: 6063da9d74d4da812ae0d8f233b7e320e15765e3
117 changes: 67 additions & 50 deletions trunk/net/tipc/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,87 +59,104 @@
#include <linux/vmalloc.h>

/*
* TIPC debugging code
* TIPC sanity test macros
*/

#define assert(i) BUG_ON(!(i))

struct tipc_msg;
extern struct print_buf *const TIPC_NULL;
extern struct print_buf *const TIPC_CONS;
extern struct print_buf *const TIPC_LOG;
void tipc_msg_print(struct print_buf*,struct tipc_msg *,const char*);
void tipc_printf(struct print_buf *, const char *fmt, ...);
void tipc_dump(struct print_buf*,const char *fmt, ...);

#ifdef CONFIG_TIPC_DEBUG

/*
* TIPC debug support included:
* - system messages are printed to TIPC_OUTPUT print buffer
* - debug messages are printed to DBG_OUTPUT print buffer
* TIPC system monitoring code
*/

#define err(fmt, arg...) tipc_printf(TIPC_OUTPUT, KERN_ERR "TIPC: " fmt, ## arg)
#define warn(fmt, arg...) tipc_printf(TIPC_OUTPUT, KERN_WARNING "TIPC: " fmt, ## arg)
#define info(fmt, arg...) tipc_printf(TIPC_OUTPUT, KERN_NOTICE "TIPC: " fmt, ## arg)

#define dbg(fmt, arg...) do {if (DBG_OUTPUT != TIPC_NULL) tipc_printf(DBG_OUTPUT, fmt, ## arg);} while(0)
#define msg_dbg(msg, txt) do {if (DBG_OUTPUT != TIPC_NULL) tipc_msg_print(DBG_OUTPUT, msg, txt);} while(0)
#define dump(fmt, arg...) do {if (DBG_OUTPUT != TIPC_NULL) tipc_dump(DBG_OUTPUT, fmt, ##arg);} while(0)


/*
* By default, TIPC_OUTPUT is defined to be system console and TIPC log buffer,
* while DBG_OUTPUT is the null print buffer. These defaults can be changed
* here, or on a per .c file basis, by redefining these symbols. The following
* print buffer options are available:
* TIPC's print buffer subsystem supports the following print buffers:
*
* TIPC_NULL : null buffer (i.e. print nowhere)
* TIPC_CONS : system console
* TIPC_LOG : TIPC log buffer
* &buf : user-defined buffer (struct print_buf *)
* TIPC_NULL : null buffer (i.e. print nowhere)
* TIPC_CONS : system console
* TIPC_LOG : TIPC log buffer
* &buf : user-defined buffer (struct print_buf *)
*
* Note: TIPC_LOG is configured to echo its output to the system console;
* user-defined buffers can be configured to do the same thing.
*/

extern struct print_buf *const TIPC_NULL;
extern struct print_buf *const TIPC_CONS;
extern struct print_buf *const TIPC_LOG;

void tipc_printf(struct print_buf *, const char *fmt, ...);
void tipc_msg_print(struct print_buf *, struct tipc_msg *, const char *);
void tipc_dump(struct print_buf *, const char *fmt, ...);

/*
* TIPC_OUTPUT is the destination print buffer for system messages.
*/

#ifndef TIPC_OUTPUT
#define TIPC_OUTPUT TIPC_LOG
#endif

#ifndef DBG_OUTPUT
#define DBG_OUTPUT TIPC_NULL
#endif

#else

/*
* TIPC debug support not included:
* - system messages are printed to system console
* - debug messages are not printed
* TIPC can be configured to send system messages to TIPC_OUTPUT
* or to the system console only.
*/

#ifdef CONFIG_TIPC_DEBUG

#define err(fmt, arg...) tipc_printf(TIPC_OUTPUT, \
KERN_ERR "TIPC: " fmt, ## arg)
#define warn(fmt, arg...) tipc_printf(TIPC_OUTPUT, \
KERN_WARNING "TIPC: " fmt, ## arg)
#define info(fmt, arg...) tipc_printf(TIPC_OUTPUT, \
KERN_NOTICE "TIPC: " fmt, ## arg)

#else

#define err(fmt, arg...) printk(KERN_ERR "TIPC: " fmt , ## arg)
#define info(fmt, arg...) printk(KERN_INFO "TIPC: " fmt , ## arg)
#define warn(fmt, arg...) printk(KERN_WARNING "TIPC: " fmt , ## arg)

#define dbg(fmt, arg...) do {} while (0)
#define msg_dbg(msg,txt) do {} while (0)
#define dump(fmt,arg...) do {} while (0)
#endif

/*
* DBG_OUTPUT is the destination print buffer for debug messages.
* It defaults to the the null print buffer, but can be redefined
* (typically in the individual .c files being debugged) to allow
* selected debug messages to be generated where needed.
*/

#ifndef DBG_OUTPUT
#define DBG_OUTPUT TIPC_NULL
#endif

/*
* TIPC_OUTPUT is defined to be the system console, while DBG_OUTPUT is
* the null print buffer. Thes ensures that any system or debug messages
* that are generated without using the above macros are handled correctly.
* TIPC can be configured to send debug messages to the specified print buffer
* (typically DBG_OUTPUT) or to suppress them entirely.
*/

#undef TIPC_OUTPUT
#define TIPC_OUTPUT TIPC_CONS
#ifdef CONFIG_TIPC_DEBUG

#undef DBG_OUTPUT
#define DBG_OUTPUT TIPC_NULL
#define dbg(fmt, arg...) \
do { \
if (DBG_OUTPUT != TIPC_NULL) \
tipc_printf(DBG_OUTPUT, fmt, ## arg); \
} while (0)
#define msg_dbg(msg, txt) \
do { \
if (DBG_OUTPUT != TIPC_NULL) \
tipc_msg_print(DBG_OUTPUT, msg, txt); \
} while (0)
#define dump(fmt, arg...) \
do { \
if (DBG_OUTPUT != TIPC_NULL) \
tipc_dump(DBG_OUTPUT, fmt, ##arg); \
} while (0)

#else

#define dbg(fmt, arg...) do {} while (0)
#define msg_dbg(msg, txt) do {} while (0)
#define dump(fmt, arg...) do {} while (0)

#endif

Expand Down

0 comments on commit ba17f64

Please sign in to comment.