From patchwork Fri Oct 27 12:49:58 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: 117335 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp764590qgn; Fri, 27 Oct 2017 06:19:24 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Q6KO2FQVSI0NtNOOAfAULg1+3g4WzraGEB5tquiu2YIcKboW5cQOYGe6OGRfFa/0Uip8jU X-Received: by 10.55.192.204 with SMTP id v73mr692150qkv.117.1509110363901; Fri, 27 Oct 2017 06:19:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509110363; cv=none; d=google.com; s=arc-20160816; b=G9FMgZKM2snYHgdqSIeRhASv9VsLTcXDlrChGmzlQtbagybcm8TSgs67AGF2B655v+ fZksTGREYklQ4oFNafecAIjc75koKiBdf+BmJzQZmVXFeDE946NetvL9jzoIUPNaTcCx c/NizVCrjEjz9VY74LJ6raj/hEzW6uwynesah9h7o6z45e9qF4pE7FlARxhrS+/zJrL4 QuUsKBw+lW+hUIszUHeM0Y+MARMhVDckySKAhIHOkywih0195QI0x4vpsUnBtmyLZKSr RBL0I30OvY4eW10c5CpvnKToCp4id1rJGqEUQfdrX0+BOiWIm0X/oplr2VK+abuegjFV hK4g== 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=shwXREqr6HUN/6ja8zZ/pKxWt9qHsHX5xlob5H1JTIo=; b=usq5istRo8JSE7FS+reQ4V8Nv63/IU/SqQgeSavi3o+IuAN92Ch9nYsAarZKFu4yLe warJTfs5nCrRk5i+qPFw5vwg92cXlw55cQnfYMZNsmnhcTQ3xygJgsMT5ehFQWW/lqKK FbBOji1Jv9f8osdTjtnUrbAn20UwVnAnOjLRy2oLnJNiPsfPQnIBugiM3kVoFyWSiLVs RfvFEXP5j3AtrBRAKmp3CWaiBHsfEcRaoZNAjn/+zz/ZMOsp7XjgHq95oqUi0Lc7/zZ4 8D4zCvmOGBhobS4H4I68FCX23x7VUr8P+1Jgomti2IyplflCizz14MDcIyQpWJ8usGmc Terw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id a62si6384718qkg.117.2017.10.27.06.19.23; Fri, 27 Oct 2017 06:19:23 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 82AF5629E6; Fri, 27 Oct 2017 13:19:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id A66796298F; Fri, 27 Oct 2017 12:53:47 +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 D0CA562875; Fri, 27 Oct 2017 12:52:17 +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.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by lists.linaro.org (Postfix) with ESMTPS id F3C4162875 for ; Fri, 27 Oct 2017 12:50:37 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id n69so7303758lfn.2 for ; Fri, 27 Oct 2017 05:50:37 -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=shwXREqr6HUN/6ja8zZ/pKxWt9qHsHX5xlob5H1JTIo=; b=bF14fWtAHLRgAAsxrWxyEqg52odPaKTZARrMc6LtF795cv90l7gykS4o7bDEjN69tG A47wpIWd27lus5PCT6v3eupNf3+lCluddpV3G9waJGmAdwqTBnsqtEP1cZW+M1orpuO4 X+UZAZMafcVQL3KUwt4Jon42PdzOuDgTbNx8K5hrM+26W17AU0qYmaSR4x9Su9Z1X8U2 7kqikJ47QVX09EuQ1NQ2G7GnMqYsrN4FCHnczFuImy1GemwIovVgE3YhHV1xNyfDirLT Np6ooKxUuBIl95R6OKty0aXXpgb1uZjF/KLRJuV5dFEudO15kJjEDLWRBp9ry6jdH+fL bOzg== X-Gm-Message-State: AMCzsaVaPLGziWydifvu2JBK0GaDID/zXINjeOOZ1/cWkaTvaB3gF/lK M+ounk81BGyPKGZa25qYX4eCcNhuMMTZaw== X-Received: by 10.25.78.141 with SMTP id u13mr128510lfk.156.1509108636616; Fri, 27 Oct 2017 05:50:36 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.222]) by smtp.gmail.com with ESMTPSA id l194sm1584690lfl.11.2017.10.27.05.50.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Oct 2017 05:50:36 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Fri, 27 Oct 2017 15:49:58 +0300 Message-Id: <20171027125014.27313-15-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171027125014.27313-1-dmitry.ereminsolenikov@linaro.org> References: <20171027125014.27313-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH v10 14/30] api: schedule: remove duplication between schedule and schedule_types 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" Move the rest of ODP_SCHED_GROUP_* defines to schedule_types.h to remove duplication between headers. Signed-off-by: Dmitry Eremin-Solenikov --- include/odp/api/abi-default/schedule.h | 8 -------- include/odp/api/abi-default/schedule_types.h | 8 ++++++++ include/odp/api/spec/schedule.h | 20 -------------------- include/odp/api/spec/schedule_types.h | 10 ++++++++++ 4 files changed, 18 insertions(+), 28 deletions(-) -- 2.14.2 diff --git a/include/odp/api/abi-default/schedule.h b/include/odp/api/abi-default/schedule.h index 27f9b3a2bf7d..009b14ecb49a 100644 --- a/include/odp/api/abi-default/schedule.h +++ b/include/odp/api/abi-default/schedule.h @@ -26,14 +26,6 @@ extern "C" { #define ODP_SCHED_WAIT UINT64_MAX #define ODP_SCHED_NO_WAIT 0 -typedef int odp_schedule_group_t; - -/* These must be kept in sync with thread_globals_t in odp_thread.c */ -#define ODP_SCHED_GROUP_INVALID ((odp_schedule_group_t)-1) -#define ODP_SCHED_GROUP_ALL 0 -#define ODP_SCHED_GROUP_WORKER 1 -#define ODP_SCHED_GROUP_CONTROL 2 - #define ODP_SCHED_GROUP_NAME_LEN 32 /** diff --git a/include/odp/api/abi-default/schedule_types.h b/include/odp/api/abi-default/schedule_types.h index f71df37ce430..10065a98c7f7 100644 --- a/include/odp/api/abi-default/schedule_types.h +++ b/include/odp/api/abi-default/schedule_types.h @@ -37,6 +37,14 @@ typedef int odp_schedule_sync_t; #define ODP_SCHED_SYNC_ATOMIC 1 #define ODP_SCHED_SYNC_ORDERED 2 +typedef int odp_schedule_group_t; + +/* These must be kept in sync with thread_globals_t in odp_thread.c */ +#define ODP_SCHED_GROUP_INVALID ((odp_schedule_group_t)-1) +#define ODP_SCHED_GROUP_ALL 0 +#define ODP_SCHED_GROUP_WORKER 1 +#define ODP_SCHED_GROUP_CONTROL 2 + /** * @} */ diff --git a/include/odp/api/spec/schedule.h b/include/odp/api/spec/schedule.h index 524449647b0c..8c55b4ec2ba5 100644 --- a/include/odp/api/spec/schedule.h +++ b/include/odp/api/spec/schedule.h @@ -45,26 +45,6 @@ extern "C" { * Maximum schedule group name length in chars including null char */ -/** - * @def ODP_SCHED_GROUP_INVALID - * Invalid scheduler group - */ - -/** - * @def ODP_SCHED_GROUP_ALL - * Predefined scheduler group of all threads - */ - -/** - * @def ODP_SCHED_GROUP_WORKER - * Predefined scheduler group of all worker threads - */ - -/** - * @def ODP_SCHED_GROUP_CONTROL - * Predefined scheduler group of all control threads - */ - /** * Schedule wait time * diff --git a/include/odp/api/spec/schedule_types.h b/include/odp/api/spec/schedule_types.h index e0dc4027b91b..a13cc4f13317 100644 --- a/include/odp/api/spec/schedule_types.h +++ b/include/odp/api/spec/schedule_types.h @@ -112,6 +112,11 @@ extern "C" { * Scheduler thread group */ +/** + * @def ODP_SCHED_GROUP_INVALID + * Invalid scheduler group + */ + /** * @def ODP_SCHED_GROUP_ALL * Group of all threads. All active worker and control threads belong to this @@ -126,6 +131,11 @@ extern "C" { * old threads exit ODP. */ +/** + * @def ODP_SCHED_GROUP_CONTROL + * Predefined scheduler group of all control threads + */ + /** Scheduler parameters */ typedef struct odp_schedule_param_t { /** Priority level