aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/chevents.c16
-rw-r--r--src/chmsg.c51
-rw-r--r--src/chschd.c27
-rw-r--r--src/chsem.c15
-rw-r--r--src/chsleep.c31
-rw-r--r--src/include/scheduler.h1
-rw-r--r--src/include/sleep.h18
-rw-r--r--src/templates/chconf.h6
8 files changed, 46 insertions, 119 deletions
diff --git a/src/chevents.c b/src/chevents.c
index 13a858acd..72ca7c182 100644
--- a/src/chevents.c
+++ b/src/chevents.c
@@ -142,12 +142,6 @@ t_eventid chEvtWait(t_eventmask ewmask,
return chEvtWaitTimeout(ewmask, handlers, TIME_INFINITE);
}
-static void wakeup(void *p) {
-
- chDbgAssert(((Thread *)p)->p_state == PRWTEVENT, "chevents.c, wakeup()");
- chSchReadyI(p, RDY_TIMEOUT);
-}
-
/**
* The function waits for an event or the specified timeout then returns the
* event identifier, if an event handler is specified then the handler is
@@ -177,17 +171,9 @@ t_eventid chEvtWaitTimeout(t_eventmask ewmask,
chSysLock();
if ((currp->p_epending & ewmask) == 0) {
- VirtualTimer vt;
-
- chVTSetI(&vt, time, wakeup, currp);
currp->p_ewmask = ewmask;
- chSchGoSleepS(PRWTEVENT);
- if (!chVTIsArmedI(&vt)) {
-
- chSysUnlock();
+ if (chSchGoSleepTimeoutS(PRWTEVENT, time) < RDY_OK)
return RDY_TIMEOUT;
- }
- chVTResetI(&vt);
}
i = 0, m = 1;
while ((currp->p_epending & ewmask & m) == 0)
diff --git a/src/chmsg.c b/src/chmsg.c
index ef8b111dc..91a6cc9fd 100644
--- a/src/chmsg.c
+++ b/src/chmsg.c
@@ -94,57 +94,6 @@ t_msg chMsgSendWithEvent(Thread *tp, t_msg msg, EventSource *esp) {
}
#endif
-#ifdef CH_USE_MESSAGES_TIMEOUT
-static void wakeup(void *p) {
-
- chDbgAssert(((Thread *)p)->p_state == PRSNDMSG, "chmsg.c, wakeup()");
- chSchReadyI(dequeue(p), RDY_TIMEOUT);
-}
-
-/**
- * Sends a message to the specified thread with timeout specification. The
- * sender is stopped until the receiver executes a \p chMsgRelease().
- *
- * @param tp the pointer to the thread
- * @param msg the message. Note that it can be a pointer to a complex
- * message structure.
- * @param time the number of ticks before the operation fails
- * @return the message return status from \p chMsgRelease() or
- * \p RDY_TIMEOUT the specified time expired.
- * @note The server thread can also return data into the message structure
- * if you need messages to be bidirectional, just define the structure
- * according your needs. If you dont need complicated messages exchange
- * you may just use the \p chMsgRelease() status code as response
- * to the message.
- */
-t_msg chMsgSendTimeout(Thread *tp, t_msg msg, t_time time) {
- VirtualTimer vt;
-
- chSysLock();
-
- chVTSetI(&vt, time, wakeup, currp);
-#ifdef CH_USE_MESSAGES_PRIORITY
- if (tp->p_flags & P_MSGBYPRIO)
- prio_insert(currp, &tp->p_msgqueue);
- else
- fifo_insert(currp, &tp->p_msgqueue);
-#else
- fifo_insert(currp, &tp->p_msgqueue);
-#endif
- currp->p_msg = msg;
- currp->p_wtthdp = tp;
- if (tp->p_state == PRWTMSG)
- chSchReadyI(tp, RDY_OK);
- chSchGoSleepS(PRSNDMSG);
- msg = currp->p_rdymsg;
- if (chVTIsArmedI(&vt))
- chVTResetI(&vt);
-
- chSysUnlock();
- return msg;
-}
-#endif /* CH_USE_MESSAGES_TIMEOUT */
-
/**
* Suspends the thread and waits for an incoming message.
*
diff --git a/src/chschd.c b/src/chschd.c
index cbd1cfdd3..92a0fbb0d 100644
--- a/src/chschd.c
+++ b/src/chschd.c
@@ -90,6 +90,33 @@ void chSchGoSleepS(t_tstate newstate) {
chSysSwitchI(otp, currp);
}
+static void wakeup(void *p) {
+
+ if (((Thread *)p)->p_state == PRWTSEM)
+ chSemFastSignalI(((Thread *)p)->p_wtsemp);
+ chSchReadyI(p, RDY_TIMEOUT);
+}
+
+/**
+ * Puts the current thread to sleep into the specified state, the next highest
+ * priority thread becomes running. The thread is automatically awakened after
+ * the specified time elapsed.
+ * @param newstate the new thread state
+ * @param time the number of ticks before the operation timouts
+ * @return the wakeup message, it is \p RDY_TIMEOUT if a timeout occurs
+ * @note The function must be called in the system mutex zone.
+ * @note The function is not meant to be used in the user code directly.
+ */
+t_msg chSchGoSleepTimeoutS(t_tstate newstate, t_time time) {
+ VirtualTimer vt;
+
+ chVTSetI(&vt, time, wakeup, currp);
+ chSchGoSleepS(newstate);
+ if (chVTIsArmedI(&vt))
+ chVTResetI(&vt);
+ return currp->p_rdymsg;
+}
+
/**
* Wakeups a thread, the thread is inserted into the ready list or made
* running directly depending on its relative priority compared to the current
diff --git a/src/chsem.c b/src/chsem.c
index 0ab603b03..ceaa64399 100644
--- a/src/chsem.c
+++ b/src/chsem.c
@@ -117,13 +117,6 @@ t_msg chSemWaitS(Semaphore *sp) {
}
#ifdef CH_USE_SEMAPHORES_TIMEOUT
-static void wakeup(void *p) {
-
- chDbgAssert(((Thread *)p)->p_state == PRWTSEM, "chsem.c, wakeup()");
- chSemFastSignalI(((Thread *)p)->p_wtsemp);
- chSchReadyI(dequeue(p), RDY_TIMEOUT);
-}
-
/**
* Performs a wait operation on a semaphore with timeout specification.
* @param sp pointer to a \p Semaphore structure
@@ -154,15 +147,9 @@ t_msg chSemWaitTimeout(Semaphore *sp, t_time time) {
t_msg chSemWaitTimeoutS(Semaphore *sp, t_time time) {
if (--sp->s_cnt < 0) {
- VirtualTimer vt;
-
- chVTSetI(&vt, time, wakeup, currp);
fifo_insert(currp, &sp->s_queue);
currp->p_wtsemp = sp;
- chSchGoSleepS(PRWTSEM);
- if (chVTIsArmedI(&vt))
- chVTResetI(&vt);
- return currp->p_rdymsg;
+ return chSchGoSleepTimeoutS(PRWTSEM, time);
}
return RDY_OK;
}
diff --git a/src/chsleep.c b/src/chsleep.c
index b6c31e1a4..9dad520c7 100644
--- a/src/chsleep.c
+++ b/src/chsleep.c
@@ -25,47 +25,18 @@
#include <ch.h>
#ifdef CH_USE_SLEEP
-static void wakeup(void *p) {
-
- chDbgAssert(((Thread *)p)->p_state == PRSLEEP, "chsleep.c, wakeup()");
- chSchReadyI(p, RDY_OK);
-}
-
/**
* Suspends the invoking thread for the specified time.
* @param time the system ticks number
*/
void chThdSleep(t_time time) {
- VirtualTimer vt;
chSysLock();
- chVTSetI(&vt, time, wakeup, currp);
- chSchGoSleepS(PRSLEEP);
+ chSchGoSleepTimeoutS(PRSLEEP, time);
chSysUnlock();
}
-
-#ifdef CH_USE_SYSTEMTIME
-/**
- * Suspends the invoking thread until the system time arrives to the specified
- * value.
- * @param time the system time
- * @note The function is available only if the \p CH_USE_SYSTEMTIME
- * option is enabled in \p chconf.h.
- */
-void chThdSleepUntil(t_time time) {
- VirtualTimer vt;
-
- chSysLock();
-
- chVTSetI(&vt, (t_time)(time - rlist.r_stime), wakeup, currp);
- chSchGoSleepS(PRSLEEP);
-
- chSysUnlock();
-}
-#endif /* CH_USE_SYSTEMTIME */
-
#endif /* CH_USE_SLEEP */
/** @} */
diff --git a/src/include/scheduler.h b/src/include/scheduler.h
index 67fae50a4..6f4d54e56 100644
--- a/src/include/scheduler.h
+++ b/src/include/scheduler.h
@@ -60,6 +60,7 @@ extern "C" {
void chSchInit(void);
void chSchReadyI(Thread *tp, t_msg msg);
void chSchGoSleepS(t_tstate newstate);
+ t_msg chSchGoSleepTimeoutS(t_tstate newstate, t_time time);
void chSchWakeupS(Thread *tp, t_msg msg);
void chSchDoRescheduleI(void);
void chSchRescheduleS(void);
diff --git a/src/include/sleep.h b/src/include/sleep.h
index 161842a29..022b7be23 100644
--- a/src/include/sleep.h
+++ b/src/include/sleep.h
@@ -30,14 +30,12 @@ extern "C" {
#endif
#ifdef CH_USE_SLEEP
void chThdSleep(t_time time);
-#ifdef CH_USE_SYSTEMTIME
- void chThdSleepUntil(t_time time);
-#endif /* CH_USE_SYSTEMTIME */
#endif /* CH_USE_SLEEP */
#ifdef __cplusplus
}
#endif
+#ifdef CH_USE_SYSTEMTIME
/**
* Returns the number of system ticks since the \p chSysInit() invocation.
* @return the system ticks number
@@ -48,6 +46,20 @@ extern "C" {
*/
#define chSysGetTime() rlist.r_stime
+/**
+ * Suspends the invoking thread until the system time arrives to the specified
+ * value.
+ * @note The function is available only if the \p CH_USE_SYSTEMTIME
+ * option is enabled in \p chconf.h.
+ */
+#define chThdSleepUntil(t) { \
+ chSysLock(); \
+ chSchGoSleepTimeoutS(PRSLEEP, \
+ (t_time)((t) - chSysGetTime())) \
+ chSysUnlock(); \
+}
+#endif /* CH_USE_SYSTEMTIME */
+
#endif /* _SLEEP_H_ */
/** @} */
diff --git a/src/templates/chconf.h b/src/templates/chconf.h
index d8e5f88da..cc4f992f2 100644
--- a/src/templates/chconf.h
+++ b/src/templates/chconf.h
@@ -96,12 +96,6 @@
* included in the kernel.*/
#define CH_USE_MESSAGES
-/** Configuration option: if specified then the \p chMsgSendTimeout()
- * function is included in the kernel.
- * @note requires \p CH_USE_MESSAGES.
- * @note requires \p CH_USE_VIRTUAL_TIMERS.*/
-#define CH_USE_MESSAGES_TIMEOUT
-
/** Configuration option: if specified then the \p chMsgSendWithEvent()
* function is included in the kernel.
* @note requires \p CH_USE_MESSAGES.
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-14 21:05:53 +0000