From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 5461E9A81 for ; Wed, 15 Jul 2015 15:11:52 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 15 Jul 2015 06:11:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,480,1432623600"; d="scan'208";a="747772134" Received: from sie-lab-212-170.ir.intel.com (HELO silpixa00378251.ir.intel.com) ([10.237.212.170]) by fmsmga001.fm.intel.com with ESMTP; 15 Jul 2015 06:11:51 -0700 From: Maryam Tahhan To: dev@dpdk.org Date: Wed, 15 Jul 2015 14:11:32 +0100 Message-Id: <1436965894-130019-8-git-send-email-maryam.tahhan@intel.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1436965894-130019-1-git-send-email-maryam.tahhan@intel.com> References: <1436965894-130019-1-git-send-email-maryam.tahhan@intel.com> Subject: [dpdk-dev] [PATCH v6 7/9] app: remove dump_cfg X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jul 2015 13:11:53 -0000 Remove the dump_cfg application, this will be replaced by a new app called proc_info that will implement the same functionality as dump_cfg and extend it to retrieve statistics for DPDK ports. Signed-off-by: Maryam Tahhan --- app/Makefile | 1 - app/dump_cfg/Makefile | 45 ------------------------- app/dump_cfg/main.c | 92 --------------------------------------------------- mk/rte.sdktest.mk | 1 - 4 files changed, 139 deletions(-) delete mode 100644 app/dump_cfg/Makefile delete mode 100644 app/dump_cfg/main.c diff --git a/app/Makefile b/app/Makefile index 50c670b..81bd222 100644 --- a/app/Makefile +++ b/app/Makefile @@ -36,6 +36,5 @@ DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline DIRS-$(CONFIG_RTE_TEST_PMD) += test-pmd DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_test -DIRS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += dump_cfg include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/app/dump_cfg/Makefile b/app/dump_cfg/Makefile deleted file mode 100644 index 3257127..0000000 --- a/app/dump_cfg/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# 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 $(RTE_SDK)/mk/rte.vars.mk - -APP = dump_cfg - -CFLAGS += $(WERROR_FLAGS) - -# all source are stored in SRCS-y - -SRCS-y := main.c - -# this application needs libraries first -DEPDIRS-y += lib - -include $(RTE_SDK)/mk/rte.app.mk diff --git a/app/dump_cfg/main.c b/app/dump_cfg/main.c deleted file mode 100644 index 127dbb1..0000000 --- a/app/dump_cfg/main.c +++ /dev/null @@ -1,92 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * 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 -#include -#include -#include -#include -#include - -int -main(int argc, char **argv) -{ - int ret; - int i; - char c_flag[] = "-c1"; - char n_flag[] = "-n4"; - char mp_flag[] = "--proc-type=secondary"; - char *argp[argc + 3]; - argp[0] = argv[0]; - argp[1] = c_flag; - argp[2] = n_flag; - argp[3] = mp_flag; - - for(i = 1; i < argc; i++) { - argp[i + 3] = argv[i]; - } - argc += 3; - - ret = rte_eal_init(argc, argp); - if (ret < 0) - rte_panic("Cannot init EAL\n"); - - printf("----------- MEMORY_SEGMENTS -----------\n"); - rte_dump_physmem_layout(stdout); - printf("--------- END_MEMORY_SEGMENTS ---------\n"); - - printf("------------ MEMORY_ZONES -------------\n"); - rte_memzone_dump(stdout); - printf("---------- END_MEMORY_ZONES -----------\n"); - - printf("------------- TAIL_QUEUES -------------\n"); - rte_dump_tailq(stdout); - printf("---------- END_TAIL_QUEUES ------------\n"); - - return 0; -} diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk index 2696142..60a4fd9 100644 --- a/mk/rte.sdktest.mk +++ b/mk/rte.sdktest.mk @@ -78,7 +78,6 @@ coverage: $(RTE_OUTPUT)/app/test \ $(RTE_TARGET) \ $(BLACKLIST) $(WHITELIST) ; \ - $(RTE_OUTPUT)/app/dump_cfg --file-prefix=ring_perf ; \ else \ echo "No test found, please do a 'make build' first, or specify O=" ;\ fi -- 2.4.3