From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0067.outbound.protection.outlook.com [104.47.41.67]) by dpdk.org (Postfix) with ESMTP id EB7982B94 for ; Fri, 31 Mar 2017 07:23:35 +0200 (CEST) Received: from DM5PR03CA0005.namprd03.prod.outlook.com (10.175.104.15) by BL2PR03MB388.namprd03.prod.outlook.com (10.141.91.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14; Fri, 31 Mar 2017 05:23:31 +0000 Received: from BL2FFO11FD056.protection.gbl (2a01:111:f400:7c09::140) by DM5PR03CA0005.outlook.office365.com (2603:10b6:3:118::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10 via Frontend Transport; Fri, 31 Mar 2017 05:23:31 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD056.mail.protection.outlook.com (10.173.161.184) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Fri, 31 Mar 2017 05:23:31 +0000 Received: from Tophie.ap.freescale.net ([10.232.14.39]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v2V5NN2J013221; Thu, 30 Mar 2017 22:23:28 -0700 From: Shreyansh Jain To: CC: , , , , Shreyansh Jain Date: Fri, 31 Mar 2017 10:59:17 +0530 Message-ID: <1490938158-936-2-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490938158-936-1-git-send-email-shreyansh.jain@nxp.com> References: <1490004190-16892-1-git-send-email-shreyansh.jain@nxp.com> <1490938158-936-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131354114113622222; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39410400002)(39400400002)(39850400002)(39860400002)(39840400002)(39450400003)(39380400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(50226002)(48376002)(8936002)(50466002)(5003940100001)(189998001)(356003)(2906002)(305945005)(6916009)(5660300001)(81166006)(2351001)(105606002)(8676002)(106466001)(33646002)(77096006)(53936002)(2950100002)(8656002)(54906002)(6666003)(4326008)(104016004)(47776003)(110136004)(36756003)(86362001)(50986999)(85426001)(76176999)(575784001)(38730400002); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2PR03MB388; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD056; 1:ALym25+4gbbpVRVs1h3LZiWIYMSk8Qu46MdMNZrAnKJUL5SLyb7Wy+RXrVpC4O0bz6EUFkfb6NtPlEkihtBPyNLzLBsy4O7IXhmzWi+NenuacT3FXHUaALybEAlNlbcAs48iWiY6dZqDQo4LPbAS3gFUYDp/yOLym9/+OQl1XkoFktStyJaL2os+UothJgcmbclXvxYS0T5zvrL2KNj9FdkgJqou9jTHDxr6GsH2VVGT9nsOm1WBLSHbX32WRqCIIuMZydNRM9ukNMe3xT35C7o0mawQ7AvzNLCfd2ozAxKNpM1z0kJPngQrZ9Alv9NPkn4mHTgGriJzXlJD6w9eltlcHgbQFeEMAqEzf1bw3pZdpDBnBAvdqv4ScWuSTiVKFPrsqoiv6ds067GVwsELZBBOPdlTxVhTjjOfnr0JMIujTuatKhj/zhnl4kp03fReQi8TDHJvb2vcH6uAlNwNH/VBGuDHxKiFQ17/VHXSHsy0nORvavc0qX6ilxeF5MQvz3WDkDzYxik7l7F1vvExALqmifZjyzxyj1InBx/j40Vz26MU8F8oECjyza05N4bqpo0g2yjji3Q0GT2KkXj9u99ywITiKr1bOC7ojKR+dbCcK8alEHE3l8gFxR+W6d+1FG3Ugcqo8hsHWPXSYADh8New3y6PP9jiZ8GmfM8wq3VONuDbHeIShhanSXLUyBBaa98j2TznHbYtOfJg4TpmMasv0FSS055WVkWOSkJni2S2gshR4W3JVYcNDTGBIyQh MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: b7f2baba-e8f9-4a6d-ef6f-08d477f611fb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030255075)(201703131430075)(201703131517081); SRVR:BL2PR03MB388; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB388; 3:t5tIZ/XTVVjsG9falcAlAp5V9gVV0jep5ABc/ZwAdiDtpfq8G2hlHq8aihxd0jD4TSB/x9/OVg4jZGEMTL4WSKbtAU8hdcmBYHzDIj9illLrp5odr6M7gZ7E6iY8fzCcNaKz4YrTywmrdhsU17AZqoxrCNYWpfRKck7jE0J3zCheA4Rr8opsDyv0MaVoXW2hvaCdESTFucAS6EWRNiR22imCuOJO4HovVQgkw6mqPSOMJF55tZygEgUISOPp9BfA9g/TeLkqM7AMe2rBzcWdQDjfTozblX2O/f1niD6V9UFK2oDWm4uZhEbeNy6BLrMsj8NiL5qharlg9CaP0usHmCphFuBCIqM8gk+Vgp10FzMoPc0jxM1URH3x664d4n3COMR3fHJ5kC7fUpeoqO5IqY/vlSaWMz2MOYbgMw4dt8AA9d/rFj8gjwkt8cmOfzdT2ej4s5/1PKwrFXISn0DDPg==; 25:4cO5CJ1lXDHLyrmU2FSS4dI976QEAv+a5F+w8nUBZSkP2BAFoU/lffwiuNHqyB/vIO+rFxrex53aSlmL+wkdnEbSfKOSEqFd8VXiveVfkfWSR4hMKTplF5bto6ETr7hJmqU1ZxY83zU+MRtVkolxHRMivCCUGpxAuPL+leMetkz20ogrqF3okEOZ4tWG0svNNjmt8fJ6MTrG+rhoj6uH38vioGi5QRjfA6L4iXyZcuQ3OZoO/mLTGIi7IktKTQRbN804Dfaczp0NjAb/3z/vChVsJ6VPv/0gKrInHDgLdSaq1tDKhzQGFxUWneKWwM5ymnNozRw+OVkpG4iQ4ARHM+VAmg3e77ozar6cRCBr1TAmVgFfbajIRujw9gX7aRZ7KScuQdoDHY2gGPeUbdfg49JM1FbDDafDZDRXTiZxu88jaP/arBgMNpkkvXvEF4ntIU7nmkkQKh1W+TeoSf9Isw== X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB388; 31:I0oJPh5sGLwo68z5JGOFRVrDCXrbQUseqRHkbBjurIBcvQWlpwPRDnhanNOKdkd4fDJUSTxPYw4apsrm/ShC/FjJBiXQCf8CXWGmpD7zeNn/S+qgcw/8ob/R1TJw++oFw1MLyMGfUliDQsC0coPzKKDpW0cXvGjTC3nsf/GIpgWU9wLpvKxTqyQD4yC7bsYttwXGSYxfVrLC0T2KF46j3LDs1XKFE5FMiaQC0Yh0GgLAWzvbJTRGEDmXWrtacGANvHcrpC2s5ZO82Jufx/Q/Ow== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(5005006)(13015025)(13017025)(8121501046)(13018025)(13023025)(13024025)(93006089)(93001089)(3002001)(10201501046)(6055026)(6096035)(20161123565025)(20161123563025)(20161123556025)(201703131430075)(201703131448075)(201703131433075)(201703161259075)(20161123561025); SRVR:BL2PR03MB388; BCL:0; PCL:0; RULEID:(400006); SRVR:BL2PR03MB388; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB388; 4:TGGSVWfi+eBim3gFVoKe19o88Pe/1ANhSGb6ImSrppVel0xpQrKrXam0CxLLCSIF1ENWMUduw6LaUW0EYmNAwCqS1BVFW8bJVF/cDIGhyDCpV1MHY+rOIQmgTO7qyG892zTN8Y+AI+K9qdW93iW+g26bDJdH05cdizzwYy/ajj5PbYwut21ktpnNwrpO/BVvvdemynkUeJE1rH0UB7O0E9J9c08OyvuhwtwiEyFN6gANSMrjmBHFH5H7ip9bAOhGIokTrVGyRcQF86ah+JRvG619pN3xVi9xpk6fjoydfmoFk/V1pFRec83Z5tA1oqzA3maKtqF+JqKw4mU86awzz3QRSxf54EnKz4zZdRQzeUfFgqQWZ29BmDiexqvHg98oInDGz9hoS0HtDQAr+gSkmXc2thx9F42UBIBwUpClOjITSp+DkqZ48XPZvQAXRiZVKwsf1kG5BCZ1Vo7xhHpozsBWR/4WUBxtB6/linj1JbWV1DYj+EoorUmAES4ia1XqtgTu2fTEbT4/D4ERiEPMZCeBI6I71uaTMyomgp0aGq9c50jiYWYf+FIsFyFcUOLGjwaG0LqDGQS9dOlTn0T22/EvSBx4ko+fhoV6bzxXvCo2WZwocdLFuOkqB0ca1Cj6VewHekn4DWFraqL7Mb7KM5I/4WXa+4FODx8pUbp53nhve0BKilTBT1AjODZAfo8cZDt+fmi3tzpLfF9Ym+N/ijFZ6+qN7tUNcQbpXO5zIb6oC4em+SUSQIvoNJ89fXxPB1L/yBQ689LSNPoIljSSnukRKMYbJl4dWSmFacQSz/cIZTYixT0fka/YCimJAc6uyOmdgrpRCZJFquTzD7dqjJzIleZOVvaYO4S4rWPbaD9u+aGQZxHABKixl+Ilo7ZjvLRLPoQEkvEbolpUvwRYRg== X-Forefront-PRVS: 02638D901B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2PR03MB388; 23:lDbADzhCtPeNMxP76OOc/HrpliqOVKPtn7Q2QcPaBj?= =?us-ascii?Q?5R62Mn/qRWn4RuEk8nh2xkRB/MeGYOiX4VKVW2frthvGV4CRB4hI8O6WqwlH?= =?us-ascii?Q?x1AykCIrJzBFpfEhWyQnWAkXfnAZK8pPNW09GT9EsTP1Oe/bwNly4LJorUhf?= =?us-ascii?Q?OnPn+T+4xA1vY5wy0BU71EvZgU8RBPCZpES4rDalC6s/jowyd8lesDVAZm2l?= =?us-ascii?Q?ex/Pn0D/zI5hCgm/+cAcj5dVWF998H1uYbERbvaXFQi6GWS3s0nyQesW086Q?= =?us-ascii?Q?U40BpJH+JRRBxn/k9/fDlw1KVzsZhb8yFKakgZgV5BuqzgIv5xdP3w1e44fy?= =?us-ascii?Q?l6lxs6r5+EjZnTMCtwgK30XrQFBswo18xBjAfVvO4Whhi+X8hDIENyQ8Xqgt?= =?us-ascii?Q?eX1BYFZ/PKp2ICgqsqaECWP7fPt7I8RDw/TPEq1zWxhug8bwJ8aI8cT6Hbnf?= =?us-ascii?Q?ksvVoO0eJQmUuEfSmgl3vuFrPbyxBJVZbMCTMtJLiNEeU+u6i9IS0S/gfUg9?= =?us-ascii?Q?4X9nmDUmINbCTXHKDICoTBkMHrWUj0RO9frTabVppjQ9b3/6a/BBPKUGv/i7?= =?us-ascii?Q?bwTliXJ+hVyWdMR+3vMwMPHzJiCjZFbwjE//a5/zFuG0S3bs4BgzTC+G2R61?= =?us-ascii?Q?v06jWa9lYYNVjrR/FZ83Uu3yRUKq9Qr62YjXD6zYuQCWKD+A0OV77E1CU47P?= =?us-ascii?Q?EVqJ9EuXttLoEOtRjYb2shnmgOSyXiejCF4Nba60eLdWnwpsrK88PmL72vrr?= =?us-ascii?Q?faks4Y1wNb9YTHGeZCyH3goDUNBMzC8PY0jvOkaq1E+XL6oKvp9UQ1MGYDXs?= =?us-ascii?Q?7rtFa4LuXVRerKhVSSaEraeCo4Gm2pvNOvoKr+Fuof+AmjT6UsVvFd7i/Mia?= =?us-ascii?Q?dNVjyxzgYUELRaUbkm30I/AThAijkI/ki+D6TzCkY8n0pYqMHl0HDZYROgrf?= =?us-ascii?Q?Fe1uoQ3DESiEPRqlb+yTAmv+DglX9/cuXoG9ZYdfgqjETVMwkkbQS17wHDH1?= =?us-ascii?Q?aJaguOWt3JvA7oEewO9rFMzMwS9TZOwVuB1cnh9w80qXjDcYzeBXj+fWhsYo?= =?us-ascii?Q?FhasDw5VnyRp0uBTVgCq3IHRuanKxAnjW+PNCJ+C9sPxeUWHvcnh43CbFSrV?= =?us-ascii?Q?1j+F7ugP4OKfNzqZlOMhpNFL49VhgeBWBNr6S1t/3ZkIImZ3dENaBMHnCWyO?= =?us-ascii?Q?kA563VlQQjax0JQvxKQQjJ1vMhr1vcDFJvs9uNcvxtrdA+kfAjces+kE8nxr?= =?us-ascii?Q?mDNOY7QQHU+sPoTJE=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB388; 6:IV1Z94A9bEsjzy/7L+Q4Z8wWAo6vFV/z0gbMfuyogYDIbU/KrpzXZSTm4spcNFgNQQROCnfSh7PpxS8aYrpFhG/nlvJZ22gtDflaWh63ka3QRXZiy23kd/GhYFV5jyZmApu7ba23FHzdEpMLMKbpXLQ4DmvMdeLCbj7d2Zw/aGnrFaY3PLn3oABFTF3bwukefW7p7TKJCw84I7fkytFaZyW4F7xOOw3DV2hUxOwuDSyj4VHBHudBHCUub6KYMe6DawH1Dfiyr7Ojs62A1EAwQ0CgeumjPk/CbEc+4n64Rj6Nb918cvdWQ/3SkdntUkBArF9rCY0Lf7K/DuSDLhdvc6qXdu7fF2zsRGznPlbhUkRmY7OZbGTOAzSX9YBSlHWJloEiP4fYUX4277XgJ7LDfA==; 5:HRFI183BfPKXp3FnIWJUtf2xf/W2rWDEOxpO5dDKzga/drZEd6p/WJuObw3nTk2SiT2qLRDUSizFqSFtpPqLnE1PxYMJHm1uDZHsSR3gf2JyC6tT42gZ/DNuZH4ENbVf903KV1kWZkSUoiNhQbRksmvWxtB64X4c2jHkCB9hu7Wmgy3onj3z05KELW15fdmh; 24:AiSjwjfkTI5hPrKqcIH3gDAXz8t/dpycFiGX4PH1yb2CqA7SkLD9rQbMhdtgB0BXNW11E4lwEb4ubW4ErxtfEJmxamTBF/R57kW2A5hjmYI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB388; 7:WspCKAwS0Fxn69vFEKvBdsRag61KgoYLaG1Up8vAKhCqkK2eVwUIOvF0Teyugq92GlbV/lrc6TEaP1bKlqcO1dEhsuvNzTtKak06v2hVbUBC8OqWPKsQG2ydoduaUonjiq9L3SNRmlBBJkG2HrI5zT1gc9OHdZO5vul1TYY+vYVoKGHbS5Smx781k2rw1YGuNoGDGSWqlW6OL3j/Ingmmk3wa5X+YHicR+RB70hmMxsLbANhJ9dFk6f/qSVCWjJJ9+lZY41bgtSkPnY4k6WIARuwTO+5f2yv1cKz8JvYy3onbArdzK/8/tAmT1N3TD8ZeMX8O4WrQFE+qUJiWOpdng== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2017 05:23:31.1750 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB388 Subject: [dpdk-dev] [PATCH 2/3] mempool: introduce ring mempool driver 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: Fri, 31 Mar 2017 05:23:36 -0000 Moved from lib/librte_mempool, ring mempool is now an independent driver. Shared builds would now need to add librte_mempool_ring for: * ring_mp_mc * ring_sp_sc * ring_sp_mc * ring_mp_sc Signed-off-by: Shreyansh Jain --- MAINTAINERS | 1 + config/common_base | 5 +++ drivers/Makefile | 1 + drivers/mempool/Makefile | 39 ++++++++++++++++++ drivers/mempool/ring/Makefile | 48 ++++++++++++++++++++++ .../mempool/ring}/rte_mempool_ring.c | 0 drivers/mempool/ring/rte_mempool_ring_version.map | 4 ++ lib/librte_mempool/Makefile | 1 - mk/rte.app.mk | 1 + 9 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 drivers/mempool/Makefile create mode 100644 drivers/mempool/ring/Makefile rename {lib/librte_mempool => drivers/mempool/ring}/rte_mempool_ring.c (100%) create mode 100644 drivers/mempool/ring/rte_mempool_ring_version.map diff --git a/MAINTAINERS b/MAINTAINERS index 4cb6e49..403d0dd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -211,6 +211,7 @@ Core Libraries Memory pool M: Olivier Matz F: lib/librte_mempool/ +F: drivers/mempool/ring F: doc/guides/prog_guide/mempool_lib.rst F: test/test/test_mempool* F: test/test/test_func_reentrancy.c diff --git a/config/common_base b/config/common_base index 2d54ddf..9acd557 100644 --- a/config/common_base +++ b/config/common_base @@ -461,6 +461,11 @@ CONFIG_RTE_MEMPOOL_CACHE_MAX_SIZE=512 CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG=n # +# Compile Mempool drivers +# +CONFIG_RTE_DRIVER_MEMPOOL_RING=y + +# # Compile librte_mbuf # CONFIG_RTE_LIBRTE_MBUF=y diff --git a/drivers/Makefile b/drivers/Makefile index 81c03a8..193056b 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -31,6 +31,7 @@ include $(RTE_SDK)/mk/rte.vars.mk +DIRS-y += mempool DIRS-y += net DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto diff --git a/drivers/mempool/Makefile b/drivers/mempool/Makefile new file mode 100644 index 0000000..6a8a1da --- /dev/null +++ b/drivers/mempool/Makefile @@ -0,0 +1,39 @@ +# BSD LICENSE +# +# Copyright(c) 2017 NXP. 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 NXP 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 + +core-libs := librte_eal librte_mempool librte_ring + +DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += ring +DEPDIRS-ring = $(core-libs) + +include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/drivers/mempool/ring/Makefile b/drivers/mempool/ring/Makefile new file mode 100644 index 0000000..54630d9 --- /dev/null +++ b/drivers/mempool/ring/Makefile @@ -0,0 +1,48 @@ +# BSD LICENSE +# +# Copyright(c) 2017 NXP. +# 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 NXP 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 + +# +# library name +# +LIB = librte_mempool_ring.a + +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) + +EXPORT_MAP := rte_mempool_ring_version.map + +LIBABIVER := 1 + +SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += rte_mempool_ring.c + +include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_mempool/rte_mempool_ring.c b/drivers/mempool/ring/rte_mempool_ring.c similarity index 100% rename from lib/librte_mempool/rte_mempool_ring.c rename to drivers/mempool/ring/rte_mempool_ring.c diff --git a/drivers/mempool/ring/rte_mempool_ring_version.map b/drivers/mempool/ring/rte_mempool_ring_version.map new file mode 100644 index 0000000..8591cc0 --- /dev/null +++ b/drivers/mempool/ring/rte_mempool_ring_version.map @@ -0,0 +1,4 @@ +DPDK_17.05 { + + local: *; +}; diff --git a/lib/librte_mempool/Makefile b/lib/librte_mempool/Makefile index 96b6ca2..efd4383 100644 --- a/lib/librte_mempool/Makefile +++ b/lib/librte_mempool/Makefile @@ -43,7 +43,6 @@ LIBABIVER := 2 # all source are stored in SRCS-y SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool.c SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ops.c -SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_ring.c SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += rte_mempool_stack.c # install includes SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include := rte_mempool.h diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 62a2a1a..5ebb6ec 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -101,6 +101,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER) += -lrte_reorder ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) # plugins (link only if static libraries) +_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += -lrte_mempool_ring _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += -lrte_pmd_af_packet _LDLIBS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += -lrte_pmd_bnx2x -lz -- 2.7.4