From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0083.outbound.protection.outlook.com [104.47.38.83]) by dpdk.org (Postfix) with ESMTP id 63EA82B91 for ; Fri, 31 Mar 2017 07:29:52 +0200 (CEST) Received: from BN3PR0301CA0050.namprd03.prod.outlook.com (10.160.152.146) by BY2PR03MB396.namprd03.prod.outlook.com (10.141.141.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Fri, 31 Mar 2017 05:29:50 +0000 Received: from BN1BFFO11FD015.protection.gbl (2a01:111:f400:7c10::1:138) by BN3PR0301CA0050.outlook.office365.com (2a01:111:e400:401e::18) 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:29:50 +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 BN1BFFO11FD015.mail.protection.outlook.com (10.58.144.78) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1005.5 via Frontend Transport; Fri, 31 Mar 2017 05:29:50 +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 v2V5Thlc017482; Thu, 30 Mar 2017 22:29:47 -0700 From: Shreyansh Jain To: CC: , , , , Shreyansh Jain Date: Fri, 31 Mar 2017 11:05:36 +0530 Message-ID: <1490938537-1177-2-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490938537-1177-1-git-send-email-shreyansh.jain@nxp.com> References: <11490938158-936-1-git-send-email-shreyansh.jain@nxp.com> <1490938537-1177-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131354117903847454; (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)(39840400002)(39860400002)(39380400002)(39850400002)(39400400002)(39450400003)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(9170700003)(575784001)(86362001)(47776003)(50226002)(4326008)(8936002)(85426001)(48376002)(38730400002)(2906002)(356003)(110136004)(8656002)(5660300001)(54906002)(305945005)(50466002)(81166006)(6916009)(5003940100001)(33646002)(77096006)(53936002)(8676002)(6666003)(2950100002)(36756003)(2351001)(104016004)(105606002)(189998001)(50986999)(76176999)(106466001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB396; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD015; 1:QkJHNrpmsfLnSOrtZEGy7VVWYrWuLmO+wn8EZn89adUY7uhsIzKLudmjp1SBWnakGckdT/8bLVUl+ZJ6QWlppHSxChEeZ9QIUMdOTykPAl3ffBBYsDz6o25h+7sUzksTA3c5WdNtraDmqgNxb/k+Bz7R0dwXgvDh1khPvKe0l4syxkAQZU2LJ12/JG51JQ8nooYqhq94JjOntQ5UtMZLXMrOASsiCvJzW53NP41dKJrj4fbfcDixX65YNI7qQlaAqd1VpZz4CY0ylL8vL+f60f8/fhLnuvcKlpt4KosBOBL1Jwj3PEJ5apV6rQs7q54+xM0eDiaaIswDD9ovwfDvDKLpbronlhAggGjMcuwqY3RFF4X+W0cKV2nHke3sMM8ZYOupNNGBKFqsRjZYqnsjfUnnUdEgLranwWxm/l00i6engpF6TXGwPah4IkYyNjjNd3C8R85a6ENapTb7/M/kQpk7eGB4O4QHSRQMxqiUB9wFRaeENCTSbI2Wrb+DJlaom5IM3NL0caJcrvW6MKNwTuOZjUN7DtxMRu6wq6bgrlKNt70sOHDAbQ6VHogaqrTvuz+XM1JfKr7UIxHSRMsrUP+l9TSkzaCX1n/LWhoa0Oj4cJr+5dEKeTMye1oVyG7okoyojZp0oZlwwONirfFNNgS1S/eXHjtnsAwMbJ8onUc8UcBoIEleekFfPYtu3lR55ev7Ys8pbXmUjeamD32MikE5z/Bqm0e01ReyXxOA5B8ByJRJB4nIXVL8/mYkWhyDnhtEBWLa3r9q+c8KXNxm/w== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: db0f3a59-59ca-4571-cd80-08d477f6f3e3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030255075)(201703131430075)(201703131517081); SRVR:BY2PR03MB396; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB396; 3:ImmrKWEG900GDiehb4ur3i2TbxZH8wkc2+RVHzPbHQjliJEMxmMvKtgAk5Z9nf1yTEvADY6EWrhgSVKlq4FEmUUXkQPM2w5ke5J7LDtZhB0sZ2wSDE9nDlPlOIcY2NqiSwS2zz3e+/8tP9zdt62TFT3Vc0WQORu1dn7jnVXTzNyKEsJcAsnlPKzvNEgFnhTDPFlcX01P7RDhbrO7fhI7xGA4UCbmeGBOynjG24ZRSgjf1vsC7t93mul0Huml0mGEomWkq1B3I6S3H/aC0VIfCxlRTYFNjZ/gX2WeHqXiT61lyToia1dorRh+OwIxVWs1oHAZ3DdOSVqZqISaCr90v52w2CAyxMmokNyj+TNz8lfIa4CVmwGtE/AWPZTWO69E7h/leByt85KXT2ubrkfgrKkuve47xWlvBk3+jFzVA8Pu4RWdaGhVLsfdOI4eFsr50ZzDDXL4By0j8eVdMl2pcA==; 25:eTku02M2h9DwmjQITzG0gDxuqvb5uuUkmppfyn6+QD4SqfTY9Tfprsz+BJ1ub3GjevAqa3Ynvuvg1Y2zNqC1PfzB/vAmIbnJSeHU61raXNHnSlkuDgZdQhrhzYiIwoUv1j6UI/WT5YaRZIHIB8ctImD8HtVB/N+IXXGuC/s1ZmqW1aKzIgox4wmXMY1VGfXg3tEFEhnbHcAcuaSH3YJ4RUZNtruHpQ90gwxYwleNdTs6ocsusnf2fIduGAEK3Jdcdl5rlhWfMeahR1KxUuToUDqyuxcmg6snrNIIaiAJ5AGntAqx/Ao2NKkKTp9h/HxQ1K61q/3l2GhDm1699iAOa2dcK6n3PfBwjtmdqr59vMU37kbsceEUSkaDBnamhxGXqjah6+U0LL0YsN/jC31XS0VtO5QFS9QR2Lsx+QBrT6NGOepqlWfP/z8ksauGIFiKOFjE1dDxbDcHuUJNnrprrg== X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB396; 31:wMdh3NVLCAo5n5HwXYIPg4co2NDStFcpJQVdlyoxES7U35aUGob/hXtmH8t3lX0KoGL9bzwzxGDYFZVG64nHGbIxAa4O//LeKo5jmO/HO6m8hKHbwAqB+Ke4PzwD8uxigRdysBYivBqziS92thnXA+0tfef5N6Js/lPiEhimr74I8G++lBK4dhzAa91UrMunuQU0eCp5DgioYFO/faxQ7/JWbXeycxOsDAI9R9v4a+mKuf4wEzkC+P+P/4Mx7qcZ2MF7CyiXGKeK5V0MvjIgIQ== 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)(13018025)(13024025)(13023025)(13015025)(5005006)(8121501046)(13017025)(3002001)(10201501046)(93006089)(93001089)(6055026)(6096035)(20161123565025)(20161123556025)(201703131430075)(201703131448075)(201703131433075)(201703161259075)(20161123561025)(20161123563025); SRVR:BY2PR03MB396; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB396; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB396; 4:yEdWtBBUhIBFlSlP0TPPNrXN8A323/7E03MHcZqLuWDeRd9ByKLMKOafbWyKF19F620i6rcwRERxsDDs5Xy5t2OKnxB1GTHrn1BNflh7uE3jlu94Yx7uI/KZLZyffvna+Q8qCyxBpc2h2H6mXQfCnhHf8XOQqtp+4TJWlPgW3kGxWFFQEeXgo8yDzUX1O8Mx50GrdsHAOELVLUj9ihJ+O9hietVqdfEiqagdElKHJmCDdk1ATEiOv6lDbRsT0SYpDx/kINHeVxJsqzDLFVI7QJ3p7UB7phegVWPutGwuCemkJjHhI8GqRAUKehvCCP2SdzOFb+jo+5j0MkHz2cuH32Btqse1XDckpAhKOZWqmAz/UNEuxC8ULjYuKJutTCJvaknaogdsH7nhaKyamvyXbarmyXPRJm3rQrm4sFw22mk2JY4SxG4s5L59fYM7/nEtpChSiktoIlDyM6UF++zBjRxKq/c0Yq4nqKJnhBI9atmfQ9hWsRxAXs+ajThEJhPgIPRto7QpvvuzOW/t/NkiYeD4jnXY5AXgMttLvKJa+QB5FdA2aQA2wufXbgvX++fgjghFpMR1f4I9PuslXXVIud4z2CS2FHFXWaXmmbJjSNbS9veO4NJb5HXS/HjwqrhJ+rvEWjXO2ycj3tlEN+vYFaPj0pc7I91Owhhwo5qQiVicrBPPnxURcq0dpQnFiR2jyC1IUpK++Ylsn+AzI5h3xAC5qs0hig6uzDKV0/Mutij+9e5/JyuGjU+BiJ3OmQKkgswhg5iv8g4wA9s/bj2rWqiXbayVa0bUUvbIDrmzbzQ7vH8YFx12ng8Xi7MrIc1PQ/ws/xFdEaV43WudnscF1g4yJrPvnKiKjDfLJO75B2/SDK/5KgquVMErkxSAvR4DJKwccxUF7ooSIRxLe4KrEg== X-Forefront-PRVS: 02638D901B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB396; 23:EdJP7+I/X+l9XiUBn+ilNnGqDAo+UZMpphL+gvHwrO?= =?us-ascii?Q?T65T9gnpk2tdM5TxeEKP+wm++3VCYEsyKlOYLrKtF3MEnhdJix84obt3Horw?= =?us-ascii?Q?duxEkTxEadowJzKqe4lok5bx+sd+eESTaUGmy/aCIvXBjAMV9DHh/nzZ9Zjh?= =?us-ascii?Q?MLfxm8bco7RKx9dAUd7uXBl1kNPCApYzMB21TSZMIzkfovFGidTbhcDsckNL?= =?us-ascii?Q?09NLEuUTaaUiJ4gfYgT/4U7DpToXpX0gYxdkhLVyWktXS7aYnSrfaMT3keUH?= =?us-ascii?Q?x+5uOsX+rdH8a4fRc0JNg4JWN0n8/LFv16Zs6cpYIzJ0cNB9n+BOk6PdyUdT?= =?us-ascii?Q?fvFa4DPAkunGi4LkOBgpgVpBZLPyksRnVUMWdhvA3YsN4VCy47DGIvqL1nLA?= =?us-ascii?Q?6QSvyUc+Adpw8OkIVI+4dNAkcngr6UnG3kDjZ04/vRda4r1ubKi1H8g47Ck8?= =?us-ascii?Q?zRefJYv5HSOdJNNtwv7xe4XAFt37q1PUsnNWG8azBuFljLZGJVkBGzk8hfwT?= =?us-ascii?Q?tVRbdLEpXUVins609Ywnz8WvvswHk1MEbzIxVP93Vl8vwGRgwUWi+gEkueop?= =?us-ascii?Q?B5+rNfSOnF0QuF2bdJke7CeM3DwjtQzZCN94KM79vj1Qrv8/yuF3N1RFgAul?= =?us-ascii?Q?IDLwSxRcLZA5ivssucyn0qR3kG1kg5xCEHB/UHNVGf1mv3n8d6mJYfEX7KuG?= =?us-ascii?Q?T/JamCzCiqTkYtlBR2yqQ8nIz54qwIYyq9JGcNwM2E3/D+wHAODSsg/M3jl0?= =?us-ascii?Q?CO1LlMtIbfjYncZWe5r6PnxWi97xahsmsoE+3XwBzpzyDxRaWXMyNNTgM+KS?= =?us-ascii?Q?vK5m9paFUyVMZBYplAIypWf9k89Z4y0LRI9MT9m9QFZ2z/3m8jWe0Ym6n2pM?= =?us-ascii?Q?mMeYAXuGkLHuj+a24IeabEtpbccLLmzziHdT1CSJ/lGpeUxwFZ7lG9B4GGtY?= =?us-ascii?Q?PSbv5SlQ5SNUNsxUrpI1msNXJjGr7xvzhHxGXFNmfpdETf+KqAFbPR0M8Idd?= =?us-ascii?Q?lMj9fZqMIS3tFRZN00jFaJW8RD8z4pQ6G2s5PILhmgHDoPucMAu63gvTqn+d?= =?us-ascii?Q?xvJnoADeh6iKpxh9paF8ZPCdI8FdMoGe6560HKQAHRc1fL1qZoN6VcPtzh2D?= =?us-ascii?Q?X8wVb/LjE8L7/sapP5hmKP5TjMjHVqDfaCM+eKbs+op9whcII4Nvyjzcv0tu?= =?us-ascii?Q?fhRNpPDDdXRsU+PO0fObH3NVojfDTX8bzHAJ0q2tszCYsli9BzKNoLCCJiLS?= =?us-ascii?Q?e6ll5DpHGGklQ9rVQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB396; 6:DRXirTPUqUtvFK0cfbZYOb0biNBY4pPA9rNQzClhs/6hrhdGqfomAq9WgE7CrqbdyyDFF+zrEQs9znfnXbdpKUAEGhkmxEMrEWvkdvckvVXPXWVJqnWDntpRqCWMJ+E3Xxyz59Zj7xy+lk7j7LrE7uaO31xhPPydFz2Hso5LFJUVGvH2ckkCrGCaveo0kS5lMjSCzjPfgrksvVQOyZcCN9Te8XxVLnrX8gqANJALqsF6e5pbcWOH96xguzU79DKWj+fAeZmJvAj2Kr/pI1aMkFxImJYm9SsvsZWyd2qA4DXbs8DoNHf6xIWnRr7kMjaPByhsI+MU/iPT/WRjpO5QK+TDl0RqBT5bvYhiG68GZ4npMhKx1qc7dCshHzRo9SEiJ5z4khZU3E4gE4j6+bxW+A==; 5:ZuxnhcurY3pI4Yp+MjBvxbcFEP0NeUC0ep2R7Xr+hNvyhVMIlg6ZKD4arCIjSAwpnrQkdXH7yDRKRSdyl6mF6c+GyE+sR6vSkSPL/H9qKwGQtX7PvPuJ3YiwiiGBYDLpIXDCSYzxAm/rvrKbhb8rBZFjb4vDyOFAUXJR+BMFGdzBHeLLc0VK3Du7UGcSzvqy; 24:hIG9LBDbst6rgxR4ZFV9y4ysC8O7keZ7gMP/PImhIS8AebtDEPum2V/C64AgAgtUj60G4B2A9zBfEk0vdZ6n32GelaetgHTM2jgQ9ZjD/Qs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB396; 7:ifnC3hHY16IWssRd135qgbuQKP763KgG9C+JQmMCT4gGcSQEUM8zbhnTMVPgHx+XWy6q/B4GXftSBdVtbBADQvjQI9Ei2NMQLWWXgpa+q18iy4ASV+5dwJADBfw3szeEmzx1GIpSyWUGolfnv7h2Mzn/xsOcc3w8tdIWC6i4XP9x9VRhgOEX2VVcH3XGXPlGfqIam6oKf5d9pT0G+bBoVbGfy299m2y1AZcsjPMYW1L7g0IFLGkyM6iZaiLe6xxj+l/Zgl3MK/fwDdeFmO3ujjjP7HAYZ9+6FnzYtyvgr0yd6VGSBx8i7K7OBHs8AmSrt7q6673dflsc1msPDJ3Y9Q== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2017 05:29:50.1819 (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: BY2PR03MB396 Subject: [dpdk-dev] [PATCH v3 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:29:53 -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 --- v3: * Update MAINTAINER file * fix shared build issue 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