michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename "activeLink" field of CCS to "next_context"

Browse source 
Modifies the name of this field to make its purpose clearer,
and to align with coding conventions.

Change-Id: I8de78df1a0459122067d650130e01078afb5af8a
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
This commit is contained in:
Allan Stephens 2015-04-23 13:12:24 -04:00 • committed by Anas Nashif
commit b32f81dbe4
8 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arc/core/context.c
View file

@ -85,7 +85,7 @@ static ALWAYS_INLINE void context_monitor_init(struct s_CCS *pCcs /* context */
*/ */
key = irq_lock_inline(); key = irq_lock_inline();
pCcs->activeLink = _NanoKernel.contexts; pCcs->next_context = _NanoKernel.contexts;
_NanoKernel.contexts = pCcs; _NanoKernel.contexts = pCcs;
irq_unlock_inline(key); irq_unlock_inline(key);
} }

2
arch/arc/include/nanok.h
View file

@ -185,7 +185,7 @@ struct s_CCS {
struct coop coopReg; struct coop coopReg;
struct preempt preempReg; struct preempt preempReg;
#ifdef CONFIG_CONTEXT_MONITOR #ifdef CONFIG_CONTEXT_MONITOR
struct s_CCS *activeLink; /* link to next context in the active list */ struct s_CCS *next_context; /* next item in list of ALL fiber+tasks */
#endif #endif
}; };

2
arch/arm/core/nanocontext.c
View file

@ -75,7 +75,7 @@ static ALWAYS_INLINE void _context_monitor_init(struct s_CCS *pCcs /* context */
*/ */
key = irq_lock(); key = irq_lock();
pCcs->activeLink = _NanoKernel.contexts; pCcs->next_context = _NanoKernel.contexts;
_NanoKernel.contexts = pCcs; _NanoKernel.contexts = pCcs;
irq_unlock(key); irq_unlock(key);
} }

2
arch/arm/include/nanok.h
View file

@ -135,7 +135,7 @@ struct s_CCS {
struct coop coopReg; struct coop coopReg;
struct preempt preempReg; struct preempt preempReg;
#if defined(CONFIG_CONTEXT_MONITOR) #if defined(CONFIG_CONTEXT_MONITOR)
struct s_CCS *activeLink; /* link to next context in the active list */ struct s_CCS *next_context; /* next item in list of ALL fiber+tasks */
#endif #endif
}; };

2
arch/x86/core/nanocontext.c
View file

@ -199,7 +199,7 @@ static void _NewContextInternal(
*/ */
imask = irq_lock(); imask = irq_lock();
ccs->activeLink = _NanoKernel.contexts; ccs->next_context = _NanoKernel.contexts;
_NanoKernel.contexts = ccs; _NanoKernel.contexts = ccs;
irq_unlock(imask); irq_unlock(imask);
} }

2
arch/x86/include/nanok.h
View file

@ -684,7 +684,7 @@ struct s_CCS {
tPreempReg preempReg; /* volatile integer register storage */ tPreempReg preempReg; /* volatile integer register storage */
#if defined(CONFIG_CONTEXT_MONITOR) #if defined(CONFIG_CONTEXT_MONITOR)
struct s_CCS *activeLink; /* link to next context in the active list */ struct s_CCS *next_context; /* next item in list of ALL fiber+tasks */
#endif #endif
#ifdef CONFIG_GDB_INFO #ifdef CONFIG_GDB_INFO
void *esfPtr; /* pointer to exception stack frame saved by */ void *esfPtr; /* pointer to exception stack frame saved by */

8
kernel/nanokernel/core/nanocontextentry.c
View file

@ -74,15 +74,15 @@ void _context_exit(tCCS *pContext)
*/ */
if (pContext == _NanoKernel.contexts) { if (pContext == _NanoKernel.contexts) {
_NanoKernel.contexts = _NanoKernel.contexts->activeLink; _NanoKernel.contexts = _NanoKernel.contexts->next_context;
} else { } else {
tCCS *pPrevContext; tCCS *pPrevContext;
pPrevContext = _NanoKernel.contexts; pPrevContext = _NanoKernel.contexts;
while (pContext != pPrevContext->activeLink) { while (pContext != pPrevContext->next_context) {
pPrevContext = pPrevContext->activeLink; pPrevContext = pPrevContext->next_context;
} }
pPrevContext->activeLink = pContext->activeLink; pPrevContext->next_context = pContext->next_context;
} }
} }
#endif /* CONFIG_CONTEXT_MONITOR */ #endif /* CONFIG_CONTEXT_MONITOR */

2
kernel/nanokernel/include/offsets/common.h
View file

@ -58,7 +58,7 @@ GEN_ABSOLUTE_SYM(__tNANO_SIZEOF, sizeof(tNANO));
/* arch-agnostic tCCS structure member offsets */ /* arch-agnostic tCCS structure member offsets */
GEN_OFFSET_SYM(tCCS, link); GEN_OFFSET_SYM(tCCS, link);
GEN_OFFSET_SYM_HOST(tCCS, activeLink); GEN_OFFSET_SYM_HOST(tCCS, next_context);
GEN_OFFSET_SYM(tCCS, prio); GEN_OFFSET_SYM(tCCS, prio);
GEN_OFFSET_SYM(tCCS, flags); GEN_OFFSET_SYM(tCCS, flags);
GEN_OFFSET_SYM(tCCS, coopReg); /* start of coop register set */ GEN_OFFSET_SYM(tCCS, coopReg); /* start of coop register set */