OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PKTGEN]: use pr_debug 

Remove private debug macro and replace with standard version

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Robert Olsson <robert.olsson@its.uu.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2007-03-04 16:06:47 -08:00 committed by David S. Miller
parent fa438ccfdf
commit 25c4e53a4c
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
net/core/pktgen.c
View File

@ -164,9 +164,6 @@
#define VERSION "pktgen v2.68: Packet Generator for packet performance testing.\n" #define VERSION "pktgen v2.68: Packet Generator for packet performance testing.\n"
/* #define PG_DEBUG(a) a */
#define PG_DEBUG(a)
/* The buckets are exponential in 'width' */ /* The buckets are exponential in 'width' */
#define LAT_BUCKETS_MAX 32 #define LAT_BUCKETS_MAX 32
#define IP_NAME_SZ 32 #define IP_NAME_SZ 32
@ -1857,8 +1854,7 @@ static int pktgen_mark_device(const char *ifname)
int ret = 0; int ret = 0;
mutex_lock(&pktgen_thread_lock); mutex_lock(&pktgen_thread_lock);
PG_DEBUG(printk("pktgen: pktgen_mark_device marking %s for removal\n", pr_debug("pktgen: pktgen_mark_device marking %s for removal\n", ifname);
ifname));
while (1) { while (1) {
@ -1867,8 +1863,8 @@ static int pktgen_mark_device(const char *ifname)
break; /* success */ break; /* success */
mutex_unlock(&pktgen_thread_lock); mutex_unlock(&pktgen_thread_lock);
PG_DEBUG(printk("pktgen: pktgen_mark_device waiting for %s " pr_debug("pktgen: pktgen_mark_device waiting for %s "
"to disappear....\n", ifname)); "to disappear....\n", ifname);
schedule_timeout_interruptible(msecs_to_jiffies(msec_per_try)); schedule_timeout_interruptible(msecs_to_jiffies(msec_per_try));
mutex_lock(&pktgen_thread_lock); mutex_lock(&pktgen_thread_lock);
@ -2848,7 +2844,7 @@ static void pktgen_run(struct pktgen_thread *t)
struct pktgen_dev *pkt_dev; struct pktgen_dev *pkt_dev;
int started = 0; int started = 0;
PG_DEBUG(printk("pktgen: entering pktgen_run. %p\n", t)); pr_debug("pktgen: entering pktgen_run. %p\n", t);
if_lock(t); if_lock(t);
list_for_each_entry(pkt_dev, &t->if_list, list) { list_for_each_entry(pkt_dev, &t->if_list, list) {
@ -2880,7 +2876,7 @@ static void pktgen_stop_all_threads_ifs(void)
{ {
struct pktgen_thread *t; struct pktgen_thread *t;
PG_DEBUG(printk("pktgen: entering pktgen_stop_all_threads_ifs.\n")); pr_debug("pktgen: entering pktgen_stop_all_threads_ifs.\n");
mutex_lock(&pktgen_thread_lock); mutex_lock(&pktgen_thread_lock);
@ -2948,7 +2944,7 @@ static void pktgen_run_all_threads(void)
{ {
struct pktgen_thread *t; struct pktgen_thread *t;
PG_DEBUG(printk("pktgen: entering pktgen_run_all_threads.\n")); pr_debug("pktgen: entering pktgen_run_all_threads.\n");
mutex_lock(&pktgen_thread_lock); mutex_lock(&pktgen_thread_lock);
@ -3040,7 +3036,7 @@ static void pktgen_stop(struct pktgen_thread *t)
{ {
struct pktgen_dev *pkt_dev; struct pktgen_dev *pkt_dev;
PG_DEBUG(printk("pktgen: entering pktgen_stop\n")); pr_debug("pktgen: entering pktgen_stop\n");
if_lock(t); if_lock(t);
@ -3064,7 +3060,7 @@ static void pktgen_rem_one_if(struct pktgen_thread *t)
struct list_head *q, *n; struct list_head *q, *n;
struct pktgen_dev *cur; struct pktgen_dev *cur;
PG_DEBUG(printk("pktgen: entering pktgen_rem_one_if\n")); pr_debug("pktgen: entering pktgen_rem_one_if\n");
if_lock(t); if_lock(t);
@ -3093,7 +3089,7 @@ static void pktgen_rem_all_ifs(struct pktgen_thread *t)
/* Remove all devices, free mem */ /* Remove all devices, free mem */
PG_DEBUG(printk("pktgen: entering pktgen_rem_all_ifs\n")); pr_debug("pktgen: entering pktgen_rem_all_ifs\n");
if_lock(t); if_lock(t);
list_for_each_safe(q, n, &t->if_list) { list_for_each_safe(q, n, &t->if_list) {
@ -3276,7 +3272,7 @@ static int pktgen_thread_worker(void *arg)
t->pid = current->pid; t->pid = current->pid;
PG_DEBUG(printk("pktgen: starting pktgen/%d: pid=%d\n", cpu, current->pid)); pr_debug("pktgen: starting pktgen/%d: pid=%d\n", cpu, current->pid);
max_before_softirq = t->max_before_softirq; max_before_softirq = t->max_before_softirq;
@ -3339,13 +3335,13 @@ static int pktgen_thread_worker(void *arg)
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
} }
PG_DEBUG(printk("pktgen: %s stopping all device\n", t->tsk->comm)); pr_debug("pktgen: %s stopping all device\n", t->tsk->comm);
pktgen_stop(t); pktgen_stop(t);
PG_DEBUG(printk("pktgen: %s removing all device\n", t->tsk->comm)); pr_debug("pktgen: %s removing all device\n", t->tsk->comm);
pktgen_rem_all_ifs(t); pktgen_rem_all_ifs(t);
PG_DEBUG(printk("pktgen: %s removing thread.\n", t->tsk->comm)); pr_debug("pktgen: %s removing thread.\n", t->tsk->comm);
pktgen_rem_thread(t); pktgen_rem_thread(t);
return 0; return 0;
@ -3364,7 +3360,7 @@ static struct pktgen_dev *pktgen_find_dev(struct pktgen_thread *t,
} }
if_unlock(t); if_unlock(t);
PG_DEBUG(printk("pktgen: find_dev(%s) returning %p\n", ifname, pkt_dev)); pr_debug("pktgen: find_dev(%s) returning %p\n", ifname, pkt_dev);
return pkt_dev; return pkt_dev;
} }
@ -3533,7 +3529,7 @@ static int pktgen_remove_device(struct pktgen_thread *t,
struct pktgen_dev *pkt_dev) struct pktgen_dev *pkt_dev)
{ {
PG_DEBUG(printk("pktgen: remove_device pkt_dev=%p\n", pkt_dev)); pr_debug("pktgen: remove_device pkt_dev=%p\n", pkt_dev);
if (pkt_dev->running) { if (pkt_dev->running) {
printk("pktgen:WARNING: trying to remove a running interface, stopping it now.\n"); printk("pktgen:WARNING: trying to remove a running interface, stopping it now.\n");