Module Name: src
Committed By: mlelstv
Date: Sat Jun 2 16:52:11 UTC 2012
Modified Files:
src/sys/dev/iscsi: iscsi_globals.h iscsi_main.c
Log Message:
avoid namespace pollution when debugging
don't panic when printing data for a dead (NULL) connection
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/iscsi/iscsi_globals.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/iscsi/iscsi_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/iscsi/iscsi_globals.h
diff -u src/sys/dev/iscsi/iscsi_globals.h:1.2 src/sys/dev/iscsi/iscsi_globals.h:1.3
--- src/sys/dev/iscsi/iscsi_globals.h:1.2 Tue Nov 29 03:50:31 2011
+++ src/sys/dev/iscsi/iscsi_globals.h Sat Jun 2 16:52:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_globals.h,v 1.2 2011/11/29 03:50:31 tls Exp $ */
+/* $NetBSD: iscsi_globals.h,v 1.3 2012/06/02 16:52:11 mlelstv Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -564,12 +564,13 @@ login_isid_t InitiatorISID;
#if defined(ISCSI_PERFTEST)
-int perf_level; /* How much info to display */
+int iscsi_perf_level; /* How much info to display */
#define PDEBOUT(x) printf x
-#define PDEB(lev,x) { if (perf_level >= lev) printf x ;}
-#define PDEBC(conn,lev,x) { { if (perf_level >= lev) printf("S%dC%d: ", \
- conn->session->id, conn->id); printf x ;}}
+#define PDEB(lev,x) { if (iscsi_perf_level >= lev) printf x ;}
+#define PDEBC(conn,lev,x) { if (iscsi_perf_level >= lev) { printf("S%dC%d: ", \
+ conn ? conn->session->id : -1, \
+ conn ? conn->id : -1); printf x ;}}
#else
#define PDEBOUT(x)
#define PDEB(lev,x)
@@ -578,12 +579,13 @@ int perf_level; /* How much info to d
#ifdef ISCSI_DEBUG
-int debug_level; /* How much debug info to display */
+int iscsi_debug_level; /* How much debug info to display */
#define DEBOUT(x) printf x
-#define DEB(lev,x) { if (debug_level >= lev) printf x ;}
-#define DEBC(conn,lev,x) { if (debug_level >= lev) { printf("S%dC%d: ", \
- conn->session->id, conn->id); printf x ;}}
+#define DEB(lev,x) { if (iscsi_debug_level >= lev) printf x ;}
+#define DEBC(conn,lev,x) { if (iscsi_debug_level >= lev) { printf("S%dC%d: ", \
+ conn ? conn->session->id : -1, \
+ conn ? conn->id : -1); printf x ;}}
void dump(void *buf, int len);
#define STATIC static
Index: src/sys/dev/iscsi/iscsi_main.c
diff -u src/sys/dev/iscsi/iscsi_main.c:1.3 src/sys/dev/iscsi/iscsi_main.c:1.4
--- src/sys/dev/iscsi/iscsi_main.c:1.3 Mon May 28 04:18:12 2012
+++ src/sys/dev/iscsi/iscsi_main.c Sat Jun 2 16:52:11 2012
@@ -41,11 +41,11 @@
extern struct cfdriver iscsi_cd;
#if defined(ISCSI_DEBUG)
-int debug_level = ISCSI_DEBUG;
+int iscsi_debug_level = ISCSI_DEBUG;
#endif
#if defined(ISCSI_PERFTEST)
-int perf_level = 0;
+int iscsi_perf_level = 0;
#endif
/* Device Structure */
