michaelh/zephyr
1
0
Fork 0
Code Releases Activity

unified: Remove references to obsolete task_timeout

Browse source 
Change-Id: I7c3b1b8418809914d3daf9d68ed8e4c3b99dd0b1
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2016-09-19 13:53:33 -04:00 • committed by Benjamin Walsh
commit b27249486a
7 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -220,8 +220,10 @@ struct s_NANO {
#if defined(CONFIG_NANO_TIMEOUTS) || defined(CONFIG_NANO_TIMERS) #if defined(CONFIG_NANO_TIMEOUTS) || defined(CONFIG_NANO_TIMERS)
sys_dlist_t timeout_q; sys_dlist_t timeout_q;
#ifndef CONFIG_KERNEL_V2
int32_t task_timeout; int32_t task_timeout;
#endif #endif
#endif
}; };
typedef struct s_NANO tNANO; typedef struct s_NANO tNANO;

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

@ -255,8 +255,10 @@ struct s_NANO {
#if defined(CONFIG_NANO_TIMEOUTS) || defined(CONFIG_NANO_TIMERS) #if defined(CONFIG_NANO_TIMEOUTS) || defined(CONFIG_NANO_TIMERS)
sys_dlist_t timeout_q; sys_dlist_t timeout_q;
#ifndef CONFIG_KERNEL_V2
int32_t task_timeout; int32_t task_timeout;
#endif #endif
#endif
#ifdef CONFIG_KERNEL_V2 #ifdef CONFIG_KERNEL_V2
struct ready_q ready_q; struct ready_q ready_q;
#endif #endif

2
arch/nios2/include/nano_private.h
View file

@ -141,8 +141,10 @@ struct s_NANO {
#if defined(CONFIG_NANO_TIMEOUTS) || defined(CONFIG_NANO_TIMERS) #if defined(CONFIG_NANO_TIMEOUTS) || defined(CONFIG_NANO_TIMERS)
sys_dlist_t timeout_q; sys_dlist_t timeout_q;
#ifndef CONFIG_KERNEL_V2
int32_t task_timeout; int32_t task_timeout;
#endif #endif
#endif
#if defined(CONFIG_THREAD_MONITOR) #if defined(CONFIG_THREAD_MONITOR)
struct tcs *threads; /* singly linked list of ALL fiber+tasks */ struct tcs *threads; /* singly linked list of ALL fiber+tasks */
#endif #endif

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

@ -795,8 +795,10 @@ typedef struct s_NANO {
#endif /* CONFIG_FP_SHARING */ #endif /* CONFIG_FP_SHARING */
#if defined(CONFIG_NANO_TIMEOUTS) || defined(CONFIG_NANO_TIMERS) #if defined(CONFIG_NANO_TIMEOUTS) || defined(CONFIG_NANO_TIMERS)
sys_dlist_t timeout_q; sys_dlist_t timeout_q;
#ifndef CONFIG_KERNEL_V2
int32_t task_timeout; int32_t task_timeout;
#endif #endif
#endif
#ifdef CONFIG_KERNEL_V2 #ifdef CONFIG_KERNEL_V2
struct ready_q ready_q; struct ready_q ready_q;
#endif #endif

5
kernel/unified/include/wait_q.h
View file

@ -89,8 +89,6 @@ static inline void _timeout_remove_tcs_from_wait_q(struct tcs *tcs)
_timeout_add(thread, pq, ticks); \ _timeout_add(thread, pq, ticks); \
} \ } \
} while (0) } while (0)
#define _TIMEOUT_SET_TASK_TIMEOUT(ticks) \
_nanokernel.task_timeout = (ticks)
#define _TIMEOUT_UPDATE(timeout, limit, cur_ticks) \ #define _TIMEOUT_UPDATE(timeout, limit, cur_ticks) \
do { \ do { \
@ -106,7 +104,6 @@ static inline void _timeout_remove_tcs_from_wait_q(struct tcs *tcs)
#define _TIMEOUT_TICK_GET() 0 #define _TIMEOUT_TICK_GET() 0
#define _TIMEOUT_ADD(thread, pq, ticks) do { } while (0) #define _TIMEOUT_ADD(thread, pq, ticks) do { } while (0)
#define _TIMEOUT_SET_TASK_TIMEOUT(ticks) do { } while ((0))
#define _TIMEOUT_UPDATE(timeout, limit, cur_ticks) do { } while (0) #define _TIMEOUT_UPDATE(timeout, limit, cur_ticks) do { } while (0)
#else #else
#define _timeout_tcs_init(tcs) do { } while ((0)) #define _timeout_tcs_init(tcs) do { } while ((0))
@ -115,13 +112,11 @@ static inline void _timeout_remove_tcs_from_wait_q(struct tcs *tcs)
#define _TIMEOUT_TICK_GET() 0 #define _TIMEOUT_TICK_GET() 0
#define _TIMEOUT_ADD(thread, pq, ticks) do { } while (0) #define _TIMEOUT_ADD(thread, pq, ticks) do { } while (0)
#define _TIMEOUT_SET_TASK_TIMEOUT(ticks) do { } while ((0))
#define _TIMEOUT_UPDATE(timeout, limit, cur_ticks) do { } while (0) #define _TIMEOUT_UPDATE(timeout, limit, cur_ticks) do { } while (0)
#endif #endif
#define _NANO_OBJECT_WAIT(queue, data, timeout, key) \ #define _NANO_OBJECT_WAIT(queue, data, timeout, key) \
do { \ do { \
_TIMEOUT_SET_TASK_TIMEOUT(timeout); \
nano_cpu_atomic_idle(key); \ nano_cpu_atomic_idle(key); \
key = irq_lock(); \ key = irq_lock(); \
} while (0) } while (0)

1
kernel/unified/init.c
View file

@ -105,7 +105,6 @@ char __noinit __stack _interrupt_stack[CONFIG_ISR_STACK_SIZE];
#include <misc/dlist.h> #include <misc/dlist.h>
#define initialize_timeouts() do { \ #define initialize_timeouts() do { \
sys_dlist_init(&_nanokernel.timeout_q); \ sys_dlist_init(&_nanokernel.timeout_q); \
_nanokernel.task_timeout = TICKS_UNLIMITED; \
} while ((0)) } while ((0))
#else #else
#define initialize_timeouts() do { } while ((0)) #define initialize_timeouts() do { } while ((0))

2
kernel/unified/sys_clock.c
View file

@ -155,8 +155,6 @@ static inline void handle_expired_timeouts(int32_t ticks)
struct _timeout *head = struct _timeout *head =
(struct _timeout *)sys_dlist_peek_head(&_timeout_q); (struct _timeout *)sys_dlist_peek_head(&_timeout_q);
_nanokernel.task_timeout = TICKS_UNLIMITED;
K_DEBUG("head: %p, delta: %d\n", K_DEBUG("head: %p, delta: %d\n",
head, head ? head->delta_ticks_from_prev : -2112); head, head ? head->delta_ticks_from_prev : -2112);