From patchwork Mon Oct 23 11:10:42 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: 116713 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4539860qgn; Mon, 23 Oct 2017 04:36:36 -0700 (PDT) X-Received: by 10.55.153.69 with SMTP id b66mr18588462qke.107.1508758596670; Mon, 23 Oct 2017 04:36:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508758596; cv=none; d=google.com; s=arc-20160816; b=E+M5INAlnYQIP7nW7bhG3VfA9FaoiHpZopnKrTO1svPaCwBCFvWvhUObC3wFDkjz31 PYNh1mYw4epy31M4QnFZ5cTp6aH5GWIxb1ugU7B7kuRXn0lOuW9hB3tH5etMukTnSxrJ bCdQv2mE2jskcrgp3fjv1VSDdP6rRcR7q0z0e4MvoZ4Gtnp6D1i261M2LCiIbflfK2CJ 2ShwHzjfSAFeGI8wVx7/3129JQnXIevn7FABWtmgTqn5D0ZCAL93IAkMG7QpSxghbZF3 vZcjNVGhG/jPdsqqOdXqQ+911hsVIVw7i5nfFNqOlPhVOfKiPHfUWEc95ktGrcKf+5nk b82w== 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=4SLdPUNGeQCu/ykTMF6OQ4JaVTXIYMYehqtnDN6QzEc=; b=DFwGM1kZDvCJyoCYrjc8qzIc5cq0Ets3NhaBiOI0AGDKp5d7vbWSykciARNevxu3Pg is+1ujw80yYbJ1abVBSvwI7Sqm1yTz5bIJg/UAhI3q3K4Ie3crE3b28P6bRB4M/N+oeK XiTvdmSESFSle7U8RjVuQtlc+R4CaPKcn02geUPuS3siUTSJKjwJOUzOjAqEg8RD6t3/ 5sLgJRERAisIQJoG92vz19/CFYjFOqXsisYGrvEB558BCOU5SgZhQNj09Sr63RmjWPAj 06zLVG10ooaxlx8MXgjIJy6kNcwDOVtRVfx52dPcDNzXshWOt6fdvhxtwB1+35Gzsl1y LUOA== 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 e26si3778361qkj.323.2017.10.23.04.36.36; Mon, 23 Oct 2017 04:36:36 -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 4634862942; Mon, 23 Oct 2017 11:36:36 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 911BD622DE; Mon, 23 Oct 2017 11:14:09 +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 DC26B622DD; Mon, 23 Oct 2017 11:13:02 +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-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by lists.linaro.org (Postfix) with ESMTPS id 53B8B61D48 for ; Mon, 23 Oct 2017 11:11:22 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id k40so19658399lfi.4 for ; Mon, 23 Oct 2017 04:11:22 -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=4SLdPUNGeQCu/ykTMF6OQ4JaVTXIYMYehqtnDN6QzEc=; b=FXnNwVIXx1JtObgk/c41R9UfJvgMaXX54qZf2yjvdfggfRb0BL01FJR/SZuT61YoEu x62y3+znNy8DYuxp1L/Y3L3xRhAWQxm9nhP8iyzc4b4fpLt7DU+uqM/LJgDUpxXHiD3u nEnbYu8Zfi/r35v0Vu6gveZPkLn8HvGSQcRh8xzQ11Y0YKAV3/60UQGL7IftniJaIsOo zyGo+rwaOMdYwciCxpGwzrDqgoChdyl8Eg2dKE+3DfWzwdJHE6MeXivhH+KSBedsx6wX 2FZRfM+VP6e4aVEF4PDb069nAyMOEhoHGKXsFfOLFjlBqW/JfJza7pkKQL6lekS4bmhI yTVw== X-Gm-Message-State: AMCzsaV0Eiled9hYcTbN/MfXSNP8xWep1vyF5eCFxGPAYI6TzNUTw2HF 9Fko0hqmfsPMFxXd7LKERf0XX45C0G29zg== X-Google-Smtp-Source: ABhQp+QrYUIrvLkwmzyil8bThzplMBFokRnBlqwdLR7Ta4X+GILo3oArcQRght7YCuk2yQe7VYEd/g== X-Received: by 10.46.29.65 with SMTP id d62mr5297388ljd.139.1508757080975; Mon, 23 Oct 2017 04:11:20 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:20 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:42 +0300 Message-Id: <20171023111057.6328-15-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 14/29] 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 9615cb012653..95f23c8134f4 100644 --- a/include/odp/api/abi-default/schedule.h +++ b/include/odp/api/abi-default/schedule.h @@ -27,14 +27,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 21ad4db7617b..badc4ca09eb7 100644 --- a/include/odp/api/abi-default/schedule_types.h +++ b/include/odp/api/abi-default/schedule_types.h @@ -38,6 +38,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