From patchwork Fri Jan 23 11:42:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 43611 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 75B6C240D9 for ; Fri, 23 Jan 2015 11:43:13 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id bs8sf1107280wib.1 for ; Fri, 23 Jan 2015 03:43:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=uYqPgx0be+9USbnvb0B8BgHnQENZ2Tsy7ZXTZYcc/mw=; b=jv96Hs0oPN7M6puIO0aFgaLYbDl8b70DxjrB9Li9EUyFHPMoN4gI6ufPoZoSMqYa1q 4jJGSv4OnkQBvjv5RJLJW6iDmmZm+WX6GPkaINox1MW6r7i72NoSTfFb02EyTe+mL/Ft 5isL+l9i0DwUFf74/6Nkj9k6dT6o1dtWtbhIhUzhbYPJY7sJIUGI+n0lRfqF8ZxM0k+Z OmkgQCvlmfDrvowRYiQjummcyM4CQxyhWAw3EjvaXnAYjEiF81pJ7deIR9zqhSiZMUdQ LxcAZhH6wR0U2ri0M5p+OOi/6iaKUHxvCLeEV0t6tkgoF7cO+JXir/n7dlOZ1hJWoX2S KcrQ== X-Gm-Message-State: ALoCoQkIO8iRAUyrtBPfPAxvVSppxczPHnsIGhdM7Q+C/Q2Vu52XcqlOhwdNgoVnUUHh44OXYCf3 X-Received: by 10.112.154.232 with SMTP id vr8mr280523lbb.10.1422013392788; Fri, 23 Jan 2015 03:43:12 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.99 with SMTP id s3ls303597lag.79.gmail; Fri, 23 Jan 2015 03:43:12 -0800 (PST) X-Received: by 10.152.178.197 with SMTP id da5mr4751252lac.87.1422013392479; Fri, 23 Jan 2015 03:43:12 -0800 (PST) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id bf5si1088988lab.128.2015.01.23.03.43.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jan 2015 03:43:12 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by mail-la0-f49.google.com with SMTP id gf13so2637576lab.8 for ; Fri, 23 Jan 2015 03:43:12 -0800 (PST) X-Received: by 10.112.41.234 with SMTP id i10mr6895105lbl.25.1422013392354; Fri, 23 Jan 2015 03:43:12 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp220786lbb; Fri, 23 Jan 2015 03:43:11 -0800 (PST) X-Received: by 10.140.23.84 with SMTP id 78mr12061473qgo.93.1422013390734; Fri, 23 Jan 2015 03:43:10 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id k2si1665399qad.26.2015.01.23.03.43.09 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 23 Jan 2015 03:43:10 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YEcdn-0003M5-8n; Fri, 23 Jan 2015 11:43:07 +0000 Received: from mail-qg0-f41.google.com ([209.85.192.41]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YEcdd-0003Gu-QM for lng-odp@lists.linaro.org; Fri, 23 Jan 2015 11:42:57 +0000 Received: by mail-qg0-f41.google.com with SMTP id q108so5579790qgd.0 for ; Fri, 23 Jan 2015 03:42:52 -0800 (PST) X-Received: by 10.140.36.239 with SMTP id p102mr12737247qgp.8.1422013372656; Fri, 23 Jan 2015 03:42:52 -0800 (PST) Received: from mcpro03.emea.nsn-net.net (ec2-23-23-178-99.compute-1.amazonaws.com. [23.23.178.99]) by mx.google.com with ESMTPSA id f7sm1182892qaq.42.2015.01.23.03.42.50 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Jan 2015 03:42:51 -0800 (PST) From: Petri Savolainen To: lng-odp@lists.linaro.org Date: Fri, 23 Jan 2015 13:42:09 +0200 Message-Id: <1422013344-6655-2-git-send-email-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1422013344-6655-1-git-send-email-petri.savolainen@linaro.org> References: <1422013344-6655-1-git-send-email-petri.savolainen@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v4 01/16] api: event: Add odp_event_t X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: petri.savolainen@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 * Added odp_event.h and odp_event.c * Added odp_event_t type and type conversion functions Signed-off-by: Petri Savolainen --- platform/linux-generic/Makefile.am | 2 + platform/linux-generic/include/api/odp.h | 1 + platform/linux-generic/include/api/odp_buffer.h | 34 ++++++++++--- platform/linux-generic/include/api/odp_event.h | 59 ++++++++++++++++++++++ platform/linux-generic/include/api/odp_packet.h | 21 ++++++++ .../linux-generic/include/api/odp_platform_types.h | 6 +++ platform/linux-generic/include/api/odp_timer.h | 13 +++++ platform/linux-generic/odp_buffer.c | 10 ++++ platform/linux-generic/odp_event.c | 26 ++++++++++ platform/linux-generic/odp_packet.c | 10 ++++ platform/linux-generic/odp_timer.c | 9 ++++ 11 files changed, 185 insertions(+), 6 deletions(-) create mode 100644 platform/linux-generic/include/api/odp_event.h create mode 100644 platform/linux-generic/odp_event.c diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index a699ea6..712d75c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -19,6 +19,7 @@ include_HEADERS = \ $(top_srcdir)/platform/linux-generic/include/api/odp_cpumask.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_crypto.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_debug.h \ + $(top_srcdir)/platform/linux-generic/include/api/odp_event.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_hints.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_init.h \ $(top_srcdir)/platform/linux-generic/include/api/odp_packet_flags.h \ @@ -80,6 +81,7 @@ __LIB__libodp_la_SOURCES = \ odp_classification.c \ odp_cpumask.c \ odp_crypto.c \ + odp_event.c \ odp_init.c \ odp_impl.c \ odp_linux.c \ diff --git a/platform/linux-generic/include/api/odp.h b/platform/linux-generic/include/api/odp.h index 1cc7ce0..49357b0 100644 --- a/platform/linux-generic/include/api/odp.h +++ b/platform/linux-generic/include/api/odp.h @@ -49,6 +49,7 @@ extern "C" { #include #include #include +#include #ifdef __cplusplus } diff --git a/platform/linux-generic/include/api/odp_buffer.h b/platform/linux-generic/include/api/odp_buffer.h index 0670464..20036f9 100644 --- a/platform/linux-generic/include/api/odp_buffer.h +++ b/platform/linux-generic/include/api/odp_buffer.h @@ -21,6 +21,7 @@ extern "C" { #include #include +#include /** @defgroup odp_buffer ODP BUFFER * Operations on a buffer. @@ -29,6 +30,28 @@ extern "C" { /** + * Get buffer handle from event + * + * Converts an ODP_EVENT_BUFFER type event to a buffer. + * + * @param ev Event handle + * + * @return Buffer handle + * + * @see odp_event_type() + */ +odp_buffer_t odp_buffer_from_event(odp_event_t ev); + +/** + * Convert buffer handle to event + * + * @param buf Buffer handle + * + * @return Event handle + */ +odp_event_t odp_buffer_to_event(odp_buffer_t buf); + +/** * Buffer start address * * @param buf Buffer handle @@ -55,12 +78,11 @@ uint32_t odp_buffer_size(odp_buffer_t buf); */ int odp_buffer_type(odp_buffer_t buf); -#define ODP_BUFFER_TYPE_INVALID (-1) /**< Buffer type invalid */ -#define ODP_BUFFER_TYPE_ANY 0 /**< Buffer that can hold any other - buffer type */ -#define ODP_BUFFER_TYPE_RAW 1 /**< Raw buffer, no additional metadata */ -#define ODP_BUFFER_TYPE_PACKET 2 /**< Packet buffer */ -#define ODP_BUFFER_TYPE_TIMEOUT 3 /**< Timeout buffer */ +#define ODP_BUFFER_TYPE_INVALID ODP_EVENT_TYPE_INVALID +#define ODP_BUFFER_TYPE_ANY 0 +#define ODP_BUFFER_TYPE_RAW ODP_EVENT_BUFFER +#define ODP_BUFFER_TYPE_PACKET ODP_EVENT_PACKET +#define ODP_BUFFER_TYPE_TIMEOUT ODP_EVENT_TIMEOUT /** * Tests if buffer is valid diff --git a/platform/linux-generic/include/api/odp_event.h b/platform/linux-generic/include/api/odp_event.h new file mode 100644 index 0000000..209d968 --- /dev/null +++ b/platform/linux-generic/include/api/odp_event.h @@ -0,0 +1,59 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + + +/** + * @file + * + * ODP event + */ + +#ifndef ODP_EVENT_H_ +#define ODP_EVENT_H_ + +#ifdef __cplusplus +extern "C" { +#endif + + +#include +#include + +/** @defgroup odp_event ODP EVENT + * Operations on an event. + * @{ + */ + + +/** + * Event type + * + * @param event Event handle + * + * @return Event type or ODP_EVENT_TYPE_INVALID + */ +int odp_event_type(odp_event_t event); + +/** Invalid event type */ +#define ODP_EVENT_TYPE_INVALID (-1) +/** Buffer event */ +#define ODP_EVENT_BUFFER 1 +/** Packet event */ +#define ODP_EVENT_PACKET 2 +/** Timeout event */ +#define ODP_EVENT_TIMEOUT 3 + + + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/api/odp_packet.h b/platform/linux-generic/include/api/odp_packet.h index 920a593..92b6016 100644 --- a/platform/linux-generic/include/api/odp_packet.h +++ b/platform/linux-generic/include/api/odp_packet.h @@ -113,6 +113,27 @@ odp_packet_t odp_packet_from_buffer(odp_buffer_t buf); */ odp_buffer_t odp_packet_to_buffer(odp_packet_t pkt); +/** + * Get packet handle from event + * + * Converts an ODP_EVENT_PACKET type event to a packet. + * + * @param ev Event handle + * + * @return Packet handle + * + * @see odp_event_type() + */ +odp_packet_t odp_packet_from_event(odp_event_t ev); + +/** + * Convert packet handle to event + * + * @param pkt Packet handle + * + * @return Event handle + */ +odp_event_t odp_packet_to_event(odp_packet_t pkt); /* * diff --git a/platform/linux-generic/include/api/odp_platform_types.h b/platform/linux-generic/include/api/odp_platform_types.h index 6ed9e78..1d32e23 100644 --- a/platform/linux-generic/include/api/odp_platform_types.h +++ b/platform/linux-generic/include/api/odp_platform_types.h @@ -65,6 +65,12 @@ typedef uint32_t odp_pktio_t; /** odp_pktio_t value to indicate any port */ #define ODP_PKTIO_ANY ((odp_pktio_t)~0) +/** ODP event */ +typedef odp_buffer_t odp_event_t; + +/** Invalid event */ +#define ODP_EVENT_INVALID ODP_BUFFER_INVALID + /** * ODP shared memory block */ diff --git a/platform/linux-generic/include/api/odp_timer.h b/platform/linux-generic/include/api/odp_timer.h index 69402ef..cb17b7b 100644 --- a/platform/linux-generic/include/api/odp_timer.h +++ b/platform/linux-generic/include/api/odp_timer.h @@ -21,6 +21,7 @@ extern "C" { #include #include #include +#include #include /** @defgroup odp_timer ODP TIMER @@ -310,6 +311,18 @@ int odp_timer_cancel(odp_timer_t tim, odp_buffer_t *tmo_buf); odp_timeout_t odp_timeout_from_buf(odp_buffer_t buf); /** + * Return timeout handle that is associated with timeout event + * + * Note: any invalid parameters will cause undefined behavior and may cause + * the application to abort or crash. + * + * @param buf An event of type ODP_EVENT_TIMEOUT + * + * @return timeout handle + */ +odp_timeout_t odp_timeout_from_event(odp_event_t ev); + +/** * Check for fresh timeout * If the corresponding timer has been reset or cancelled since this timeout * was enqueued, the timeout is stale (not fresh). diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c index 57ba408..939332a 100644 --- a/platform/linux-generic/odp_buffer.c +++ b/platform/linux-generic/odp_buffer.c @@ -14,6 +14,16 @@ #include +odp_buffer_t odp_buffer_from_event(odp_event_t ev) +{ + return (odp_buffer_t)ev; +} + +odp_event_t odp_buffer_to_event(odp_buffer_t buf) +{ + return (odp_event_t)buf; +} + void *odp_buffer_addr(odp_buffer_t buf) { odp_buffer_hdr_t *hdr = odp_buf_to_hdr(buf); diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c new file mode 100644 index 0000000..c646f42 --- /dev/null +++ b/platform/linux-generic/odp_event.c @@ -0,0 +1,26 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include +#include + +int odp_event_type(odp_event_t event) +{ + odp_buffer_t buf; + + buf = odp_buffer_from_event(event); + + switch (odp_buffer_type(buf)) { + case ODP_BUFFER_TYPE_RAW: + return ODP_EVENT_BUFFER; + case ODP_BUFFER_TYPE_PACKET: + return ODP_EVENT_PACKET; + case ODP_BUFFER_TYPE_TIMEOUT: + return ODP_EVENT_TIMEOUT; + default: + return ODP_EVENT_TYPE_INVALID; + } +} diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 257abec..ebe3b55 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -75,6 +75,16 @@ odp_buffer_t odp_packet_to_buffer(odp_packet_t pkt) return (odp_buffer_t)pkt; } +odp_packet_t odp_packet_from_event(odp_event_t ev) +{ + return (odp_packet_t)ev; +} + +odp_event_t odp_packet_to_event(odp_packet_t pkt) +{ + return (odp_event_t)pkt; +} + /* * * Pointers and lengths diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 3ba32a1..d926ada 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -802,6 +803,14 @@ odp_timeout_t odp_timeout_from_buf(odp_buffer_t buf) return (odp_timeout_t)timeout_hdr_from_buf(buf); } +odp_timeout_t odp_timeout_from_event(odp_event_t ev) +{ + /* This check not mandated by the API specification */ + if (odp_event_type(ev) != ODP_EVENT_TIMEOUT) + ODP_ABORT("Event not a timeout"); + return (odp_timeout_t)timeout_hdr_from_buf(odp_buffer_from_event(ev)); +} + int odp_timeout_fresh(odp_timeout_t tmo) { const odp_timeout_hdr_t *hdr = (odp_timeout_hdr_t *)tmo;