From 467ea9e0a8acdc43a9ec6d5f389189194d975b58 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 16 Aug 2016 13:18:56 -0700 Subject: [PATCH] iscsi: add 'iscsi_top' monitoring app Change-Id: Ief4efbc45f81ec59c75de28be701778e403b9f67 Signed-off-by: Daniel Verkamp --- app/Makefile | 1 + app/iscsi_top/.gitignore | 1 + app/iscsi_top/Makefile | 51 +++++++ app/iscsi_top/iscsi_top.cpp | 257 ++++++++++++++++++++++++++++++++++++ 4 files changed, 310 insertions(+) create mode 100644 app/iscsi_top/.gitignore create mode 100644 app/iscsi_top/Makefile create mode 100644 app/iscsi_top/iscsi_top.cpp diff --git a/app/Makefile b/app/Makefile index 585249201..e5698ce41 100644 --- a/app/Makefile +++ b/app/Makefile @@ -36,6 +36,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y += trace DIRS-y += nvmf_tgt +DIRS-y += iscsi_top ifeq ($(OS),Linux) DIRS-y += iscsi_tgt endif diff --git a/app/iscsi_top/.gitignore b/app/iscsi_top/.gitignore new file mode 100644 index 000000000..7d90ff343 --- /dev/null +++ b/app/iscsi_top/.gitignore @@ -0,0 +1 @@ +iscsi_top diff --git a/app/iscsi_top/Makefile b/app/iscsi_top/Makefile new file mode 100644 index 000000000..50bdbb429 --- /dev/null +++ b/app/iscsi_top/Makefile @@ -0,0 +1,51 @@ +# +# BSD LICENSE +# +# Copyright (c) Intel Corporation. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * 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. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT +# OWNER 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. +# + +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) +include $(SPDK_ROOT_DIR)/mk/spdk.common.mk + +CXXFLAGS += $(DPDK_INC) +CXXFLAGS += -I$(SPDK_ROOT_DIR)/lib +CXX_SRCS = iscsi_top.cpp + +APP = iscsi_top + +all: $(APP) + +$(APP) : $(OBJS) + $(LINK_CXX) + +clean: + $(CLEAN_C) $(APP) + +include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk diff --git a/app/iscsi_top/iscsi_top.cpp b/app/iscsi_top/iscsi_top.cpp new file mode 100644 index 000000000..38f40e973 --- /dev/null +++ b/app/iscsi_top/iscsi_top.cpp @@ -0,0 +1,257 @@ +/*- + * BSD LICENSE + * + * Copyright (c) Intel Corporation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +extern "C" { +#include "spdk/trace.h" +#include "iscsi/conn.h" +} + +static char *exe_name; +static int g_instance_id = 0; + +static void usage(void) +{ + fprintf(stderr, "usage:\n"); + fprintf(stderr, " %s