From patchwork Fri Jan 27 14:29:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92661 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp231814obz; Fri, 27 Jan 2017 06:37:33 -0800 (PST) X-Received: by 10.200.48.65 with SMTP id g1mr7905225qte.94.1485527853472; Fri, 27 Jan 2017 06:37:33 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id p132si3648047qka.200.2017.01.27.06.37.28; Fri, 27 Jan 2017 06:37:33 -0800 (PST) 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 37A9B60E18; Fri, 27 Jan 2017 14:37:28 +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=-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 [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id C92E760D2C; Fri, 27 Jan 2017 14:31:20 +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 8C02262E0B; Fri, 27 Jan 2017 14:31:16 +0000 (UTC) Received: from mail-lf0-f49.google.com (mail-lf0-f49.google.com [209.85.215.49]) by lists.linaro.org (Postfix) with ESMTPS id E03C660D6B for ; Fri, 27 Jan 2017 14:29:57 +0000 (UTC) Received: by mail-lf0-f49.google.com with SMTP id v186so162827305lfa.1 for ; Fri, 27 Jan 2017 06:29:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HPXi1jx2n54F4M2axvMegLHMhW3cWTS/oF0vxePq4eo=; b=OWKrUHi/AQHfZcvK92vSdoQIz8drNC2Dl14nTySMe9Gdwvn1L2V0IUBXKAkoPyqIHT MCSmyJDTVn1FB1HWBN2STNBHyyF0z8xEW+KGOkihF7bxvP4RxjmaljGLaylFn2lJoUOj GCJ22A/vbVbjHQlasEWEuZx2c+jjZclblGFR6gHcNKhse3rJqh1WOD/sHwZ9LbNNK6xT 05AYZiq/pNccsgZLKukTBZEQy9aBpteyiYT+jEH4tOUpH+R6xUM3iHaTcBjsh4F3ewQ7 3loSrvUOovnWKOhrOS92rjWgbXhuQArt6De/FldvBkE8dKWFqfLefEttROjA93ZWU+Hq JBHQ== X-Gm-Message-State: AIkVDXJ4y6wHnNGGySkXYlgd/fU56n60LpP3teLHTLW5ja9TA1ogytHPHPsAKnRCDjDqHU/qFRc= X-Received: by 10.25.56.25 with SMTP id f25mr3025251lfa.83.1485527396454; Fri, 27 Jan 2017 06:29:56 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:55 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:17 +0300 Message-Id: <20170127142921.29029-12-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 11/15] merge fix: odp_schedule_sp.c 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: Maxim Uvarov --- platform/linux-generic/odp_schedule_sp.c | 36 -------------------------------- 1 file changed, 36 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 56088bd8..1bc33eb2 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -364,7 +364,6 @@ static inline sched_cmd_t *rem_head(int group, int prio) prio_queue_t *prio_queue; uint32_t ring_idx, index; int pktio; -<<<<<<< HEAD prio_queue = &sched_global.prio_queue[group][prio]; @@ -373,16 +372,6 @@ static inline sched_cmd_t *rem_head(int group, int prio) if (ring_idx == RING_EMPTY) return NULL; -======= - - prio_queue = &sched_global.prio_queue[group][prio]; - - ring_idx = ring_deq(&prio_queue->ring, RING_MASK); - - if (ring_idx == RING_EMPTY) - return NULL; - ->>>>>>> v1.13.0.0 pktio = index_from_ring_idx(&index, ring_idx); if (pktio) @@ -451,7 +440,6 @@ static inline sched_cmd_t *sched_cmd(void) /* There's no matching store_rel since the value is updated while * holding a lock */ gen_cnt = odp_atomic_load_acq_u32(&thr_group->gen_cnt); -<<<<<<< HEAD /* Check if groups have changed and need to be read again */ if (odp_unlikely(gen_cnt != sched_local.gen_cnt)) { @@ -467,23 +455,6 @@ static inline sched_cmd_t *sched_cmd(void) odp_ticketlock_unlock(&sched_group->s.lock); -======= - - /* Check if groups have changed and need to be read again */ - if (odp_unlikely(gen_cnt != sched_local.gen_cnt)) { - int num_grp; - - odp_ticketlock_lock(&sched_group->s.lock); - - num_grp = thr_group->num_group; - gen_cnt = odp_atomic_load_u32(&thr_group->gen_cnt); - - for (i = 0; i < num_grp; i++) - sched_local.group[i] = thr_group->group[i]; - - odp_ticketlock_unlock(&sched_group->s.lock); - ->>>>>>> v1.13.0.0 sched_local.num_group = num_grp; sched_local.gen_cnt = gen_cnt; } @@ -837,13 +808,10 @@ static void order_unlock(void) { } -<<<<<<< HEAD static void save_context(queue_entry_t *queue ODP_UNUSED) { } -======= ->>>>>>> v1.13.0.0 /* Fill in scheduler interface */ const schedule_fn_t schedule_sp_fn = { .pktio_start = pktio_start, @@ -861,12 +829,8 @@ const schedule_fn_t schedule_sp_fn = { .term_local = term_local, .order_lock = order_lock, .order_unlock = order_unlock, -<<<<<<< HEAD .max_ordered_locks = max_ordered_locks, .save_context = save_context -======= - .max_ordered_locks = max_ordered_locks ->>>>>>> v1.13.0.0 }; /* Fill in scheduler API calls */