7758f3dcb1
Summary: - This commit removes a redundant critical section in nxsem_tickkwait() Impact: - None Testing: - Tested with ping with the following configs - spresense:rndis, spresense:rndis_smp Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
175 lines
5.3 KiB
C
175 lines
5.3 KiB
C
/****************************************************************************
|
|
* sched/semaphore/sem_tickwait.c
|
|
*
|
|
* 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
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* 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.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
|
|
#include <stdint.h>
|
|
#include <unistd.h>
|
|
#include <time.h>
|
|
#include <errno.h>
|
|
#include <debug.h>
|
|
|
|
#include <nuttx/irq.h>
|
|
#include <nuttx/arch.h>
|
|
#include <nuttx/clock.h>
|
|
#include <nuttx/wdog.h>
|
|
|
|
#include "sched/sched.h"
|
|
#include "semaphore/semaphore.h"
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: nxsem_tickwait
|
|
*
|
|
* Description:
|
|
* This function is a lighter weight version of sem_timedwait(). It is
|
|
* non-standard and intended only for use within the RTOS.
|
|
*
|
|
* Input Parameters:
|
|
* sem - Semaphore object
|
|
* start - The system time that the delay is relative to. If the
|
|
* current time is not the same as the start time, then the
|
|
* delay will be adjust so that the end time will be the same
|
|
* in any event.
|
|
* delay - Ticks to wait from the start time until the semaphore is
|
|
* posted. If ticks is zero, then this function is equivalent
|
|
* to nxsem_trywait().
|
|
*
|
|
* Returned Value:
|
|
* This is an internal OS interface, not available to applications, and
|
|
* hence follows the NuttX internal error return policy: Zero (OK) is
|
|
* returned on success. A negated errno value is returned on failure.
|
|
* -ETIMEDOUT is returned on the timeout condition.
|
|
*
|
|
****************************************************************************/
|
|
|
|
int nxsem_tickwait(FAR sem_t *sem, clock_t start, uint32_t delay)
|
|
{
|
|
FAR struct tcb_s *rtcb = this_task();
|
|
clock_t elapsed;
|
|
int ret;
|
|
|
|
DEBUGASSERT(sem != NULL && up_interrupt_context() == false);
|
|
|
|
/* NOTE: We do not need a critical section here, because
|
|
* nxsem_wait() and nxsem_timeout() use a critical section
|
|
* in the functions.
|
|
*/
|
|
|
|
/* Try to take the semaphore without waiting. */
|
|
|
|
ret = nxsem_trywait(sem);
|
|
if (ret == OK)
|
|
{
|
|
/* We got it! */
|
|
|
|
goto out;
|
|
}
|
|
|
|
/* We will have to wait for the semaphore. Make sure that we were provided
|
|
* with a valid timeout.
|
|
*/
|
|
|
|
if (delay == 0)
|
|
{
|
|
/* Return the errno from nxsem_trywait() */
|
|
|
|
goto out;
|
|
}
|
|
|
|
/* Adjust the delay for any time since the delay was calculated */
|
|
|
|
elapsed = clock_systime_ticks() - start;
|
|
if (/* elapsed >= (UINT32_MAX / 2) || */ elapsed >= delay)
|
|
{
|
|
ret = -ETIMEDOUT;
|
|
goto out;
|
|
}
|
|
|
|
delay -= elapsed;
|
|
|
|
/* Start the watchdog with interrupts still disabled */
|
|
|
|
wd_start(&rtcb->waitdog, delay, nxsem_timeout, getpid());
|
|
|
|
/* Now perform the blocking wait */
|
|
|
|
ret = nxsem_wait(sem);
|
|
|
|
/* Stop the watchdog timer */
|
|
|
|
wd_cancel(&rtcb->waitdog);
|
|
|
|
out:
|
|
|
|
return ret;
|
|
}
|
|
|
|
/****************************************************************************
|
|
* Name: nxsem_tickwait_uninterruptible
|
|
*
|
|
* Description:
|
|
* This function is wrapped version of nxsem_tickwait(), which is
|
|
* uninterruptible and convenient for use.
|
|
*
|
|
* Input Parameters:
|
|
* sem - Semaphore object
|
|
* start - The system time that the delay is relative to. If the
|
|
* current time is not the same as the start time, then the
|
|
* delay will be adjust so that the end time will be the same
|
|
* in any event.
|
|
* delay - Ticks to wait from the start time until the semaphore is
|
|
* posted. If ticks is zero, then this function is equivalent
|
|
* to sem_trywait().
|
|
*
|
|
* Returned Value:
|
|
* This is an internal OS interface, not available to applications, and
|
|
* hence follows the NuttX internal error return policy: Zero (OK) is
|
|
* returned on success. A negated errno value is returned on failure:
|
|
*
|
|
* -ETIMEDOUT is returned on the timeout condition.
|
|
* -ECANCELED may be returned if the thread is canceled while waiting.
|
|
*
|
|
****************************************************************************/
|
|
|
|
int nxsem_tickwait_uninterruptible(FAR sem_t *sem, clock_t start,
|
|
uint32_t delay)
|
|
{
|
|
int ret;
|
|
|
|
do
|
|
{
|
|
/* Take the semaphore (perhaps waiting) */
|
|
|
|
ret = nxsem_tickwait(sem, start, delay);
|
|
}
|
|
while (ret == -EINTR);
|
|
|
|
return ret;
|
|
}
|
|
|