Module Name: src
Committed By: joerg
Date: Sat May 30 18:00:09 UTC 2015
Modified Files:
src/distrib/sets/lists/comp: mi
src/sys/dev/iscsi: Makefile files.iscsi iscsi_globals.h iscsi_ioctl.c
iscsi_main.c iscsi_rcv.c iscsi_send.c iscsi_utils.c
src/sys/modules/iscsi: Makefile
Removed Files:
src/sys/dev/iscsi: iscsi_perf.h iscsi_profile.c iscsi_profile.h
Log Message:
Remove ISCSI_PERFTEST.
To generate a diff of this commit:
cvs rdiff -u -r1.1964 -r1.1965 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/iscsi/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/iscsi/files.iscsi
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/iscsi/iscsi_globals.h \
src/sys/dev/iscsi/iscsi_ioctl.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/iscsi/iscsi_main.c
cvs rdiff -u -r1.1 -r0 src/sys/dev/iscsi/iscsi_perf.h \
src/sys/dev/iscsi/iscsi_profile.c src/sys/dev/iscsi/iscsi_profile.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/iscsi/iscsi_rcv.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/iscsi/iscsi_send.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/iscsi/iscsi_utils.c
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/iscsi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1964 src/distrib/sets/lists/comp/mi:1.1965
--- src/distrib/sets/lists/comp/mi:1.1964 Sat May 30 16:12:33 2015
+++ src/distrib/sets/lists/comp/mi Sat May 30 18:00:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1964 2015/05/30 16:12:33 joerg Exp $
+# $NetBSD: mi,v 1.1965 2015/05/30 18:00:09 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -583,7 +583,7 @@
./usr/include/dev/isapnp/isapnpvar.h comp-obsolete obsolete
./usr/include/dev/iscsi/iscsi.h comp-c-include iscsi
./usr/include/dev/iscsi/iscsi_ioctl.h comp-c-include iscsi
-./usr/include/dev/iscsi/iscsi_perf.h comp-c-include iscsi
+./usr/include/dev/iscsi/iscsi_perf.h comp-obsolete obsolete
./usr/include/dev/iscsi/iscsi_test.h comp-obsolete obsolete
./usr/include/dev/keylock.h comp-c-include
./usr/include/dev/kttcpio.h comp-c-include
Index: src/sys/dev/iscsi/Makefile
diff -u src/sys/dev/iscsi/Makefile:1.2 src/sys/dev/iscsi/Makefile:1.3
--- src/sys/dev/iscsi/Makefile:1.2 Sat May 30 16:12:34 2015
+++ src/sys/dev/iscsi/Makefile Sat May 30 18:00:09 2015
@@ -2,6 +2,6 @@
INCSDIR= /usr/include/dev/iscsi
-INCS= iscsi.h iscsi_ioctl.h iscsi_perf.h
+INCS= iscsi.h iscsi_ioctl.h
.include <bsd.kinc.mk>
Index: src/sys/dev/iscsi/files.iscsi
diff -u src/sys/dev/iscsi/files.iscsi:1.4 src/sys/dev/iscsi/files.iscsi:1.5
--- src/sys/dev/iscsi/files.iscsi:1.4 Sat May 30 16:12:34 2015
+++ src/sys/dev/iscsi/files.iscsi Sat May 30 18:00:09 2015
@@ -1,16 +1,14 @@
-# $NetBSD: files.iscsi,v 1.4 2015/05/30 16:12:34 joerg Exp $
+# $NetBSD: files.iscsi,v 1.5 2015/05/30 18:00:09 joerg Exp $
#
# Configuration file for iSCSI initiator
defpseudodev iscsi : scsi
defparam ISCSI_DEBUG
-defflag ISCSI_PERFTEST
file dev/iscsi/base64.c iscsi
file dev/iscsi/iscsi_ioctl.c iscsi
file dev/iscsi/iscsi_main.c iscsi
-file dev/iscsi/iscsi_profile.c iscsi
file dev/iscsi/iscsi_rcv.c iscsi
file dev/iscsi/iscsi_send.c iscsi
file dev/iscsi/iscsi_text.c iscsi
Index: src/sys/dev/iscsi/iscsi_globals.h
diff -u src/sys/dev/iscsi/iscsi_globals.h:1.9 src/sys/dev/iscsi/iscsi_globals.h:1.10
--- src/sys/dev/iscsi/iscsi_globals.h:1.9 Sat May 30 16:12:34 2015
+++ src/sys/dev/iscsi/iscsi_globals.h Sat May 30 18:00:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_globals.h,v 1.9 2015/05/30 16:12:34 joerg Exp $ */
+/* $NetBSD: iscsi_globals.h,v 1.10 2015/05/30 18:00:09 joerg Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -60,8 +60,6 @@
/* #define ISCSI_DEBUG 1 */
-#include "iscsi_perf.h"
-
/* ------------------------- Global Constants ----------------------------- */
/* Version information */
@@ -234,12 +232,6 @@ struct pdu_s {
/* the ccb this PDU belongs to (if any) */
connection_t *connection;
/* the connection this PDU belongs to */
-
-#ifdef ISCSI_PERFTEST
- int perf_index;
- /* performance counter index */
- perfpoint_t perf_which; /* performance point */
-#endif
};
@@ -302,10 +294,6 @@ struct ccb_s {
int flags;
connection_t *connection; /* connection for CCB */
session_t *session; /* session for CCB */
-
-#ifdef ISCSI_PERFTEST
- int perf_index; /* performance counter index */
-#endif
};
@@ -532,29 +520,12 @@ extern uint8_t iscsi_InitiatorName[ISCSI
extern uint8_t iscsi_InitiatorAlias[ISCSI_STRING_LENGTH];
extern login_isid_t iscsi_InitiatorISID;
-/* Debugging and profiling stuff */
-
-#include "iscsi_profile.h"
+/* Debugging stuff */
#ifndef DDB
#define Debugger() panic("should call debugger here (iscsi.c)")
#endif /* ! DDB */
-#if defined(ISCSI_PERFTEST)
-
-extern int iscsi_perf_level; /* How much info to display */
-
-#define PDEBOUT(x) 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)
-#define PDEBC(conn,lev,x)
-#endif
-
#ifdef ISCSI_DEBUG
extern int iscsi_debug_level; /* How much debug info to display */
Index: src/sys/dev/iscsi/iscsi_ioctl.c
diff -u src/sys/dev/iscsi/iscsi_ioctl.c:1.9 src/sys/dev/iscsi/iscsi_ioctl.c:1.10
--- src/sys/dev/iscsi/iscsi_ioctl.c:1.9 Sat May 30 16:12:34 2015
+++ src/sys/dev/iscsi/iscsi_ioctl.c Sat May 30 18:00:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_ioctl.c,v 1.9 2015/05/30 16:12:34 joerg Exp $ */
+/* $NetBSD: iscsi_ioctl.c,v 1.10 2015/05/30 18:00:09 joerg Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -1657,20 +1657,6 @@ iscsiioctl(dev_t dev, u_long cmd, void *
check_event((iscsi_wait_event_parameters_t *) addr, FALSE);
break;
-#ifdef ISCSI_PERFTEST
- case ISCSI_PERFDATA_START:
- perf_start((iscsi_perf_startstop_parameters_t *) addr);
- break;
-
- case ISCSI_PERFDATA_STOP:
- perf_stop((iscsi_perf_startstop_parameters_t *) addr);
- break;
-
- case ISCSI_PERFDATA_GET:
- perf_get((iscsi_perf_get_parameters_t *) addr);
- break;
-#endif
-
default:
DEBOUT(("Invalid IO-Control Code\n"));
return ENOTTY;
Index: src/sys/dev/iscsi/iscsi_main.c
diff -u src/sys/dev/iscsi/iscsi_main.c:1.14 src/sys/dev/iscsi/iscsi_main.c:1.15
--- src/sys/dev/iscsi/iscsi_main.c:1.14 Fri May 15 18:28:36 2015
+++ src/sys/dev/iscsi/iscsi_main.c Sat May 30 18:00:09 2015
@@ -44,10 +44,6 @@ extern struct cfdriver iscsi_cd;
int iscsi_debug_level = ISCSI_DEBUG;
#endif
-#if defined(ISCSI_PERFTEST)
-int iscsi_perf_level = 0;
-#endif
-
/* Device Structure */
iscsi_softc_t *sc = NULL;
Index: src/sys/dev/iscsi/iscsi_rcv.c
diff -u src/sys/dev/iscsi/iscsi_rcv.c:1.8 src/sys/dev/iscsi/iscsi_rcv.c:1.9
--- src/sys/dev/iscsi/iscsi_rcv.c:1.8 Sat May 30 16:12:34 2015
+++ src/sys/dev/iscsi/iscsi_rcv.c Sat May 30 18:00:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_rcv.c,v 1.8 2015/05/30 16:12:34 joerg Exp $ */
+/* $NetBSD: iscsi_rcv.c,v 1.9 2015/05/30 18:00:09 joerg Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -698,8 +698,6 @@ receive_command_response_pdu(connection_
return -1;
}
- PERF_SNAP(req_ccb, PERF_PDURCVSTS);
-
if (req_ccb->pdu_waiting != NULL) {
SET_CCB_TIMEOUT(conn, req_ccb, COMMAND_TIMEOUT);
req_ccb->num_timeouts = 0;
@@ -1027,9 +1025,7 @@ receive_pdu(connection_t *conn, pdu_t *p
("Received Data in PDU - CCB = %p, Datalen = %d, Offset = %d\n",
req_ccb, dsl, offset));
- PERF_SNAPC(req_ccb, PERF_BEGIN_PDURCVDATA);
rc = read_pdu_data(pdu, req_ccb->data_ptr, offset);
- PERF_SNAP(req_ccb, PERF_END_PDURCVDATA);
} else {
rc = read_pdu_data(pdu, NULL, 0);
}
Index: src/sys/dev/iscsi/iscsi_send.c
diff -u src/sys/dev/iscsi/iscsi_send.c:1.12 src/sys/dev/iscsi/iscsi_send.c:1.13
--- src/sys/dev/iscsi/iscsi_send.c:1.12 Sat May 30 16:12:34 2015
+++ src/sys/dev/iscsi/iscsi_send.c Sat May 30 18:00:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_send.c,v 1.12 2015/05/30 16:12:34 joerg Exp $ */
+/* $NetBSD: iscsi_send.c,v 1.13 2015/05/30 18:00:09 joerg Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -300,8 +300,6 @@ iscsi_send_thread(void *par)
pdu->flags &= ~PDUF_INQUEUE;
splx(s);
- PERF_PDUSNAPB(pdu);
-
#ifdef ISCSI_DEBUG
if (!pdu->uio.uio_resid) {
DEBOUT(("uio.resid = 0 in iscsi_send_thread! pdu=%p\n",
@@ -318,7 +316,6 @@ iscsi_send_thread(void *par)
if (conn->HeaderDigest)
pdu->pdu.HeaderDigest = gen_digest(&pdu->pdu, BHS_SIZE);
my_soo_write(conn, &pdu->uio);
- PERF_PDUSNAPE(pdu);
if (pdu->disp <= PDUDISP_FREE) {
free_pdu(pdu);
@@ -1006,9 +1003,6 @@ snack_missing(connection_t *conn, ccb_t
pdu_t *ppdu;
pdu_header_t *pdu;
- PDEBC(conn, 1, ("SNACK Missing type = %d, BegRun %d RunLength %d\n",
- type, BegRun, RunLength));
-
ppdu = get_pdu(conn, TRUE);
if (ppdu == NULL)
return;
@@ -1047,8 +1041,6 @@ send_snack(connection_t *conn, pdu_t *rx
pdu_t *ppdu;
pdu_header_t *pdu;
- PDEBC(conn, 1, ("Send SNACK type = %d\n", type));
-
ppdu = get_pdu(conn, TRUE);
if (ppdu == NULL)
return;
@@ -1323,8 +1315,6 @@ send_data_out(connection_t *conn, pdu_t
pdu->p.data_out.BufferOffset = htonl(offs);
pdu->p.data_out.DataSN = htonl(sn);
- PERF_PDUSET(tx_pdu, tx_ccb, PERF_BEGIN_PDUWRITEDATA);
-
DEBC(conn, 10, ("Send DataOut: DataSN %d, len %d offs %x totlen %d\n",
sn, len, offs, totlen));
@@ -1358,8 +1348,6 @@ send_command(ccb_t *ccb, ccb_disp_t disp
pdu_header_t *pdu;
int s;
- PERF_BEGIN(ccb, !waitok);
-
s = splbio();
while (/*CONSTCOND*/ISCSI_THROTTLING_ENABLED &&
/*CONSTCOND*/!ISCSI_SERVER_TRUSTED &&
@@ -1370,8 +1358,6 @@ send_command(ccb_t *ccb, ccb_disp_t disp
ccb->flags |= CCBF_WAITING;
throttle_ccb(ccb, TRUE);
- PDEBOUT(("Throttling S - CmdSN = %d, MaxCmdSN = %d\n",
- sess->CmdSN, sess->MaxCmdSN));
if (!waitok) {
splx(s);
return;
@@ -1435,8 +1421,6 @@ send_command(ccb_t *ccb, ccb_disp_t disp
DEBC(conn, 10, ("Send Command: CmdSN %d, data_in %d, len %d, totlen %d\n",
ccb->CmdSN, ccb->data_in, len, totlen));
- PERF_PDUSET(ppdu, ccb, PERF_BEGIN_PDUWRITECMD);
-
setup_tx_uio(ppdu, len, ccb->data_ptr, ccb->data_in);
send_pdu(ccb, ppdu, (totlen) ? CCBDISP_DEFER : disp, PDUDISP_WAIT);
@@ -1601,9 +1585,6 @@ connection_timeout(void *par)
{
connection_t *conn = (connection_t *) par;
- PDEBC(conn, 1, ("Connection Timeout, num_timeouts=%d\n",
- conn->num_timeouts));
-
if (++conn->num_timeouts > MAX_CONN_TIMEOUTS)
handle_connection_error(conn, ISCSI_STATUS_TIMEOUT, NO_LOGOUT);
else {
@@ -1627,8 +1608,6 @@ ccb_timeout(void *par)
{
ccb_t *ccb = (ccb_t *) par;
connection_t *conn = ccb->connection;
- PDEBC(conn, 1, ("CCB Timeout, ccb=%x, num_timeouts=%d\n",
- (int) ccb, ccb->num_timeouts));
ccb->total_tries++;
Index: src/sys/dev/iscsi/iscsi_utils.c
diff -u src/sys/dev/iscsi/iscsi_utils.c:1.6 src/sys/dev/iscsi/iscsi_utils.c:1.7
--- src/sys/dev/iscsi/iscsi_utils.c:1.6 Fri May 15 16:24:30 2015
+++ src/sys/dev/iscsi/iscsi_utils.c Sat May 30 18:00:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_utils.c,v 1.6 2015/05/15 16:24:30 joerg Exp $ */
+/* $NetBSD: iscsi_utils.c,v 1.7 2015/05/30 18:00:09 joerg Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2008 The NetBSD Foundation, Inc.
@@ -233,7 +233,6 @@ get_ccb(connection_t *conn, bool waitok)
if (!waitok || conn->terminating) {
return NULL;
}
- PDEBOUT(("Waiting for CCB!\n"));
tsleep(&sess->ccb_pool, PWAIT, "get_ccb", 0);
}
} while (ccb == NULL);
@@ -409,8 +408,6 @@ wake_ccb(ccb_t *ccb, uint32_t status)
ccb->status = status;
splx(s);
- PERF_END(ccb);
-
switch (disp) {
case CCBDISP_FREE:
free_ccb(ccb);
@@ -467,7 +464,6 @@ get_pdu(connection_t *conn, bool waitok)
if (pdu == NULL) {
if (!waitok || conn->terminating)
return NULL;
- PDEBOUT(("Waiting for PDU!\n"));
tsleep(&conn->pdu_pool, PWAIT, "get_pdu_c", 0);
}
} while (pdu == NULL);
@@ -595,7 +591,6 @@ add_sernum(sernum_buffer_t *buff, uint32
diff = (num - n) + 1;
if (diff <= 0) {
- PDEB(1, ("Rx Duplicate Block: SN %u < Next SN %u\n", num, n));
return 0; /* ignore if SN is smaller than expected (dup or retransmit) */
}
Index: src/sys/modules/iscsi/Makefile
diff -u src/sys/modules/iscsi/Makefile:1.2 src/sys/modules/iscsi/Makefile:1.3
--- src/sys/modules/iscsi/Makefile:1.2 Sat May 30 16:12:34 2015
+++ src/sys/modules/iscsi/Makefile Sat May 30 18:00:09 2015
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2015/05/30 16:12:34 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2015/05/30 18:00:09 joerg Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev/iscsi
KMOD= iscsi
-SRCS= base64.c iscsi_ioctl.c iscsi_main.c iscsi_profile.c iscsi_rcv.c
+SRCS= base64.c iscsi_ioctl.c iscsi_main.c iscsi_rcv.c
SRCS+= iscsi_send.c iscsi_text.c iscsi_utils.c
.include <bsd.kmodule.mk>
