diff options
Diffstat (limited to 'os/kernel/include')
| -rw-r--r-- | os/kernel/include/ch.h | 6 | ||||
| -rw-r--r-- | os/kernel/include/chlists.h | 127 | ||||
| -rw-r--r-- | os/kernel/include/chmtx.h | 2 | ||||
| -rw-r--r-- | os/kernel/include/chthreads.h | 140 |
4 files changed, 136 insertions, 139 deletions
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h index 677aa58b7..026b14267 100644 --- a/os/kernel/include/ch.h +++ b/os/kernel/include/ch.h @@ -100,11 +100,14 @@ #endif
/** @} */
+typedef struct Thread Thread;
+
#include "chconf.h"
#include "chtypes.h"
#include "chdebug.h"
-#include "chlists.h"
#include "chcore.h"
+#include "chthreads.h"
+//#include "chlists.h"
#include "chsys.h"
#include "chvt.h"
#include "chschd.h"
@@ -118,7 +121,6 @@ #include "chmemcore.h"
#include "chheap.h"
#include "chmempools.h"
-#include "chthreads.h"
#include "chdynamic.h"
#include "chregistry.h"
#include "chinline.h"
diff --git a/os/kernel/include/chlists.h b/os/kernel/include/chlists.h deleted file mode 100644 index caf2560b4..000000000 --- a/os/kernel/include/chlists.h +++ /dev/null @@ -1,127 +0,0 @@ -/*
- ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
- 2011,2012,2013 Giovanni Di Sirio.
-
- This file is part of ChibiOS/RT.
-
- ChibiOS/RT is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS/RT is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file chlists.h
- * @brief Thread queues/lists macros and structures.
- * @note All the macros present in this module, while public, are not
- * an OS API and should not be directly used in the user applications
- * code.
- *
- * @addtogroup internals
- * @{
- */
-
-#ifndef _CHLISTS_H_
-#define _CHLISTS_H_
-
-typedef struct Thread Thread;
-
-/**
- * @brief Threads queue initialization.
- *
- * @notapi
- */
-#define queue_init(tqp) ((tqp)->p_next = (tqp)->p_prev = (Thread *)(tqp));
-
-/**
- * @brief Threads list initialization.
- *
- * @notapi
- */
-#define list_init(tlp) ((tlp)->p_next = (Thread *)(tlp))
-
-/**
- * @brief Evaluates to @p TRUE if the specified threads queue or list is
- * empty.
- *
- * @notapi
- */
-#define isempty(p) ((p)->p_next == (Thread *)(p))
-
-/**
- * @brief Evaluates to @p TRUE if the specified threads queue or list is
- * not empty.
- *
- * @notapi
- */
-#define notempty(p) ((p)->p_next != (Thread *)(p))
-
-/**
- * @brief Data part of a static threads queue initializer.
- * @details This macro should be used when statically initializing a threads
- * queue that is part of a bigger structure.
- *
- * @param[in] name the name of the threads queue variable
- */
-#define _THREADSQUEUE_DATA(name) {(Thread *)&name, (Thread *)&name}
-
-/**
- * @brief Static threads queue initializer.
- * @details Statically initialized threads queues require no explicit
- * initialization using @p queue_init().
- *
- * @param[in] name the name of the threads queue variable
- */
-#define THREADSQUEUE_DECL(name) ThreadsQueue name = _THREADSQUEUE_DATA(name)
-
-/**
- * @extends ThreadsList
- *
- * @brief Generic threads bidirectional linked list header and element.
- */
-typedef struct {
- Thread *p_next; /**< First @p Thread in the queue, or
- @p ThreadQueue when empty. */
- Thread *p_prev; /**< Last @p Thread in the queue, or
- @p ThreadQueue when empty. */
-} ThreadsQueue;
-
-/**
- * @brief Generic threads single link list, it works like a stack.
- */
-typedef struct {
-
- Thread *p_next; /**< Last pushed @p Thread on the stack
- list, or pointer to itself if
- empty. */
-} ThreadsList;
-
-#if !CH_OPTIMIZE_SPEED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- void prio_insert(Thread *tp, ThreadsQueue *tqp);
- void queue_insert(Thread *tp, ThreadsQueue *tqp);
- Thread *fifo_remove(ThreadsQueue *tqp);
- Thread *lifo_remove(ThreadsQueue *tqp);
- Thread *dequeue(Thread *tp);
- void list_insert(Thread *tp, ThreadsList *tlp);
- Thread *list_remove(ThreadsList *tlp);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !CH_OPTIMIZE_SPEED */
-
-#endif /* _CHLISTS_H_ */
-
-/** @} */
diff --git a/os/kernel/include/chmtx.h b/os/kernel/include/chmtx.h index 124127a88..00ebb2a23 100644 --- a/os/kernel/include/chmtx.h +++ b/os/kernel/include/chmtx.h @@ -86,7 +86,7 @@ extern "C" { *
* @sclass
*/
-#define chMtxQueueNotEmptyS(mp) notempty(&(mp)->m_queue)
+#define chMtxQueueNotEmptyS(mp) queue_notempty(&(mp)->m_queue)
/** @} */
#endif /* CH_USE_MUTEXES */
diff --git a/os/kernel/include/chthreads.h b/os/kernel/include/chthreads.h index 77f72caca..1341cb1ea 100644 --- a/os/kernel/include/chthreads.h +++ b/os/kernel/include/chthreads.h @@ -20,7 +20,7 @@ /**
* @file chthreads.h
- * @brief Threads macros and structures.
+ * @brief Threads module macros and structures.
*
* @addtogroup threads
* @{
@@ -29,6 +29,10 @@ #ifndef _CHTHREADS_H_
#define _CHTHREADS_H_
+/*===========================================================================*/
+/* Module constants. */
+/*===========================================================================*/
+
/**
* @name Thread states
* @{
@@ -76,6 +80,42 @@ #define THD_TERMINATE 4 /**< @brief Termination requested flag. */
/** @} */
+/*===========================================================================*/
+/* Module pre-compile time settings. */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Derived constants and error checks. */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Module data structures and types. */
+/*===========================================================================*/
+
+/* Forward declaration required by the mutexes stack structure present
+ in every thread.*/
+#if CH_USE_MUTEXES
+typedef struct Mutex Mutex;
+#endif
+
+/**
+ * @brief Generic threads single link list, it works like a stack.
+ */
+typedef struct {
+
+ Thread *p_next; /**< @brief Next in the list/queue. */
+} ThreadsList;
+
+/**
+ * @extends ThreadsList
+ *
+ * @brief Generic threads bidirectional linked list header and element.
+ */
+typedef struct {
+ Thread *p_next; /**< @brief Next in the list/queue. */
+ Thread *p_prev; /**< @brief Previous in the queue. */
+} ThreadsQueue;
+
/**
* @extends ThreadsQueue
*
@@ -221,6 +261,32 @@ struct Thread { */
typedef msg_t (*tfunc_t)(void *);
+/*===========================================================================*/
+/* Module macros. */
+/*===========================================================================*/
+
+/**
+ * @brief Data part of a static threads queue initializer.
+ * @details This macro should be used when statically initializing a threads
+ * queue that is part of a bigger structure.
+ *
+ * @param[in] name the name of the threads queue variable
+ */
+#define _THREADSQUEUE_DATA(name) {(Thread *)&name, (Thread *)&name}
+
+/**
+ * @brief Static threads queue initializer.
+ * @details Statically initialized threads queues require no explicit
+ * initialization using @p queue_init().
+ *
+ * @param[in] name the name of the threads queue variable
+ */
+#define THREADSQUEUE_DECL(name) ThreadsQueue name = _THREADSQUEUE_DATA(name)
+
+/*===========================================================================*/
+/* External declarations. */
+/*===========================================================================*/
+
/**
* @name Macro Functions
* @{
@@ -254,14 +320,6 @@ typedef msg_t (*tfunc_t)(void *); #define chThdGetTicks(tp) ((tp)->p_time)
/**
- * @brief Returns the pointer to the @p Thread local storage area, if any.
- * @note Can be invoked in any context.
- *
- * @special
- */
-#define chThdLS() (void *)(currp + 1)
-
-/**
* @brief Verifies if the specified thread is in the @p THD_STATE_FINAL state.
* @note Can be invoked in any context.
*
@@ -375,6 +433,70 @@ extern "C" { }
#endif
+/*===========================================================================*/
+/* Module inline functions. */
+/*===========================================================================*/
+
+/**
+ * @brief Threads list initialization.
+ *
+ * @notapi
+ */
+static inline void list_init(ThreadsList *tlp) {
+
+ tlp->p_next = (Thread *)tlp;
+}
+
+/**
+ * @brief Evaluates to @p TRUE if the specified threads list is empty.
+ *
+ * @notapi
+ */
+static inline bool_t list_isempty(ThreadsList *tlp) {
+
+ return (bool_t)(tlp->p_next == (Thread *)tlp);
+}
+
+/**
+ * @brief Evaluates to @p TRUE if the specified threads list is not empty.
+ *
+ * @notapi
+ */
+static inline bool_t list_notempty(ThreadsList *tlp) {
+
+ return (bool_t)(tlp->p_next != (Thread *)tlp);
+}
+
+/**
+ * @brief Threads queue initialization.
+ *
+ * @notapi
+ */
+static inline void queue_init(ThreadsQueue *tqp) {
+
+ tqp->p_next = tqp->p_prev = (Thread *)tqp;
+}
+
+/**
+ * @brief Evaluates to @p TRUE if the specified threads queue is empty.
+ *
+ * @notapi
+ */
+static inline bool_t queue_isempty(ThreadsQueue *tqp) {
+
+ return (bool_t)(tqp->p_next == (Thread *)tqp);
+}
+
+/**
+ * @brief Evaluates to @p TRUE if the specified threads queue is not empty.
+ *
+ * @notapi
+ */
+static inline bool_t queue_notempty(ThreadsQueue *tqp) {
+
+ return (bool_t)(tqp->p_next != (Thread *)tqp);
+}
+
#endif /* _CHTHREADS_H_ */
/** @} */
|