From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by dpdk.org (Postfix) with ESMTP id 644121B00C for ; Wed, 24 Jan 2018 12:53:47 +0100 (CET) Received: by mail-lf0-f65.google.com with SMTP id o89so4859425lfg.10 for ; Wed, 24 Jan 2018 03:53:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=ASFwEVK7eaQszp6NOXm/4oqE26JDnru24/3TNRiImJA=; b=p3cJWGPbbtzkF+CBU4f/Z/lAbFXHq0TJ1nRF3ajahltO+lPGV8UPVWbhB4WBANz6MQ z74Er1JKhyQy74sjV3HvYvEnq+NjR/GtjZgUadcp9ZxavxsVbzzJRCB8qKRRzT9+glEL BMiA9CLnKYBVBRbor8kcyXlzRORRlMWRGKLQTHVU1hR84j5n67yaKJESC1V1pZGVn5RQ ocoYxmh6Y81cgBDtU7/rBv+gjfdIUn7j2JdcFc0TVcXVghftXyPppbsxdPzNLFEnEpb5 NKXVll4V0kivEn+0+EHeGQctFyi3XH9yLpsQYYsE2fU00nkHY5+Nq4v6JTTBXBmOrGaB N9Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=ASFwEVK7eaQszp6NOXm/4oqE26JDnru24/3TNRiImJA=; b=KEm11dya5J03eAI56J0PlxojiMYs4VlBQWedLbdcyg1SBxPVWI05l9ZnkmnUm/76us wwer7AtwKxPRnb4n6phiuQUP3tbGW7SVQYIH31f+zNJ42EDYvUGLCm80GnIsLQ0k43ZM NCdr+Pznapuwk+HXp2WDa3/wjmRsUF++TcRM7z5Ebfs8N1xUEBX5YsDnD9iBRLQV1mT7 MXYeJMS10uwQrlKippsiffXXwgbyghTV2nA5pfnzvdO/T5EFtj3PAlPO+KQAeO7jGxaz kVxiVy6hutGHocIC+ABj4FUKRJ6W8tqzey3tEOpae+p//aWLhY2uoFmKwXb1bgCXsw1g qKuQ== X-Gm-Message-State: AKwxytdNlqqi0GZYBcSbVxTdx8gANYS5fo777OtpLvzQMj2vxws0XmBs Das3Ni337AERznxWZ1m5k88= X-Google-Smtp-Source: AH8x226ibBe9cHD/0HsqiPLaYTp2+7dD/tP3/4RxqoG0+/kPV91sjtsPUyhxG5fpretlJct9Q/0wYg== X-Received: by 10.25.228.146 with SMTP id x18mr3244784lfi.115.1516794826634; Wed, 24 Jan 2018 03:53:46 -0800 (PST) Received: from gunner.sics.se ([2001:6b0:3a:1:8944:d31d:719e:1a9e]) by smtp.gmail.com with ESMTPSA id b68sm540847lfe.67.2018.01.24.03.53.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Jan 2018 03:53:45 -0800 (PST) Sender: george.dit@gmail.com From: "Georgios P. Katsikas" To: wenzhuo.lu@intel.com, jingjing.wu@intel.com Cc: dev@dpdk.org, Georgios Katsikas Date: Wed, 24 Jan 2018 12:53:36 +0100 Message-Id: <1516794816-12588-1-git-send-email-katsikas.gp@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-dev] [PATCH] app/testpmd: move variables definition in source X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jan 2018 11:53:47 -0000 From: Georgios Katsikas This patch moves the definition of 3 variables in testpmd.h into the respective .c file. The idea behind this move is to allow external applications to compile against testpmd without throwing compilation errors related to multiple definition of variables. Also, an extern dcb_q_mapping in testpmd.h is removed since it appears that this variable is not defined elsewhere in the tree. Signed-off-by: Georgios Katsikas --- app/test-pmd/testpmd.c | 18 ++++++++++++++++++ app/test-pmd/testpmd.h | 7 +++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 5dc8cca..02e8787 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -91,6 +91,24 @@ uint8_t socket_num = UMA_NO_CONFIG; uint8_t mp_anon = 0; /* + * Store specified sockets on which memory pool to be used by ports + * is allocated. + */ +uint8_t port_numa[RTE_MAX_ETHPORTS]; + +/* + * Store specified sockets on which RX ring to be used by ports + * is allocated. + */ +uint8_t rxring_numa[RTE_MAX_ETHPORTS]; + +/* + * Store specified sockets on which TX ring to be used by ports + * is allocated. + */ +uint8_t txring_numa[RTE_MAX_ETHPORTS]; + +/* * Record the Ethernet address of peer target ports to which packets are * forwarded. * Must be instantiated with the ethernet addresses of peer traffic generator diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 47f8fa8..153abea 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -329,19 +329,19 @@ extern uint32_t bypass_timeout; /**< Store the NIC bypass watchdog timeout */ * Store specified sockets on which memory pool to be used by ports * is allocated. */ -uint8_t port_numa[RTE_MAX_ETHPORTS]; +extern uint8_t port_numa[RTE_MAX_ETHPORTS]; /* * Store specified sockets on which RX ring to be used by ports * is allocated. */ -uint8_t rxring_numa[RTE_MAX_ETHPORTS]; +extern uint8_t rxring_numa[RTE_MAX_ETHPORTS]; /* * Store specified sockets on which TX ring to be used by ports * is allocated. */ -uint8_t txring_numa[RTE_MAX_ETHPORTS]; +extern uint8_t txring_numa[RTE_MAX_ETHPORTS]; extern uint8_t socket_num; @@ -384,7 +384,6 @@ extern int16_t tx_rs_thresh; extern uint8_t dcb_config; extern uint8_t dcb_test; -extern enum dcb_queue_mapping_mode dcb_q_mapping; extern uint16_t mbuf_data_size; /**< Mbuf data space size. */ extern uint32_t param_total_num_mbufs; -- 2.7.4