From patchwork Tue Aug 18 11:01:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 52497 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id E4AF522DB1 for ; Tue, 18 Aug 2015 11:04:40 +0000 (UTC) Received: by wilj18 with SMTP id j18sf34522034wil.0 for ; Tue, 18 Aug 2015 04:04:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to: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=XPpllbpdEpY5f52dGt8pU7Tz+3Q4uNNOr3EtiES+YnE=; b=EBEkr7zSpZT9lDhhG64alZXh+XzIGji35NoGlxRS01JaCYiF5CGkMouiPAI/cpg7eR s37GkdE3JQLKXjguFNzvhmkjGqARXxjoewqEI4cOznUL+nsX2u1NJp1WAPLlLXTIyufu e+V7nACnBk7Nnw3kg5X2pL8QZ52nAwe+q6lch1cU/Tuh6p3XVPonIwjZDLbeV+Ss5U+l Fa/3G1hAxHmV5cowLTpaSgDxBL85qhIlgDNl45VXZOybi6eqd86MQWnkrWJFAtYzOzeR dpFkTkOJ3hHraOYtK3mxEn2epEaOkrpQBsbNLjfnl7Qi4h92qccTwth23pg+l/YrolWM 1haA== X-Gm-Message-State: ALoCoQnXoIjL6z6PJPyqaVYSzmptf/3Dsz1Rtr2tNxA1QICwo/7Spv1aI3LQuJWGUwdi9BKjvNev X-Received: by 10.112.90.225 with SMTP id bz1mr1656832lbb.12.1439895880196; Tue, 18 Aug 2015 04:04:40 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.163 with SMTP id w3ls771816lae.21.gmail; Tue, 18 Aug 2015 04:04:40 -0700 (PDT) X-Received: by 10.152.10.148 with SMTP id i20mr5675535lab.63.1439895880040; Tue, 18 Aug 2015 04:04:40 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id sj10si13856766lac.117.2015.08.18.04.04.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Aug 2015 04:04:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by lahi9 with SMTP id i9so96478105lah.2 for ; Tue, 18 Aug 2015 04:04:39 -0700 (PDT) X-Received: by 10.112.199.133 with SMTP id jk5mr5961635lbc.32.1439895879893; Tue, 18 Aug 2015 04:04:39 -0700 (PDT) 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.162.200 with SMTP id yc8csp405520lbb; Tue, 18 Aug 2015 04:04:38 -0700 (PDT) X-Received: by 10.50.93.74 with SMTP id cs10mr20732108igb.42.1439895878059; Tue, 18 Aug 2015 04:04:38 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 27si9005714ioh.81.2015.08.18.04.04.37; Tue, 18 Aug 2015 04:04:38 -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; Received: by lists.linaro.org (Postfix, from userid 109) id EE54161F6B; Tue, 18 Aug 2015 11:04:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id E53DE61F66; Tue, 18 Aug 2015 11:02:39 +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 BCCEE61F77; Tue, 18 Aug 2015 11:02:35 +0000 (UTC) Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by lists.linaro.org (Postfix) with ESMTPS id 8E97E61E89 for ; Tue, 18 Aug 2015 11:01:51 +0000 (UTC) Received: by wicne3 with SMTP id ne3so92108578wic.0 for ; Tue, 18 Aug 2015 04:01:50 -0700 (PDT) X-Received: by 10.180.76.232 with SMTP id n8mr43643101wiw.72.1439895710806; Tue, 18 Aug 2015 04:01:50 -0700 (PDT) Received: from localhost.localdomain ([87.120.178.39]) by smtp.gmail.com with ESMTPSA id e8sm20892047wiz.0.2015.08.18.04.01.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Aug 2015 04:01:50 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Tue, 18 Aug 2015 14:01:30 +0300 Message-Id: <1439895698-18597-5-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439895698-18597-1-git-send-email-maxim.uvarov@linaro.org> References: <1439895698-18597-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv8 04/12] move odph_pause inside linux-generic X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 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" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: maxim.uvarov@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.53 as permitted sender) smtp.mailfrom=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 Move odph_pause inside linux-generic. Validation test is also useless with such move. Signed-off-by: Maxim Uvarov --- helper/Makefile.am | 4 +--- helper/ring.c | 2 +- helper/test/Makefile.am | 4 +--- helper/test/odph_pause.c | 14 -------------- platform/linux-generic/Makefile.am | 1 + .../linux-generic/include/odp_pause_internal.h | 0 6 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 helper/test/odph_pause.c rename helper/odph_pause.h => platform/linux-generic/include/odp_pause_internal.h (100%) diff --git a/helper/odph_pause.h b/platform/linux-generic/include/odp_pause_internal.h similarity index 100% rename from helper/odph_pause.h rename to platform/linux-generic/include/odp_pause_internal.h diff --git a/helper/Makefile.am b/helper/Makefile.am index 1a74e8e..cde8af2 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -19,9 +19,7 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/tcp.h\ $(srcdir)/include/odp/helper/udp.h -noinst_HEADERS = \ - $(srcdir)/odph_debug.h \ - $(srcdir)/odph_pause.h +noinst_HEADERS = $(srcdir)/odph_debug.h __LIB__libodphelper_la_SOURCES = \ linux.c \ diff --git a/helper/ring.c b/helper/ring.c index 844abf7..6bb2bda 100644 --- a/helper/ring.c +++ b/helper/ring.c @@ -71,7 +71,7 @@ #include #include -#include "odph_pause.h" +#include "odp_pause_internal.h" #include #include #include diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index fbf5a9b..7b73602 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -7,8 +7,7 @@ TESTS_ENVIRONMENT += TEST_DIR=${builddir} EXECUTABLES = odp_chksum$(EXEEXT) \ odp_thread$(EXEEXT) \ - odp_process$(EXEEXT)\ - odph_pause$(EXEEXT) + odp_process$(EXEEXT) COMPILE_ONLY = @@ -28,4 +27,3 @@ dist_odp_thread_SOURCES = odp_thread.c odp_thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la dist_odp_process_SOURCES = odp_process.c odp_process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la -odph_pause_SOURCES = odph_pause.c diff --git a/helper/test/odph_pause.c b/helper/test/odph_pause.c deleted file mode 100644 index f5f5da3..0000000 --- a/helper/test/odph_pause.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include -#include "../odph_pause.h" - -int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) -{ - odph_pause(); - return 0; -} diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index fb145e7..cfeeef9 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -122,6 +122,7 @@ noinst_HEADERS = \ ${srcdir}/include/odp_packet_io_internal.h \ ${srcdir}/include/odp_packet_io_queue.h \ ${srcdir}/include/odp_packet_socket.h \ + ${srcdir}/include/odp_pause_internal.h \ ${srcdir}/include/odp_pool_internal.h \ ${srcdir}/include/odp_queue_internal.h \ ${srcdir}/include/odp_schedule_internal.h \