Add a k_timeout_t type, and use it everywhere that kernel API functions were accepting a millisecond timeout argument. Instead of forcing milliseconds everywhere (which are often not integrally representable as system ticks), do the conversion to ticks at the point where the timeout is created. This avoids an extra unit conversion in some application code, and allows us to express the timeout in units other than milliseconds to achieve greater precision. The existing K_MSEC() et. al. macros now return initializers for a k_timeout_t. The K_NO_WAIT and K_FOREVER constants have now become k_timeout_t values, which means they cannot be operated on as integers. Applications which have their own APIs that need to inspect these vs. user-provided timeouts can now use a K_TIMEOUT_EQ() predicate to test for equality. Timer drivers, which receive an integer tick count in ther z_clock_set_timeout() functions, now use the integer-valued K_TICKS_FOREVER constant instead of K_FOREVER. For the initial release, to preserve source compatibility, a CONFIG_LEGACY_TIMEOUT_API kconfig is provided. When true, the k_timeout_t will remain a compatible 32 bit value that will work with any legacy Zephyr application. Some subsystems present timeout (or timeout-like) values to their own users as APIs that would re-use the kernel's own constants and conventions. These will require some minor design work to adapt to the new scheme (in most cases just using k_timeout_t directly in their own API), and they have not been changed in this patch, instead selecting CONFIG_LEGACY_TIMEOUT_API via kconfig. These subsystems include: CAN Bus, the Microbit display driver, I2S, LoRa modem drivers, the UART Async API, Video hardware drivers, the console subsystem, and the network buffer abstraction. k_sleep() now takes a k_timeout_t argument, with a k_msleep() variant provided that works identically to the original API. Most of the changes here are just type/configuration management and documentation, but there are logic changes in mempool, where a loop that used a timeout numerically has been reworked using a new z_timeout_end_calc() predicate. Also in queue.c, a (when POLL was enabled) a similar loop was needlessly used to try to retry the k_poll() call after a spurious failure. But k_poll() does not fail spuriously, so the loop was removed. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
158 lines
3.5 KiB
C++
158 lines
3.5 KiB
C++
/*
|
|
* Copyright (c) 2015-2016 Wind River Systems, Inc.
|
|
*
|
|
* Licensed 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.
|
|
*/
|
|
|
|
/**
|
|
* @file C++ Synchronization demo. Uses basic C++ functionality.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <zephyr.h>
|
|
#include <arch/cpu.h>
|
|
#include <sys/printk.h>
|
|
|
|
/**
|
|
* @class semaphore the basic pure virtual semaphore class
|
|
*/
|
|
class semaphore {
|
|
public:
|
|
virtual int wait(void) = 0;
|
|
virtual int wait(int timeout) = 0;
|
|
virtual void give(void) = 0;
|
|
};
|
|
|
|
/* specify delay between greetings (in ms); compute equivalent in ticks */
|
|
#define SLEEPTIME 500
|
|
#define STACKSIZE 2000
|
|
|
|
struct k_thread coop_thread;
|
|
K_THREAD_STACK_DEFINE(coop_stack, STACKSIZE);
|
|
|
|
/*
|
|
* @class cpp_semaphore
|
|
* @brief Semaphore
|
|
*
|
|
* Class derives from the pure virtual semaphore class and
|
|
* implements it's methods for the semaphore
|
|
*/
|
|
class cpp_semaphore: public semaphore {
|
|
protected:
|
|
struct k_sem _sema_internal;
|
|
public:
|
|
cpp_semaphore();
|
|
virtual ~cpp_semaphore() {}
|
|
virtual int wait(void);
|
|
virtual int wait(int timeout);
|
|
virtual void give(void);
|
|
};
|
|
|
|
/*
|
|
* @brief cpp_semaphore basic constructor
|
|
*/
|
|
cpp_semaphore::cpp_semaphore()
|
|
{
|
|
printk("Create semaphore %p\n", this);
|
|
k_sem_init(&_sema_internal, 0, UINT_MAX);
|
|
}
|
|
|
|
/*
|
|
* @brief wait for a semaphore
|
|
*
|
|
* Test a semaphore to see if it has been signaled. If the signal
|
|
* count is greater than zero, it is decremented.
|
|
*
|
|
* @return 1 when semaphore is available
|
|
*/
|
|
int cpp_semaphore::wait(void)
|
|
{
|
|
k_sem_take(&_sema_internal, K_FOREVER);
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* @brief wait for a semaphore within a specified timeout
|
|
*
|
|
* Test a semaphore to see if it has been signaled. If the signal
|
|
* count is greater than zero, it is decremented. The function
|
|
* waits for timeout specified
|
|
*
|
|
* @param timeout the specified timeout in ticks
|
|
*
|
|
* @return 1 if semaphore is available, 0 if timed out
|
|
*/
|
|
int cpp_semaphore::wait(int timeout)
|
|
{
|
|
return k_sem_take(&_sema_internal, K_MSEC(timeout));
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @brief Signal a semaphore
|
|
*
|
|
* This routine signals the specified semaphore.
|
|
*
|
|
* @return N/A
|
|
*/
|
|
void cpp_semaphore::give(void)
|
|
{
|
|
k_sem_give(&_sema_internal);
|
|
}
|
|
|
|
cpp_semaphore sem_main;
|
|
cpp_semaphore sem_coop;
|
|
|
|
void coop_thread_entry(void)
|
|
{
|
|
struct k_timer timer;
|
|
|
|
k_timer_init(&timer, NULL, NULL);
|
|
|
|
while (1) {
|
|
/* wait for main thread to let us have a turn */
|
|
sem_coop.wait();
|
|
|
|
/* say "hello" */
|
|
printk("%s: Hello World!\n", __FUNCTION__);
|
|
|
|
/* wait a while, then let main thread have a turn */
|
|
k_timer_start(&timer, K_MSEC(SLEEPTIME), K_NO_WAIT);
|
|
k_timer_status_sync(&timer);
|
|
sem_main.give();
|
|
}
|
|
}
|
|
|
|
void main(void)
|
|
{
|
|
struct k_timer timer;
|
|
|
|
k_thread_create(&coop_thread, coop_stack, STACKSIZE,
|
|
(k_thread_entry_t) coop_thread_entry,
|
|
NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
|
|
k_timer_init(&timer, NULL, NULL);
|
|
|
|
while (1) {
|
|
/* say "hello" */
|
|
printk("%s: Hello World!\n", __FUNCTION__);
|
|
|
|
/* wait a while, then let coop thread have a turn */
|
|
k_timer_start(&timer, K_MSEC(SLEEPTIME), K_NO_WAIT);
|
|
k_timer_status_sync(&timer);
|
|
sem_coop.give();
|
|
|
|
/* Wait for coop thread to let us have a turn */
|
|
sem_main.wait();
|
|
}
|
|
}
|