andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Shared registry in SMP mode, to be tested. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14174 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2021-04-14 11:52:42 +00:00
parent e4401ac0c3
commit 0738442a0c
5 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os/rt/include/chobjects.h
View File

@ -358,9 +358,11 @@ struct ch_os_instance {
* @brief Virtual timers delta list header.
*/
virtual_timers_list_t vtlist;
#if (CH_CFG_USE_REGISTRY == TRUE) || defined(__DOXYGEN__)
#if ((CH_CFG_USE_REGISTRY == TRUE) && (CH_CFG_SMP_MODE == FALSE)) || \
defined(__DOXYGEN__)
/**
* @brief Registry header.
* @note This field is present only if the SMP mode is disabled.
*/
ch_queue_t reglist;
#endif
@ -414,6 +416,14 @@ typedef struct ch_system {
* @brief Initialized OS instances or @p NULL.
*/
os_instance_t *instances[PORT_CORES_NUMBER];
#if ((CH_CFG_USE_REGISTRY == TRUE) && (CH_CFG_SMP_MODE == TRUE)) || \
defined(__DOXYGEN__)
/**
* @brief Registry header.
* @note This field is present only if the SMP mode is enabled.
*/
ch_queue_t reglist;
#endif
#if defined(PORT_SYSTEM_EXTRA_FIELDS) || defined(__DOXYGEN__)
/* Extra fields from port layer.*/
PORT_SYSTEM_EXTRA_FIELDS

11
os/rt/include/chregistry.h
View File

@ -74,6 +74,15 @@ typedef struct {
/* Module macros. */
/*===========================================================================*/
/**
* @brief Access to the registry list header.
*/
#if (CH_CFG_SMP_MODE == TRUE) || defined(__DOXYGEN__)
#define REG_HEADER(oip) (&ch_system.reglist)
#else
#define REG_HEADER(oip) (&(oip)->reglist)
#endif
/**
* @brief Removes a thread from the registry list.
* @note This macro is not meant for use in application code.
@ -89,7 +98,7 @@ typedef struct {
* @param[in] oip pointer to the OS instance
* @param[in] tp thread to add to the registry
*/
#define REG_INSERT(oip, tp) ch_queue_insert(&(tp)->rqueue, &(oip)->reglist)
#define REG_INSERT(oip, tp) ch_queue_insert(&(tp)->rqueue, REG_HEADER(oip))
/*===========================================================================*/
/* External declarations. */

4
os/rt/src/chregistry.c
View File

@ -136,7 +136,7 @@ thread_t *chRegFirstThread(void) {
uint8_t *p;
chSysLock();
p = (uint8_t *)currcore->reglist.next;
p = (uint8_t *)REG_HEADER(currcore)->next;
tp = (thread_t *)(p - offsetof(thread_t, rqueue));
#if CH_CFG_USE_DYNAMIC == TRUE
tp->refs++;
@ -165,7 +165,7 @@ thread_t *chRegNextThread(thread_t *tp) {
/* Next element in the registry queue.*/
nqp = tp->rqueue.next;
if (nqp == &currcore->reglist) {
if (nqp == REG_HEADER(currcore)) {
ntp = NULL;
}
#if CH_CFG_USE_DYNAMIC == TRUE

4
os/rt/src/chschd.c
View File

@ -313,8 +313,8 @@ void chSchObjectInit(os_instance_t *oip,
/* Ready list initialization.*/
ch_pqueue_init(&oip->rlist.pqueue);
/* Registry initialization.*/
#if CH_CFG_USE_REGISTRY == TRUE
#if (CH_CFG_USE_REGISTRY == TRUE) && (CH_CFG_SMP_MODE == FALSE)
/* Registry initialization when SMP mode is disabled.*/
ch_queue_init(&oip->reglist);
#endif

28
os/rt/src/chsys.c
View File

@ -91,6 +91,11 @@ void chSysInit(void) {
ch_system.instances[i] = NULL;
}
#if (CH_CFG_USE_REGISTRY == TRUE) && (CH_CFG_SMP_MODE == TRUE)
/* Registry initialization when SMP mode is enabled.*/
ch_queue_init(&ch_system.reglist);
#endif
/* User system initialization hook.*/
CH_CFG_SYSTEM_INIT_HOOK();
@ -152,6 +157,15 @@ void chSysHalt(const char *reason) {
/* Halt hook code, usually empty.*/
CH_CFG_SYSTEM_HALT_HOOK(reason);
#if defined(PORT_SYSTEM_HALT_HOOK)
/* Port-related actions, this could include halting other instances
via some inter-core messaging or other means.*/
PORT_SYSTEM_HALT_HOOK();
#endif
/* Entering the halted state.*/
ch_system.state = ch_state_halted;
/* Harmless infinite loop.*/
while (true) {
}
@ -239,19 +253,23 @@ bool chSysIntegrityCheckI(unsigned testmask) {
#if CH_CFG_USE_REGISTRY == TRUE
if ((testmask & CH_INTEGRITY_REGISTRY) != 0U) {
ch_queue_t *qp;
ch_queue_t *qp, *rqp;
/* Registry header, access to this list depends on the current
kernel configuration.*/
rqp = REG_HEADER(oip);
/* Scanning the ready list forward.*/
n = (cnt_t)0;
qp = oip->reglist.next;
while (qp != &oip->reglist) {
qp = rqp->next;
while (qp != rqp) {
n++;
qp = qp->next;
}
/* Scanning the ready list backward.*/
qp = oip->reglist.prev;
while (qp != &oip->reglist) {
qp = rqp->prev;
while (qp != rqp) {
n--;
qp = qp->prev;
}