From patchwork Thu Apr 13 14:40:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 97373 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp749519qgf; Thu, 13 Apr 2017 07:41:35 -0700 (PDT) X-Received: by 10.55.114.199 with SMTP id n190mr3002203qkc.229.1492094494999; Thu, 13 Apr 2017 07:41:34 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id n128si22816772qkd.262.2017.04.13.07.41.34; Thu, 13 Apr 2017 07:41:34 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id AC4C1648CF; Thu, 13 Apr 2017 14:41:34 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 7073464E42; Thu, 13 Apr 2017 14:41:32 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 4A0DB64862; Thu, 13 Apr 2017 14:41:30 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0112.outbound.protection.outlook.com [104.47.2.112]) by lists.linaro.org (Postfix) with ESMTPS id 068F4634CF for ; Thu, 13 Apr 2017 14:41:28 +0000 (UTC) Received: from HE1PR0701CA0071.eurprd07.prod.outlook.com (10.168.122.15) by DB6PR0701MB1894.eurprd07.prod.outlook.com (10.168.10.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.6; Thu, 13 Apr 2017 14:41:26 +0000 Received: from VE1EUR03FT018.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::209) by HE1PR0701CA0071.outlook.office365.com (2603:10a6:3:64::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.6 via Frontend Transport; Thu, 13 Apr 2017 14:41:25 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.240 as permitted sender) Received: from mailrelay.int.nokia.com (131.228.2.240) by VE1EUR03FT018.mail.protection.outlook.com (10.152.18.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1019.14 via Frontend Transport; Thu, 13 Apr 2017 14:41:25 +0000 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v3DEep1R007286 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 13 Apr 2017 17:40:51 +0300 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v3DEepRW007277 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Thu, 13 Apr 2017 17:40:51 +0300 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Thu, 13 Apr 2017 17:40:51 +0300 Message-ID: <20170413144051.22456-2-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170413144051.22456-1-petri.savolainen@linaro.org> References: <20170413144051.22456-1-petri.savolainen@linaro.org> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.240; IPV:CAL; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(39450400003)(39840400002)(39860400002)(39850400002)(39410400002)(2980300002)(199003)(189002)(9170700003)(110136004)(38730400002)(5660300001)(36756003)(22756006)(33646002)(189998001)(8936002)(77096006)(50466002)(48376002)(50986999)(305945005)(81166006)(50226002)(356003)(76176999)(6916009)(86362001)(47776003)(1076002)(2351001)(105596002)(106466001)(8676002)(53936002)(2950100002)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0701MB1894; H:mailrelay.int.nokia.com; FPR:; SPF:SoftFail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VE1EUR03FT018; 1:Txs/D3eJrUiHKlsJW2wXG3AJVyIUl72Wu/QkisauTtpeG2Yp0QqBXUVd64BHp/n/J+9GY0Uq+GZB2BhfiiiF7oSE1UlVxUts/45usKHgWdWfs6gh87acxylPYPPsZ6YHNCbIWVI6mLW7COpW4ASMHpYS2MkVEKOdmDMuaw0G7ctZUZBrXL9Z00ubXBnDI12w0NxbXV2nnrX3hl86bYeydLeg6lEaMh99++INhY1bis+EupwGE4bN+XKGf8SYHt2Oj9/RTnHUWYeNycJQwC6h3ZLKKIgeOGGFHWWp4WNkdErrUZJEUIL34arVWnMSHBWTtMA2BNISfC+aaenC9+Dopgk6hqcCwZEYFj3mkpZ7Yvdgq9/DjckcdQdMGLCVKN7f407uTk5mVBlWGPezkhjoB7TBm3M3otOjkAC8Fb+eKDuNVL4CEd8hr1slmekUMfbPRkB/M7TXkL5iaUuP47flTY6Wzprqyr3xwPAvbOa7MA0NZ75H3jAK5YMqOb+O5lRbNSDCt9O0kMw1zStjWLlZ0g== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: bd2ea4fd-7bc7-4dea-7171-08d4827b2981 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081); SRVR:DB6PR0701MB1894; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB1894; 3:zGaaHal3y0QKV4aZFvmRH0ZHIMm1Xohs7zRfftqpReJ5aTqTXU5CqkxpwETS/+qm7ii7CV8airoOAuiwqWMeO+av98MhLFpVydoBgDTXHE3eUBMaXPm+ftGC91W+Xb+pc8ZR972RTfJX4ViZ/TLIAVVScu9oMeG5hHNwzWjb6kVsBwGe1s42V+eBXi2afyES79JvT3k6ulLdsO0H7soZLJIiFMzXiyj4JYQQETVIIM2yPEZulwhIAnwqX3i6XullRvqbKgWgJOwrs332N9mfvcHx9+MG4E70bNB4OaNyVssOoRH3ywbA1461OcIXKzecc0YIZvfkPps8SMDNRH6LLd1l+JdaZ55MVnjXBDAeP6e+4LfG9DXEJrRGcFQl5cGKkNcxjYKkKH/3V/OPaB4f40zos1P9mVrM2EwjejZ9d1Eq30I5Ibk3GfqA3GDf5930Okkr29GfNoumIyArRb2DjA== X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB1894; 25:8XXBh5YzmPjE7Jl45F8l8aUPZwiW1IN4HrpPAuhCNGXDLhEnk7F//p8KEBW9uIj9ZJy4MnQgimLkdqTLC1kO7q07Uyp2fGm9uKWAqhAUM8oimxnQnip3QNZQtDQIHNCTaQiFJzLNJIVIzJZmSAPM3gH+vdmCh7+RRwPTYDbY3irJiT0X5SGKym5AsZlgTc7WrGi1ywqy/hTs1aCkPOpR/zATGNdeHTnUCJuWoYdWjWNqW+8EZ76GpPeLeA7QXb1tpFFgkTm3x1IohG1eJa1g3ZFnwwQIElqQCs2yNZb2fOF4cGb+HelpF34FHa4cHOwuUsugl8hLaErJuvHojb+UflcojBtH59q/sdNE6sG6LzZ4NkOuxsTrYo7z7x9DbgSvZ+RlY0cdlWDUVlmzkrIxXLGUSObt58zltgMXp519uXBTuC9xrtIDDeZ2xeGA5I6p4OUgsLDssATXvsyoa9TsJ6aQgNA75mS2brh+3hDhJVw=; 31:sCu7ruR/OLEZG7CLxn7JzTS8QdwePPlavxwT5QFSF9u90J8czuOkoQkAgNWdc+ab4UKIqAE8lZmukEF/WxYMT72nn2D8F6fV5+dBez7gDWJ9TgORA33kzddr8IkEMxBjf9EfScyECg0p3405a/+zCdp5ChiOmdQI603IOG/iBGofH2b5APzM5XsQyW8LPOuerHTFe7YIfZhswU4KvaaNgCSY6M41AtDL9ushKeR1UccpJGfsZ5Dk6Z4q+aW9/T5e X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB1894; 20:dULXF1qeIPyiLbmh5QYpi996MAE/2Z1CiR74Gg1IhTF0U3Yi7YQXfCFvo3Uh/VrKkAF9J9Ifo/4jPfMnEakfEyCLo0++tC4D3grvoNTjobxCJainQSe/3wZnJmErzMaYZrglNa7l1cjqd9AYl7Yg1hkPzmK6FFIF8F4/5y7ULqs3wV+5raWhEY1HNn9hU5gu5nFZeXyJ5KS+UVgzEAR+IUyT2jsUyiNGX95ftTXeGmIGby0QKWyRSLAPOdENeLayfiWGBMmTjNyh0bfj4EVhqJzGJO1M2mAZdFgX8K+nsHa0IqBJdrC5ZnzCyn8F8dvGlQV1l9qSpZljh4uvMBHH8Of/y/Ooc9OBNOPHUUhZS5SAQ834aKD4ATCsiSXeadYygKtMK1/I7ca/XsENnIEbmCzN/5SwxFL8VCi+TfcamweUaTD2vcX3Jo0RKe7Hw/BDV4xlFLK1kYZ2ZkW+F9Enkvo8ink0ICxYjyOFXg+Iiq6oLv8iZx+nc4Bi+8SAQO37uYoldpLy1+KGCReRvfy1gW2KQ3q05ozOrH5U456I1RaRLdlA+91btG0ZhpJiN528TOeDtb/vSekaKW/usDZkMlWp/d1TYOPWhcorqJnCM3s= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13023025)(13021025)(13013025)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93003095)(6055026)(6041248)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(20161123555025)(20161123562025)(6072148); SRVR:DB6PR0701MB1894; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0701MB1894; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB1894; 4:X6JR4v1m6m/Fy+bsQxpCOwPUmnlNEMJShnvoCWnpv/tFN61wzn5vfvLe0WZO0kv16h1JtDoZL/YqJmqBHiFtCAIhornOJ8RWugIrmmswRWRxBPv2QZaCG+mPokO32xi7R8QNnQzexPOaKXww2R3u1b2ThXPnlexA1SJF49Rsp+1wc0YITAN77fF8QBsqX/65DzbDLxHEqhVHSifS8pXWUFD+6ZwJv3od/HyVR77+SP7sVYNpO1FWTyfeWXHXV3/tEYnQ22NJrpK4n8ZKulHQA95XCnqJ3yh4/aDJRzV99SKN4ULOJpvfq4Ij6Vj5lgh40J3u9j9hJUCeLFPRgcUnmNqMf2nK9AOHyoCrFtHG6OE/PWY/PaAWcLXAV7xuGtPCw+VyWTKq8h4UrX0D+eN5XqyyOlDoLsOwTda6PH9Ua61+omfF5PrWx2u7Gco4E5M2uTQPiUqJLI3L8wnXbuBTPHCUYoloUwAxNqES90sedeGKmd8bbaLp8emZmt++u5dDRg+bAT9U5atxOcao/pJYRRhOaTFxXKz1CHf5MCZEQWMeoXMgHVAyHj9ErTeIfQfPwhSDrNaUAt8x6gorfyFVB25bQ1CRG7q/iTjEWYcA6EExDUBQCuGYHUMlOvpdgFyPJ6uGt3vrU5RJ0xVyJL9kvNCI/UG9nnP2eUTzvgr7MuH//gTPHOxvkDXld37gojt08wUMKxM+kepE8HZphG3sDT17RuLcrtuYthDjSxwjwZDXoPHennc/hoAZ1xltO6fTEd8ojp5Fnn0yzy1HwT65kiUhZH0qbLLihOah7D2/YIc= X-Forefront-PRVS: 02760F0D1C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0701MB1894; 23:9dx7s2YIaCdWyc+tmk+VB3fHCQ9tFA9hAOrYMpB?= a7qsUedTI2PZP0sRX7+iuQhGeNl0yY8FRaF8tQO8OI0rwj00ah8fz+65h+R4snMqL/ijNo12SaJhaVQ1KHo75HRnYWV9nlBiJgs5L+LVg0vJAsOlXuJcVdPRmci5ofpCPynx1cYM9ujQGBJWHAbCwQqkhnZHxLrZgzTtb1h68rQ/h7WyTzk2ubJKg3o6QBY3oO78yKlZD0AY/OI2Rr3xfYHW3ae6w3htj5fldPgDQmhehUZ7Eg9XpRXHEFzE8qPSMYix86L5BQBdvZ3uIP+9q2JQ2xYb1QL1NEn7O93s8Oj8bvNrpKmlfPhpEzto2fUJpljc4jW8K3JBuAPrrNeKPggiTVoMg8OZAqCoZ0HDprD09E9Knd+gYCt2Rs8VOR/ko0MhbWuwoD0O3Em06SihIrNfOOPj7f4ziygdtXmnxDmW0ghDcGvqpOcUIrOWcOYBeZsi+zxFCwHFJrPM2C13+d10TUgNjBLq0MiFKRvvM0oq3F9XJiAPRREnKDRfzO+zkMnotdoSfk86lqeQbDDMblc/ZN7PnTjGVu8UjWxN28kduVXos//0rd51fBEbmU1Ct9iS0q/ohYxDCSVba95TYnf/ROpzgsxRrywHN6icK3/O/IgqxeTUuKsrbObpUBOZTHsuUF+8/9mlBeZMubexupgWKwMnUXduymRBRlIP31nOkVZYSVrtvlPIQ8oJ5oCcoxOU1nHYFC0LfcRHI1QJDgKiqI/vTRULX4e5XCstF30cPRrSHcFx0cUUEJ1I3rruV4FZW4qvanJ6O5EQv094AeHUgHoMR+0hDN33MZMF+zjwGtIB5sCGwMS3nw0EMtnkGtIJGexVDClNX8SdcQ2aPY+SucT2riFB0sBPOkstK1tYEaE4a0NYmodzRTC3sj6TyU5cNqaTmhaSNiYm6Uo2vNix4mucE+XBn9HLUMWLzD9UMYg== X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB1894; 6:gvI4iFqg9doIWb1a9GOra9gEjH5OuG1cZycqfwyQPu+xgZjux0zXJ++kTyA1Ptvn0NNMdwRVTUXbtQhRu3lwo3jVGrqouoQYVDiT0V60y1AHGU8ADH3N5AzXFJom8bShFsP580u5zG4G22ix+IXaI4zHOYttUQCARTXAigdtsTXwf+F3yUVuRwTUbkhiF5Tr6rjzlNrQ7Zj4O1e5YgAS7Fihe7WsSYoduqw6TQFETVfq5e8aw/sQ3ewOzAB7sbP4Ij/JtvCJdOw+iPLN6mjmItMJjPIr8T1ryQ7927g/KfoX5aSt5Nh8uvskb7Mz5ceW42m5z8BeuOUwNJVD/7Jv8f7VmkAFsFOyZrsxjv/DEYdGJmXmHtAGgOwoz70pbfZVMmiJPeb68v9epa2uKcpUA1Js8Y8D6LwevOz0VTlQ3T/mwhvx3NgfIGPL+G3MRpE+mWjqVCuSNYI/5u+IlMI8lKELiENoqZROeJVa+bV9FxY=; 5:CChKQZR/etmfPsNSPdgz9XQGmstCUMB2VoEeyM+tuG3E+wrZJ/gtPI5MGYobwT2RWnZsVPX+Inv25aF2SIfzcMPZu8lUjzqzvRs8AcEGhxwI2uZkiAXnJZKUkw9M+EUglhygslZSybl62KVxmLD0aw==; 24:an43JnAPLLklURO8e4s33IHY4xMRUPx5vP69hscCb3VvPjtNC+rgE6tSYB/tsnPd4RuMVDIC041sunZu/YvpA10iBjF7AcinM+wVzyueQvg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB1894; 7:kieFHkZveF2tVvvN5N3BnoeD3LqKE1lmjSMXBfLDAL04l3S7fhACo/aq2tAV/LnjUW6IN/sQqeKqRs5E7KPFwTX35eDwIh4KUZzzVagp0RVmSnRFPZ+NchNgPqQ+HEU+TzJuEWFsxjLJE7i5/gSHDPGjA5tv+kBOL5tZ0EHCS8pQOetZVb3RsWBxK4XYDBM8pZ7oL5hvHYczKimgJV+C5GF8f0vlpcUY5oZwH3qmJu+oSKWsjCBEHELl+vrB9L7hbCItzuoxcdk4AzvkNgf9PiwIb12lZJ2nwfmaw7//jJbBYuojtYXfNQF8UI0PFoU2x9tp54ma00tPFGo+rRe/Tw== X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2017 14:41:25.3144 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.240]; Helo=[mailrelay.int.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0701MB1894 Subject: [lng-odp] [API-NEXT PATCH v4 2/2] validation: queue: test queue max_num per type X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Updated implementation and test with type specific number of queues. Signed-off-by: Petri Savolainen --- platform/linux-generic/odp_queue.c | 2 ++ test/common_plat/validation/api/queue/queue.c | 49 +++++++++++++++++---------- 2 files changed, 34 insertions(+), 17 deletions(-) -- 2.11.0 diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index fcf4bf5b..1114c95c 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -175,6 +175,8 @@ int odp_queue_capability(odp_queue_capability_t *capa) capa->max_ordered_locks = sched_fn->max_ordered_locks(); capa->max_sched_groups = sched_fn->num_grps(); capa->sched_prios = odp_schedule_num_prio(); + capa->plain.max_num = capa->max_queues; + capa->sched.max_num = capa->max_queues; return 0; } diff --git a/test/common_plat/validation/api/queue/queue.c b/test/common_plat/validation/api/queue/queue.c index 1f7913a1..6a13c006 100644 --- a/test/common_plat/validation/api/queue/queue.c +++ b/test/common_plat/validation/api/queue/queue.c @@ -56,7 +56,7 @@ void queue_test_capa(void) odp_queue_param_t qparams; char name[ODP_QUEUE_NAME_LEN]; odp_queue_t queue[MAX_QUEUES]; - uint32_t num_queues, i; + uint32_t num_queues, min, i, j; memset(&capa, 0, sizeof(odp_queue_capability_t)); CU_ASSERT(odp_queue_capability(&capa) == 0); @@ -65,34 +65,49 @@ void queue_test_capa(void) CU_ASSERT(capa.max_ordered_locks != 0); CU_ASSERT(capa.max_sched_groups != 0); CU_ASSERT(capa.sched_prios != 0); + CU_ASSERT(capa.plain.max_num != 0); + CU_ASSERT(capa.sched.max_num != 0); + + min = capa.plain.max_num; + if (min > capa.sched.max_num) + min = capa.sched.max_num; + + CU_ASSERT(capa.max_queues >= min); for (i = 0; i < ODP_QUEUE_NAME_LEN; i++) name[i] = 'A' + (i % 26); name[ODP_QUEUE_NAME_LEN - 1] = 0; - if (capa.max_queues > MAX_QUEUES) - num_queues = MAX_QUEUES; - else - num_queues = capa.max_queues; - odp_queue_param_init(&qparams); - for (i = 0; i < num_queues; i++) { - generate_name(name, i); - queue[i] = odp_queue_create(name, &qparams); + for (j = 0; j < 2; j++) { + if (j == 0) { + num_queues = capa.plain.max_num; + } else { + num_queues = capa.sched.max_num; + qparams.type = ODP_QUEUE_TYPE_SCHED; + } + + if (num_queues > MAX_QUEUES) + num_queues = MAX_QUEUES; - if (queue[i] == ODP_QUEUE_INVALID) { - CU_FAIL("Queue create failed"); - num_queues = i; - break; + for (i = 0; i < num_queues; i++) { + generate_name(name, i); + queue[i] = odp_queue_create(name, &qparams); + + if (queue[i] == ODP_QUEUE_INVALID) { + CU_FAIL("Queue create failed"); + num_queues = i; + break; + } + + CU_ASSERT(odp_queue_lookup(name) != ODP_QUEUE_INVALID); } - CU_ASSERT(odp_queue_lookup(name) != ODP_QUEUE_INVALID); + for (i = 0; i < num_queues; i++) + CU_ASSERT(odp_queue_destroy(queue[i]) == 0); } - - for (i = 0; i < num_queues; i++) - CU_ASSERT(odp_queue_destroy(queue[i]) == 0); } void queue_test_mode(void)