Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove ISCSI_PERFTEST.
details: https://anonhg.NetBSD.org/src/rev/c95c725c2973
branches: trunk
changeset: 808716:c95c725c2973
user: joerg <joerg%NetBSD.org@localhost>
date: Sat May 30 18:00:09 2015 +0000
description:
Remove ISCSI_PERFTEST.
diffstat:
distrib/sets/lists/comp/mi | 4 +-
sys/dev/iscsi/Makefile | 2 +-
sys/dev/iscsi/files.iscsi | 4 +-
sys/dev/iscsi/iscsi_globals.h | 33 +-----
sys/dev/iscsi/iscsi_ioctl.c | 16 +--
sys/dev/iscsi/iscsi_main.c | 4 -
sys/dev/iscsi/iscsi_perf.h | 116 -------------------
sys/dev/iscsi/iscsi_profile.c | 251 ------------------------------------------
sys/dev/iscsi/iscsi_profile.h | 89 --------------
sys/dev/iscsi/iscsi_rcv.c | 6 +-
sys/dev/iscsi/iscsi_send.c | 23 +---
sys/dev/iscsi/iscsi_utils.c | 7 +-
sys/modules/iscsi/Makefile | 4 +-
13 files changed, 12 insertions(+), 547 deletions(-)
diffs (truncated from 822 to 300 lines):
diff -r d804570b8acb -r c95c725c2973 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Sat May 30 17:52:07 2015 +0000
+++ b/distrib/sets/lists/comp/mi Sat May 30 18:00:09 2015 +0000
@@ -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
diff -r d804570b8acb -r c95c725c2973 sys/dev/iscsi/Makefile
--- a/sys/dev/iscsi/Makefile Sat May 30 17:52:07 2015 +0000
+++ b/sys/dev/iscsi/Makefile Sat May 30 18:00:09 2015 +0000
@@ -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>
diff -r d804570b8acb -r c95c725c2973 sys/dev/iscsi/files.iscsi
--- a/sys/dev/iscsi/files.iscsi Sat May 30 17:52:07 2015 +0000
+++ b/sys/dev/iscsi/files.iscsi Sat May 30 18:00:09 2015 +0000
@@ -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
diff -r d804570b8acb -r c95c725c2973 sys/dev/iscsi/iscsi_globals.h
--- a/sys/dev/iscsi/iscsi_globals.h Sat May 30 17:52:07 2015 +0000
+++ b/sys/dev/iscsi/iscsi_globals.h Sat May 30 18:00:09 2015 +0000
@@ -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 @@
/* 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 @@
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_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 */
diff -r d804570b8acb -r c95c725c2973 sys/dev/iscsi/iscsi_ioctl.c
--- a/sys/dev/iscsi/iscsi_ioctl.c Sat May 30 17:52:07 2015 +0000
+++ b/sys/dev/iscsi/iscsi_ioctl.c Sat May 30 18:00:09 2015 +0000
@@ -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 @@
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;
diff -r d804570b8acb -r c95c725c2973 sys/dev/iscsi/iscsi_main.c
--- a/sys/dev/iscsi/iscsi_main.c Sat May 30 17:52:07 2015 +0000
+++ b/sys/dev/iscsi/iscsi_main.c Sat May 30 18:00:09 2015 +0000
@@ -44,10 +44,6 @@
int iscsi_debug_level = ISCSI_DEBUG;
#endif
-#if defined(ISCSI_PERFTEST)
-int iscsi_perf_level = 0;
-#endif
-
/* Device Structure */
iscsi_softc_t *sc = NULL;
diff -r d804570b8acb -r c95c725c2973 sys/dev/iscsi/iscsi_perf.h
--- a/sys/dev/iscsi/iscsi_perf.h Sat May 30 17:52:07 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/* $NetBSD: iscsi_perf.h,v 1.1 2011/10/23 21:15:02 agc Exp $ */
-
-/*-
- * Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-typedef enum
-{
- PERF_BEGIN_COMMAND, /* start of command */
- PERF_END_COMMAND, /* end of command */
- PERF_BEGIN_PDUWRITECMD, /* start of write of command PDU */
- PERF_END_PDUWRITECMD, /* end of write of command PDU */
- PERF_BEGIN_PDUWRITEDATA, /* start of first data PDU write (write only) */
- PERF_END_PDUWRITEDATA, /* end of last data PDU write */
- PERF_BEGIN_PDURCVDATA, /* start of first data PDU receive (read only) */
- PERF_END_PDURCVDATA, /* end of last data PDU receive */
- PERF_PDURCVSTS, /* receive of status PDU */
- PERF_NUM_PERFPOINTS
-} perfpoint_t;
-
-
-#define PERF_FLG_READ 0x10000000 /* this is a read command */
-#define PERF_FLG_NOWAIT 0x20000000 /* this command was non-waiting */
-#define PERF_FLG_COMPLETE 0x80000000 /* command completed */
-
-
-typedef struct
-{
- uint64_t pctr[PERF_NUM_PERFPOINTS];
- uint32_t datalen; /* data transfer size */
- uint32_t status; /* Result of command (lower 16 bits) + flags */
-} command_perf_t;
-
-
-/*
- Perfdata_Start:
- Allocates data buffer in driver with given number of command_perf
- elements. If a buffer of larger or equal size already exists, it is
- not reallocated.
- Resets indices and clears the buffer.
-
- Perfdata_Stop:
- Stops data collection, waits (up to 5 seconds) for completion.
- Returns the number of data points collected.
-*/
-
-typedef struct
-{
- int num_elements; /* start: IN number of elements to allocate */
- /* stop: OUT number of elements used */
- uint32_t status; /* out: status */
-} iscsi_perf_startstop_parameters_t;
-
-
-#define ISCSI_PERFDATA_START _IOWR (0, 90, iscsi_perf_startstop_parameters_t)
-#define ISCSI_PERFDATA_STOP _IOWR (0, 91, iscsi_perf_startstop_parameters_t)
-
-
-/*
- Perfdata_Get:
- Retrieves the current data. Note that this may be called while data
- collection is still active, it does not automatically stop collection.
- It will not reset collection or release any buffers.
-
- To determine the required buffer size, call with buffersize set to zero.
- In that case, no data is transferred, the buffersize field is set to the
- required size in bytes, and num_elements is set to the corresponding
- number of data points.
-
- If buffersize is nonzero, the number of data points that will fit into
- the buffer, or the number of data points collected so far, will be
- copied into the buffer, whichever is smallest. num_elements is set to
- the number of elements copied.
-
- ticks_per_100ms is the approximate conversion base to convert the CPU
- cycle counter values collected into time units. This value is determined
- by measuring the cycles for a delay(100) five times and taking the
- average.
-*/
-
-typedef struct
-{
- void *buffer; /* in: buffer pointer */
- uint32_t buffersize; /* in: size of buffer in bytes (0 to query size) */
- uint32_t status; /* out: status */
- int num_elements; /* out: number of elements written */
- uint64_t ticks_per_100us; /* out: ticks per 100 usec */
-} iscsi_perf_get_parameters_t;
-
-
-#define ISCSI_PERFDATA_GET _IOWR (0, 92, iscsi_perf_get_parameters_t)
diff -r d804570b8acb -r c95c725c2973 sys/dev/iscsi/iscsi_profile.c
--- a/sys/dev/iscsi/iscsi_profile.c Sat May 30 17:52:07 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,251 +0,0 @@
-/* $NetBSD: iscsi_profile.c,v 1.1 2011/10/23 21:15:02 agc Exp $ */
-
-/*-
- * Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Wasabi Systems, Inc.
- *
Home |
Main Index |
Thread Index |
Old Index