OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

sched/sched/sched_mergepending.c: Fix nxstyle complaints. 

And change to Apache 2.0 license.
This commit is contained in:
Gregory Nutt 2020-03-11 07:25:52 -06:00 committed by Xiang Xiao
parent 4e65d543d8
commit 295fa015bc
1 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
sched/sched/sched_mergepending.c
View File

@ -1,35 +1,20 @@
/****************************************************************************
* sched/sched/sched_mergepending.c
*
* Copyright (C) 2007, 2009, 2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* http://www.apache.org/licenses/LICENSE-2.0
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
@ -220,7 +205,7 @@ bool sched_mergepending(void)
goto errout_with_lock;
}
cpu = sched_cpu_select(ALL_CPUS /* ptcb->affinity */);
cpu = sched_cpu_select(ALL_CPUS); /* REVISIT: Maybe ptcb->affinity */
rtcb = current_task(cpu);
/* Loop while there is a higher priority task in the pending task list
@ -236,7 +221,8 @@ bool sched_mergepending(void)
{
/* Remove the task from the pending task list */
tcb = (FAR struct tcb_s *)dq_remfirst((FAR dq_queue_t *)&g_pendingtasks);
tcb = (FAR struct tcb_s *)
dq_remfirst((FAR dq_queue_t *)&g_pendingtasks);
/* Add the pending task to the correct ready-to-run list. */
@ -268,7 +254,8 @@ bool sched_mergepending(void)
/* Set up for the next time through the loop */
ptcb = (FAR struct tcb_s *)dq_peek((FAR dq_queue_t *)&g_pendingtasks);
ptcb = (FAR struct tcb_s *)
dq_peek((FAR dq_queue_t *)&g_pendingtasks);
if (ptcb == NULL)
{
/* The pending task list is empty */
@ -276,7 +263,7 @@ bool sched_mergepending(void)
goto errout_with_lock;
}
cpu = sched_cpu_select(ALL_CPUS /* ptcb->affinity */);
cpu = sched_cpu_select(ALL_CPUS); /* REVISIT: Maybe ptcb->affinity */
rtcb = current_task(cpu);
}