aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/reports/STM32F103-72.txt75
-rw-r--r--readme.txt4
-rw-r--r--src/chschd.c8
-rw-r--r--src/include/scheduler.h6
4 files changed, 58 insertions, 35 deletions
diff --git a/docs/reports/STM32F103-72.txt b/docs/reports/STM32F103-72.txt
index 602ff796c..d5204d577 100644
--- a/docs/reports/STM32F103-72.txt
+++ b/docs/reports/STM32F103-72.txt
@@ -1,87 +1,98 @@
***************************************************************************
-Kernel: ChibiOS/RT 1.1.0 unstable
+Kernel: ChibiOS/RT 1.1.1 unstable
Compiler: GCC 4.3.2 (YAGARTO 28.09.2008)
Options: -O2 -fomit-frame-pointer -mabi=apcs-gnu -falign-functions=16
Settings: SYSCLK=72, ACR=0x12 (2 wait states)
***************************************************************************
---------------------------------------------------------------------------
---- Test Case 1 (Ready List, priority enqueuing test #1)
+--- Test Case 1.1 (Ready List, priority enqueuing test #1)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 2 (Ready List, priority enqueuing test #2)
+--- Test Case 1.2 (Ready List, priority enqueuing test #2)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 3 (Semaphores, FIFO enqueuing test)
+--- Test Case 2.1 (Semaphores, FIFO enqueuing test)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 4 (Semaphores, timeout test)
+--- Test Case 2.2 (Semaphores, timeout test)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 5 (Mutexes, priority enqueuing test)
+--- Test Case 3.1 (Mutexes, priority enqueuing test)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 6 (Mutexes, priority inheritance, simple case)
+--- Test Case 3.2 (Mutexes, priority inheritance, simple case)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 7 (Mutexes, priority inheritance, complex case)
+--- Test Case 3.3 (Mutexes, priority inheritance, complex case)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 8 (CondVar, signal test)
+--- Test Case 4.1 (CondVar, signal test)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 9 (CondVar, broadcast test)
+--- Test Case 4.2 (CondVar, broadcast test)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 10 (Messages, dispatch test)
+--- Test Case 5.1 (Messages, dispatch test)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 11 (Events, wait and broadcast)
+--- Test Case 6.1 (Mailboxes, queuing and timeouts)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 12 (Heap, allocation and fragmentation test)
---- Size : 17296 bytes, not fragmented
+--- Test Case 7.1 (Events, wait and broadcast)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 13 (Memory Pools, allocation and enqueuing test)
+--- Test Case 8.1 (Heap, allocation and fragmentation test)
+--- Size : 17220 bytes, not fragmented
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 14 (Dynamic APIs, threads creation from heap)
+--- Test Case 9.1 (Memory Pools, allocation and enqueuing test)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 15 (Dynamic APIs, threads creation from memory pool)
+--- Test Case 10.1 (Dynamic APIs, threads creation from heap)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 16 (Benchmark, context switch #1, optimal)
---- Score : 216993 msgs/S, 433986 ctxswc/S
+--- Test Case 10.2 (Dynamic APIs, threads creation from memory pool)
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 17 (Benchmark, context switch #2, empty ready list)
---- Score : 178662 msgs/S, 357324 ctxswc/S
+--- Test Case 11.1 (Benchmark, context switch #1, optimal)
+--- Score : 216992 msgs/S, 433984 ctxswc/S
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 18 (Benchmark, context switch #3, 4 threads in ready list)
---- Score : 178662 msgs/S, 357324 ctxswc/S
+--- Test Case 11.2 (Benchmark, context switch #2, empty ready list)
+--- Score : 178663 msgs/S, 357326 ctxswc/S
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 19 (Benchmark, threads creation/termination, worst case)
---- Score : 164734 threads/S
+--- Test Case 11.3 (Benchmark, context switch #3, 4 threads in ready list)
+--- Score : 178663 msgs/S, 357326 ctxswc/S
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 20 (Benchmark, threads creation/termination, optimal)
---- Score : 210634 threads/S
+--- Test Case 11.4 (Benchmark, threads creation/termination, worst case)
+--- Score : 164735 threads/S
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 21 (Benchmark, mass reschedulation, 5 threads)
+--- Test Case 11.5 (Benchmark, threads creation/termination, optimal)
+--- Score : 210633 threads/S
+--- Result: SUCCESS
+---------------------------------------------------------------------------
+--- Test Case 11.6 (Benchmark, mass reschedulation, 5 threads)
--- Score : 55552 reschedulations/S, 333312 ctxswc/S
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 22 (Benchmark, I/O Queues throughput)
---- Score : 489476 bytes/S
+--- Test Case 11.7 (Benchmark, I/O Queues throughput)
+--- Score : 489472 bytes/S
+--- Result: SUCCESS
+---------------------------------------------------------------------------
+--- Test Case 11.8 (Benchmark, virtual timers set/reset)
+--- Score : 647110 timers/S
+--- Result: SUCCESS
+---------------------------------------------------------------------------
+--- Test Case 11.9 (Benchmark, semaphores wait/signal)
+--- Score : 823324 wait+signal/S
--- Result: SUCCESS
---------------------------------------------------------------------------
---- Test Case 23 (Benchmark, virtual timers set/reset)
---- Score : 647106 timers/S
+--- Test Case 11.10 (Benchmark, mutexes lock/unlock)
+--- Score : 601124 lock+unlock/S
--- Result: SUCCESS
---------------------------------------------------------------------------
diff --git a/readme.txt b/readme.txt
index f716b9422..77a6b9108 100644
--- a/readme.txt
+++ b/readme.txt
@@ -83,6 +83,10 @@ Win32-MinGW - ChibiOS/RT simulator and demo into a WIN32 process,
stable branch).
- FIX: Fixed a small problem in the chcore.c template file.
- NEW: Mailboxes (asynchronous messages) subsystem and test cases added.
+- NEW: Now all the APIs with a timeout specification accept the constant
+ TIME_ZERO (0) that triggers an immediate timeout when trying to enter a sleep
+ state. Note that the previous constant TIME_INFINITE now has value -1
+ instead of zero.
- NEW: Mode flexible debug configuration options, removed the old CH_USE_DEBUG
and CH_USE_TRACE. Replaced with CH_DBG_ENABLE_CHECKS, SCH_DBG_ENABLE_ASSERTS,
CH_DBG_ENABLE_TRACE and CH_DBG_FILL_THREADS.
diff --git a/src/chschd.c b/src/chschd.c
index aad060ac9..3c17c3831 100644
--- a/src/chschd.c
+++ b/src/chschd.c
@@ -122,8 +122,10 @@ static void wakeup(void *p) {
* to sleep is awakened after the specified time has elapsed.
*
* @param newstate the new thread state
- * @param time the number of ticks before the operation timeouts. The value
- * zero (@p TIME_INFINITE) is allowed.
+ * @param time the number of ticks before the operation timeouts. The
+ * following special values are allowed:
+ * - @p TIME_ZERO immediate timeout.
+ * - @p TIME_INFINITE no timeout.
* @return The wakeup message.
* @retval RDY_TIMEOUT if a timeout occurs.
* @note The function must be called in the system mutex zone.
@@ -131,6 +133,8 @@ static void wakeup(void *p) {
*/
msg_t chSchGoSleepTimeoutS(tstate_t newstate, systime_t time) {
+ if (TIME_ZERO == time)
+ return RDY_OK;
if (TIME_INFINITE != time) {
VirtualTimer vt;
diff --git a/src/include/scheduler.h b/src/include/scheduler.h
index 9b16dccc9..c79f061f7 100644
--- a/src/include/scheduler.h
+++ b/src/include/scheduler.h
@@ -41,9 +41,13 @@
#define HIGHPRIO 127 /**< Highest user priority.*/
#define ABSPRIO 255 /**< Greatest possible priority.*/
+/** Zero time specification for all the syscalls with a timeout
+ specification.*/
+#define TIME_ZERO ((systime_t)0)
+
/** Infinite time specification for all the syscalls with a timeout
specification.*/
-#define TIME_INFINITE 0
+#define TIME_INFINITE ((systime_t)-1)
/** The priority of the first thread on the given ready list. */
#define firstprio(rlp) ((rlp)->p_next->p_prio)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 08:26:34 +0000