From patchwork Fri Jun 16 09:12:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 105698 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp1175754obh; Fri, 16 Jun 2017 02:13:13 -0700 (PDT) X-Received: by 10.55.197.136 with SMTP id k8mr1710161qkl.211.1497604393109; Fri, 16 Jun 2017 02:13:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497604393; cv=none; d=google.com; s=arc-20160816; b=WNhz9LSDsqsM1PrvevL3NYrk3Zyc2+0NDkETwR75nG2/wkfXm4ZpNstRScg9H6PzvU vWUeN79Rlb17A84dbv0OohE7dNIMm5hd6hGaCzrYQ+w+/hsABpQ4tZoNozW4q6oHcaph FvXwywKRu/e83nWU3RzUTiP1HrZyOjd/xXb78Exw8fSl5HqQklOCvj+5OQSxYN82lOqV Smf2WpBbBjG/tqAYTwne3Q0TDnuS6vZrFrHZDyXfgpzdb3P8pKc3AsbfYWV6omgT0nJv ypRgoMYH3kxiaIKTMJJvDFGt7ni9Zddne/jwiHc/kDqrgxdyNpCZzu1xdtESl7NzeeYL quqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=unmCDfeQSTWlZ/aZXjQ8lMg3axIoWAT+KVuGMqU7lxM=; b=psio7S606hRU4rvEu0QBJoOkxT6FgA+tz3tbFRvFowaUIGWffzXwqhFs5suPkKsAGG ZOManMWka/m40Tt27xkiCymShEWYUeDrFsJeU6SxzGsrV4RPszs0QWT0XPvwqq/rLPdV 4ApWwfoiTiC9xiZY1OjEdHJpFUgar6pF09uhAfLlgdPrffiiraTMajipEL+IIB/k90gV Oyumhq33oEnnhaPoXUAyKWpEOQ492Vq7CfDiaGw4L8kzcMfnrxHZlifOt6nEcESKjjTu vQqQT4b43Vvtz4ea5D0uZl7hlBHDxkr4ogpsf3NAiLdtpzh0BlZx3auepumj+Y0+Ew/w GgAg== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id s40si1561885qtb.223.2017.06.16.02.13.12; Fri, 16 Jun 2017 02:13:13 -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 C7B6260C10; Fri, 16 Jun 2017 09:13:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 28D8F60C0D; Fri, 16 Jun 2017 09:12:49 +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 88EAD60C0E; Fri, 16 Jun 2017 09:12:42 +0000 (UTC) Received: from mail-lf0-f50.google.com (mail-lf0-f50.google.com [209.85.215.50]) by lists.linaro.org (Postfix) with ESMTPS id 2118F60816 for ; Fri, 16 Jun 2017 09:12:41 +0000 (UTC) Received: by mail-lf0-f50.google.com with SMTP id p189so22048317lfe.2 for ; Fri, 16 Jun 2017 02:12:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=unmCDfeQSTWlZ/aZXjQ8lMg3axIoWAT+KVuGMqU7lxM=; b=CcRTR/86slwKgjOqTJNXsexz+aeuOVhW4GSt5tCjsE2igj9MCjw0n91JnkFka4baZR WOSADb39o6+TW8GOpOfO/8nWrISa/SE9+vP1hlqq90Ice5Gl9PUVVDAjLgaJzxdKT6O+ Wn2aGsZtD+Ytr7JUUFb8QyBUiPhuzMdQuN/vAPBPcyw7xwUoyeuNfXUeNe5wmXNUJrAb w/EQQr+hc/yAaD6BoQKQhT89nZy2wOLJP1T50kNm0hHn7NdjCLgjMjaFSxCa85VkSENe jMVHijHUR4pRHaIiXZmmafsrG06lruhOrHftjjOBusoKvo9A/hs3bqodawdxl+Yk21jH Z1UQ== X-Gm-Message-State: AKS2vOwpqu86d9l7H52QPH8VGR3ZYKjNnIrQo9H0R+MUHVlav8xzd3UV D6xQzkt0CntII/ltaXOFpBHA X-Received: by 10.46.84.90 with SMTP id y26mr2845745ljd.77.1497604359755; Fri, 16 Jun 2017 02:12:39 -0700 (PDT) Received: from forlindon.lumag.auriga.ru ([188.162.64.160]) by smtp.gmail.com with ESMTPSA id 25sm330038ljo.24.2017.06.16.02.12.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jun 2017 02:12:39 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Fri, 16 Jun 2017 12:12:34 +0300 Message-Id: <20170616091235.2394-2-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170616091235.2394-1-dmitry.ereminsolenikov@linaro.org> References: <20170616091235.2394-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH API-NEXT v2 1/2] linux-generic: events subtype implementation 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" Signed-off-by: Dmitry Eremin-Solenikov --- platform/linux-generic/include/odp_buffer_inlines.h | 2 ++ platform/linux-generic/include/odp_buffer_internal.h | 3 +++ platform/linux-generic/odp_crypto.c | 14 ++++++++------ platform/linux-generic/odp_event.c | 15 +++++++++++++++ platform/linux-generic/odp_packet.c | 1 + platform/linux-generic/odp_pool.c | 11 +++++++++++ 6 files changed, 40 insertions(+), 6 deletions(-) -- 2.11.0 diff --git a/platform/linux-generic/include/odp_buffer_inlines.h b/platform/linux-generic/include/odp_buffer_inlines.h index cf817d907ab5..4c0e73390948 100644 --- a/platform/linux-generic/include/odp_buffer_inlines.h +++ b/platform/linux-generic/include/odp_buffer_inlines.h @@ -21,6 +21,8 @@ extern "C" { odp_event_type_t _odp_buffer_event_type(odp_buffer_t buf); void _odp_buffer_event_type_set(odp_buffer_t buf, int ev); +odp_event_subtype_t _odp_buffer_event_subtype(odp_buffer_t buf); +void _odp_buffer_event_subtype_set(odp_buffer_t buf, int ev); int odp_buffer_snprint(char *str, uint32_t n, odp_buffer_t buf); static inline odp_buffer_t odp_hdr_to_buf(odp_buffer_hdr_t *hdr) diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index 076abe96e072..dadf285e796d 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -96,6 +96,9 @@ struct odp_buffer_hdr_t { /* Event type. Maybe different than pool type (crypto compl event) */ int8_t event_type; + /* Event subtype. Should be ODP_EVENT_NO_SUBTYPE except packets. */ + int8_t event_subtype; + /* Burst table */ struct odp_buffer_hdr_t *burst[BUFFER_BURST_SIZE]; diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 6fc1907d9dca..bcc3765b66e1 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -882,12 +882,12 @@ odp_crypto_operation(odp_crypto_op_param_t *param, if (ODP_QUEUE_INVALID != session->p.compl_queue) { odp_event_t completion_event; odp_crypto_generic_op_result_t *op_result; + odp_buffer_t buf = odp_buffer_from_event(completion_event); /* Linux generic will always use packet for completion event */ completion_event = odp_packet_to_event(param->out_pkt); - _odp_buffer_event_type_set( - odp_buffer_from_event(completion_event), - ODP_EVENT_CRYPTO_COMPL); + _odp_buffer_event_type_set(buf, ODP_EVENT_CRYPTO_COMPL); + _odp_buffer_event_subtype_set(buf, ODP_EVENT_NO_SUBTYPE); /* Asynchronous, build result (no HW so no errors) and send it*/ op_result = get_op_result_from_event(completion_event); op_result->magic = OP_RESULT_MAGIC; @@ -1081,9 +1081,11 @@ odp_crypto_compl_result(odp_crypto_compl_t completion_event, void odp_crypto_compl_free(odp_crypto_compl_t completion_event) { - _odp_buffer_event_type_set( - odp_buffer_from_event((odp_event_t)completion_event), - ODP_EVENT_PACKET); + odp_buffer_t buf = + odp_buffer_from_event((odp_event_t)completion_event); + + _odp_buffer_event_type_set(buf, ODP_EVENT_PACKET); + _odp_buffer_event_subtype_set(buf, ODP_EVENT_PACKET_BASIC); } void odp_crypto_session_param_init(odp_crypto_session_param_t *param) diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c index d71f4464af48..23b410d8a60e 100644 --- a/platform/linux-generic/odp_event.c +++ b/platform/linux-generic/odp_event.c @@ -19,6 +19,21 @@ odp_event_type_t odp_event_type(odp_event_t event) return _odp_buffer_event_type(odp_buffer_from_event(event)); } +odp_event_subtype_t odp_event_subtype(odp_event_t event) +{ + return _odp_buffer_event_subtype(odp_buffer_from_event(event)); +} + +odp_event_type_t odp_event_types(odp_event_t event, + odp_event_subtype_t *subtype) +{ + odp_buffer_t buf = odp_buffer_from_event(event); + + *subtype = _odp_buffer_event_subtype(buf); + + return _odp_buffer_event_type(buf); +} + void odp_event_free(odp_event_t event) { switch (odp_event_type(event)) { diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index eb66af2d3b9c..3789feca45f9 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -268,6 +268,7 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) CONFIG_PACKET_TAILROOM; pkt_hdr->input = ODP_PKTIO_INVALID; + pkt_hdr->buf_hdr.event_subtype = ODP_EVENT_PACKET_BASIC; } static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 9dba734130b4..23b80698d3b0 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -259,6 +259,7 @@ static void init_buffers(pool_t *pool) buf_hdr->size = seg_size; buf_hdr->type = type; buf_hdr->event_type = type; + buf_hdr->event_subtype = ODP_EVENT_NO_SUBTYPE; buf_hdr->pool_hdl = pool->pool_hdl; buf_hdr->uarea_addr = uarea; /* Show user requested size through API */ @@ -566,6 +567,16 @@ void _odp_buffer_event_type_set(odp_buffer_t buf, int ev) buf_hdl_to_hdr(buf)->event_type = ev; } +odp_event_subtype_t _odp_buffer_event_subtype(odp_buffer_t buf) +{ + return buf_hdl_to_hdr(buf)->event_subtype; +} + +void _odp_buffer_event_subtype_set(odp_buffer_t buf, int ev) +{ + buf_hdl_to_hdr(buf)->event_subtype = ev; +} + odp_pool_t odp_pool_lookup(const char *name) { uint32_t i; From patchwork Fri Jun 16 09:12:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 105699 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp1175926obh; Fri, 16 Jun 2017 02:13:46 -0700 (PDT) X-Received: by 10.200.14.66 with SMTP id j2mr11978125qti.229.1497604426219; Fri, 16 Jun 2017 02:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497604426; cv=none; d=google.com; s=arc-20160816; b=VjfTsgPgnZ79pRVwZX9scILE7ilO5FwodGR+yvrNahUdox7IlYiLMArGSmlm/X9Y4/ qHQ5Hwk9PK9ZmjLwL1x20x0TygYG1DiaT6cAW+d970lx6YpDDmjpsHVtnJM3b5p46dML YN5Fux/QFN0sNeKP5D+Ic9X2x1SiQlpvnlYEg0MHBCFBTtHorKUOAjPP499x9KBUZTEF rrHiHsjBIII6FvoDViVBQPpOSQGZPfxkxtCWxKUTQ7tv/lsw9PUNTTZzsdL/Lul7Q/5g K5jabA4UsG4ENkuINqFg45uKx1az4A3+MLpbwodnoYsxaKfIOnRdEf4AM1MDB7/ITTxX oqQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=o9NC1NWgF8EVbRbpQSsFOe1hcaAkyrc00y16WrdRg5I=; b=p5WLlDUT/OA9BUgi1j4tdh9ZEOiAscBp6NOhArUjqx5FzEsRZxU5peJChSer8yoP9h KzcgZorfpqccPrBs1Dor7JsfIZzJO1bBvZU76cGkOYpKIAkfh49NbbF+6vf94dTzxrhA vVykOXJ1zzaU6Y7AeMLPAl1x502RoQeuVdL8iNzzyj3fcjk4Sz9nGX+AIInu/R3+WY4X egSSlcrIYItsA6Qp/uudb5ecoWX96yK9h1rEX/zdkTB/+D+ELiRepu3A/1IYTKGS4mFR 7IflXACja/D1R8VDhPWUbHNThkuaaUzZ5Gbf/4IryicN1gnh8DkcXZ0iIv5RgluxhWtO e+AA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id v3si1535235qtv.343.2017.06.16.02.13.45; Fri, 16 Jun 2017 02:13:46 -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 D922060C18; Fri, 16 Jun 2017 09:13:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 9637060C20; Fri, 16 Jun 2017 09:12:52 +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 289FE60C10; Fri, 16 Jun 2017 09:12:45 +0000 (UTC) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) by lists.linaro.org (Postfix) with ESMTPS id 347796081D for ; Fri, 16 Jun 2017 09:12:42 +0000 (UTC) Received: by mail-lf0-f47.google.com with SMTP id p189so22048509lfe.2 for ; Fri, 16 Jun 2017 02:12:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=o9NC1NWgF8EVbRbpQSsFOe1hcaAkyrc00y16WrdRg5I=; b=dJwM04ybppokf6uWnDZoLQJkW1jVbtbNNh5wnG0wANJfXHVKjyEyLeVVcF4wmGAQWQ ouUd32ShmDH5L8yl2oolvgpUqqXZo5bJzbVWxXHMu6Q6ds9k7B4lxbIYip0WK3VkVDY5 EFsFV0m7iHu5QYo7Qfiabi+rxruy+K0TtYpa9tbBxZB/zfshV/fvdAu8mxm6BOOLhIS/ H88IVKEGOyptgXZ6yEiI5jxGOfLFGl7mmNOBxRDnuY37XA455m5qZrkfh/kLKlnZoSdU s/Yh7SYkl32HYiO5F7p6HaYZpsffJkpW9iTiJl2Wv1xoqQYTahKLuBC/kB8+XFIxrkz7 xRGQ== X-Gm-Message-State: AKS2vOyPJ6txLGzmSZedyWxT68Cq6f2KlguvPrFN6CJ8emJcwzPFCfgl F2/a24utleSmVbSO6UsBcbaY X-Received: by 10.46.87.24 with SMTP id l24mr2723615ljb.85.1497604360751; Fri, 16 Jun 2017 02:12:40 -0700 (PDT) Received: from forlindon.lumag.auriga.ru ([188.162.64.160]) by smtp.gmail.com with ESMTPSA id 25sm330038ljo.24.2017.06.16.02.12.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jun 2017 02:12:40 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Fri, 16 Jun 2017 12:12:35 +0300 Message-Id: <20170616091235.2394-3-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170616091235.2394-1-dmitry.ereminsolenikov@linaro.org> References: <20170616091235.2394-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH API-NEXT v2 2/2] validation: test correctness of events subtype implementation 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" Signed-off-by: Dmitry Eremin-Solenikov --- test/common_plat/validation/api/buffer/buffer.c | 37 +++++++++++++++---------- test/common_plat/validation/api/packet/packet.c | 5 ++++ test/common_plat/validation/api/timer/timer.c | 14 ++++++++-- 3 files changed, 39 insertions(+), 17 deletions(-) -- 2.11.0 diff --git a/test/common_plat/validation/api/buffer/buffer.c b/test/common_plat/validation/api/buffer/buffer.c index 7c723d4f4df4..8fca8a1f0840 100644 --- a/test/common_plat/validation/api/buffer/buffer.c +++ b/test/common_plat/validation/api/buffer/buffer.c @@ -48,7 +48,8 @@ void buffer_test_pool_alloc(void) odp_buffer_t buffer[num]; odp_event_t ev; int index; - char wrong_type = 0, wrong_size = 0, wrong_align = 0; + odp_bool_t wrong_type = false, wrong_subtype = false; + odp_bool_t wrong_size = false, wrong_align = false; odp_pool_param_t params; odp_pool_param_init(¶ms); @@ -71,14 +72,16 @@ void buffer_test_pool_alloc(void) ev = odp_buffer_to_event(buffer[index]); if (odp_event_type(ev) != ODP_EVENT_BUFFER) - wrong_type = 1; + wrong_type = true; + if (odp_event_subtype(ev) != ODP_EVENT_NO_SUBTYPE) + wrong_subtype = true; if (odp_buffer_size(buffer[index]) < BUF_SIZE) - wrong_size = 1; + wrong_size = true; addr = (uintptr_t)odp_buffer_addr(buffer[index]); if ((addr % BUF_ALIGN) != 0) - wrong_align = 1; + wrong_align = true; if (wrong_type || wrong_size || wrong_align) odp_buffer_print(buffer[index]); @@ -90,9 +93,10 @@ void buffer_test_pool_alloc(void) index--; /* Check that the pool had correct buffers */ - CU_ASSERT(wrong_type == 0); - CU_ASSERT(wrong_size == 0); - CU_ASSERT(wrong_align == 0); + CU_ASSERT(!wrong_type); + CU_ASSERT(!wrong_subtype); + CU_ASSERT(!wrong_size); + CU_ASSERT(!wrong_align); for (; index >= 0; index--) odp_buffer_free(buffer[index]); @@ -123,7 +127,8 @@ void buffer_test_pool_alloc_multi(void) odp_buffer_t buffer[num + 1]; odp_event_t ev; int index; - char wrong_type = 0, wrong_size = 0, wrong_align = 0; + odp_bool_t wrong_type = false, wrong_subtype = false; + odp_bool_t wrong_size = false, wrong_align = false; odp_pool_param_t params; odp_pool_param_init(¶ms); @@ -146,14 +151,16 @@ void buffer_test_pool_alloc_multi(void) ev = odp_buffer_to_event(buffer[index]); if (odp_event_type(ev) != ODP_EVENT_BUFFER) - wrong_type = 1; + wrong_type = true; + if (odp_event_subtype(ev) != ODP_EVENT_NO_SUBTYPE) + wrong_subtype = true; if (odp_buffer_size(buffer[index]) < BUF_SIZE) - wrong_size = 1; + wrong_size = true; addr = (uintptr_t)odp_buffer_addr(buffer[index]); if ((addr % BUF_ALIGN) != 0) - wrong_align = 1; + wrong_align = true; if (wrong_type || wrong_size || wrong_align) odp_buffer_print(buffer[index]); @@ -163,9 +170,10 @@ void buffer_test_pool_alloc_multi(void) CU_ASSERT(index == num); /* Check that the pool had correct buffers */ - CU_ASSERT(wrong_type == 0); - CU_ASSERT(wrong_size == 0); - CU_ASSERT(wrong_align == 0); + CU_ASSERT(!wrong_type); + CU_ASSERT(!wrong_subtype); + CU_ASSERT(!wrong_size); + CU_ASSERT(!wrong_align); odp_buffer_free_multi(buffer, num); @@ -248,6 +256,7 @@ void buffer_test_management_basic(void) CU_ASSERT(odp_buffer_is_valid(raw_buffer) == 1); CU_ASSERT(odp_buffer_pool(raw_buffer) != ODP_POOL_INVALID); CU_ASSERT(odp_event_type(ev) == ODP_EVENT_BUFFER); + CU_ASSERT(odp_event_subtype(ev) == ODP_EVENT_NO_SUBTYPE); CU_ASSERT(odp_buffer_size(raw_buffer) >= BUF_SIZE); CU_ASSERT(odp_buffer_addr(raw_buffer) != NULL); odp_buffer_print(raw_buffer); diff --git a/test/common_plat/validation/api/packet/packet.c b/test/common_plat/validation/api/packet/packet.c index 284aaeb5ae56..3d55eff7479f 100644 --- a/test/common_plat/validation/api/packet/packet.c +++ b/test/common_plat/validation/api/packet/packet.c @@ -260,6 +260,8 @@ void packet_test_alloc_free(void) CU_ASSERT(odp_packet_len(packet) == packet_len); CU_ASSERT(odp_event_type(odp_packet_to_event(packet)) == ODP_EVENT_PACKET); + CU_ASSERT(odp_event_subtype(odp_packet_to_event(packet)) == + ODP_EVENT_PACKET_BASIC); CU_ASSERT(odp_packet_to_u64(packet) != odp_packet_to_u64(ODP_PACKET_INVALID)); @@ -332,6 +334,8 @@ void packet_test_alloc_free_multi(void) CU_ASSERT(odp_packet_len(packet[i]) == packet_len); CU_ASSERT(odp_event_type(odp_packet_to_event(packet[i])) == ODP_EVENT_PACKET); + CU_ASSERT(odp_event_subtype(odp_packet_to_event(packet[i])) == + ODP_EVENT_PACKET_BASIC); CU_ASSERT(odp_packet_to_u64(packet[i]) != odp_packet_to_u64(ODP_PACKET_INVALID)); } @@ -453,6 +457,7 @@ void packet_test_event_conversion(void) ev = odp_packet_to_event(pkt); CU_ASSERT_FATAL(ev != ODP_EVENT_INVALID); CU_ASSERT(odp_event_type(ev) == ODP_EVENT_PACKET); + CU_ASSERT(odp_event_subtype(ev) == ODP_EVENT_PACKET_BASIC); tmp_pkt = odp_packet_from_event(ev); CU_ASSERT_FATAL(tmp_pkt != ODP_PACKET_INVALID); diff --git a/test/common_plat/validation/api/timer/timer.c b/test/common_plat/validation/api/timer/timer.c index b7d84c64930e..a09f4d73f09f 100644 --- a/test/common_plat/validation/api/timer/timer.c +++ b/test/common_plat/validation/api/timer/timer.c @@ -59,7 +59,7 @@ void timer_test_timeout_pool_alloc(void) odp_timeout_t tmo[num]; odp_event_t ev; int index; - char wrong_type = 0; + odp_bool_t wrong_type = false, wrong_subtype = false; odp_pool_param_t params; odp_pool_param_init(¶ms); @@ -80,7 +80,9 @@ void timer_test_timeout_pool_alloc(void) ev = odp_timeout_to_event(tmo[index]); if (odp_event_type(ev) != ODP_EVENT_TIMEOUT) - wrong_type = 1; + wrong_type = true; + if (odp_event_subtype(ev) != ODP_EVENT_NO_SUBTYPE) + wrong_subtype = true; } /* Check that the pool had at least num items */ @@ -89,7 +91,8 @@ void timer_test_timeout_pool_alloc(void) index--; /* Check that the pool had correct buffers */ - CU_ASSERT(wrong_type == 0); + CU_ASSERT(!wrong_type); + CU_ASSERT(!wrong_subtype); for (; index >= 0; index--) odp_timeout_free(tmo[index]); @@ -225,6 +228,11 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) CU_FAIL("Unexpected event type received"); return; } + if (odp_event_subtype(ev) != ODP_EVENT_NO_SUBTYPE) { + /* Not a timeout event */ + CU_FAIL("Unexpected event subtype received"); + return; + } /* Read the metadata from the timeout */ odp_timeout_t tmo = odp_timeout_from_event(ev); odp_timer_t tim = odp_timeout_timer(tmo);