Introduce xnstat subsystem
PATCH 1/3 Introduce xnstat subsystem
This patch adds the new abstraction xnstat_counter (event counter) and xnstat_runtime (runtime accumulator) and related services to maintain and query this data. The whole subsystem evaluates to void if XENO_OPT_STATS is not selected.
Moreover, the patch moves the existing thread statistics (exec_time and various counters) over the new infrastructure.
Jan
--- include/nucleus/pod.h | 38 +--------------- include/nucleus/stat.h | 106 +++++++++++++++++++++++++++++++++++++++++++++++ include/nucleus/thread.h | 24 ++-------- ksrc/nucleus/module.c | 59 ++++++++++++-------------- ksrc/nucleus/pod.c | 18 ++++--- ksrc/nucleus/shadow.c | 3 - ksrc/nucleus/thread.c | 9 --- 7 files changed, 157 insertions(+), 100 deletions(-)
include/nucleus/pod.h +3 -35
@@ -146,7 +146,9 @@ typedef struct xnsched {xnthread_t rootcb;/*!< Root thread control block. */ #ifdef CONFIG_XENO_OPT_STATS -xnticks_t last_csw;/*!< Last context switch (ticks). */ +xnticks_t last_account_switch;/*!< Last account switch date (ticks). */ + +xnstat_runtime_t *current_account;/*!< Currently active account */ #endif /* CONFIG_XENO_OPT_STATS */ } xnsched_t;
@@ -544,40 +546,6 @@ static inline void xnpod_delete_self (voxnpod_delete_thread (xnpod_current_thread ()); } -#ifdef CONFIG_XENO_OPT_STATS -static inline void xnpod_acc_exec_time (xnsched_t *sched,xnthread_t *thread) -{ -xnticks_t now =xnarch_get_cpu_tsc (); - - thread->stat.exec_time += now - sched->last_csw; - sched->last_csw = now; -} - -static inline void xnpod_reset_exec_stats (xnthread_t *thread) -{ - thread->stat.exec_time =0 ; - thread->stat.exec_start =xnarch_get_cpu_tsc (); -} - -static inline void xnpod_update_csw_date (xnsched_t *sched) -{ - sched->last_csw =xnarch_get_cpu_tsc (); -} - -#else /* !CONFIG_XENO_OPT_STATS */ -static inline void xnpod_acc_exec_time (xnsched_t *sched,xnthread_t *thread) -{ -} - -static inline void xnpod_reset_exec_stats (xnthread_t *thread) -{ -} - -static inline void xnpod_update_csw_date (xnsched_t *sched) -{ -} -#endif /* CONFIG_XENO_OPT_STATS */ - #ifdef __cplusplus }#endif
include/nucleus/stat.h new file +106 -0
106 lines not on this page · raw message
include/nucleus/thread.h +6 -18
@@ -105,6 +105,8 @@#if defined(__KERNEL__) || defined(__XENO_SIM__) +#include <nucleus/stat.h> +#ifdef __XENO_SIM__/* Pseudo-status (must not conflict with other bits) */ #define XNRUNNING XNTHREAD_SPARE0
@@ -158,16 +160,12 @@ typedef struct xnthread {xnticks_t rrcredit;/* Remaining round-robin time credit (ticks) */ -#ifdef CONFIG_XENO_OPT_STATS struct { -unsigned long ssw;/* Primary -> secondary mode switch count */ -unsigned long csw;/* Context switches (includes -secondary -> primary switches) */ -unsigned long pf;/* Number of page faults */ -xnticks_t exec_time;/* Accumulated execution time (tsc) */ -xnticks_t exec_start;/* Start of execution time accumulation (tsc) */ +xnstat_counter_t ssw;/* Primary -> secondary mode switch count */ +xnstat_counter_t csw;/* Context switches (includes secondary -> primary switches) */ +xnstat_counter_t pf;/* Number of page faults */ +xnstat_runtime_t account;/* Runtime accounting entity */ } stat; -#endif /* CONFIG_XENO_OPT_STATS */ int errcode;/* Local errno */
@@ -248,16 +246,6 @@ typedef struct xnhook { (testbits ((thread)->status,XNROOT ) || !xnthread_user_task (thread) ? \ 0 : xnarch_user_pid(xnthread_archtcb(thread))) -#ifdef CONFIG_XENO_OPT_STATS -#define xnthread_inc_ssw (thread) ++(thread)->stat.ssw -#define xnthread_inc_csw (thread) ++(thread)->stat.csw -#define xnthread_inc_pf (thread) ++(thread)->stat.pf -#else /* CONFIG_XENO_OPT_STATS */ -#define xnthread_inc_ssw (thread) do { } while(0) -#define xnthread_inc_csw (thread) do { } while(0) -#define xnthread_inc_pf (thread) do { } while(0) -#endif /* CONFIG_XENO_OPT_STATS */ -#ifdef __cplusplusextern "C" {#endif
ksrc/nucleus/module.c +29 -30
105 lines not on this page · raw message
ksrc/nucleus/pod.c +10 -8
@@ -41,6 +41,7 @@#include <nucleus/registry.h> #include <nucleus/module.h> #include <nucleus/ltt.h> +#include <nucleus/stat.h> #include <asm/xenomai/bits/pod.h> /* NOTE: We need to initialize the globals: remember that this code
@@ -213,7 +214,7 @@ static int xnpod_fault_handler(xnarch_fl/* The page fault counter is not SMP-safe, but it's a simple indicator that something went wrong wrt memory locking anyway. */ -xnthread_inc_pf (thread); +xnstat_counter_inc (&thread->stat.pf);xnshadow_relax (xnarch_fault_notify (fltinfo)); }
@@ -503,6 +504,8 @@ int xnpod_init(xnpod_t *pod, int minpri, sched->rootcb.sched = sched; sched->rootcb.affinity =xnarch_cpumask_of_cpu (cpu); + +xnstat_runtime_set_current (sched, &sched->rootcb.stat.account); }xnarch_hook_ipi (&xnpod_schedule_handler);
@@ -668,8 +671,7 @@ static inline void xnpod_switch_zombie(xxnthread_cleanup_tcb (threadout); -/* no need to update stats of dying thread */ -xnpod_update_csw_date (sched); +xnstat_runtime_finalize (sched);xnarch_finalize_and_switch (xnthread_archtcb (threadout),xnthread_archtcb (threadin));
@@ -1896,7 +1898,7 @@ int xnpod_migrate_thread(int cpu)xnpod_schedule ();/* Reset execution time stats due to unsync'ed TSCs */ -xnpod_reset_exec_stats (thread); +xnstat_runtime_reset_stats (&thread->stat.account); unlock_and_exit:
@@ -2435,8 +2437,8 @@ void xnpod_schedule(void)xnarch_enter_root (xnthread_archtcb (threadin)); } -xnpod_acc_exec_time (sched, threadout); -xnthread_inc_csw (threadin); +xnstat_runtime_switch (sched, &threadin->stat.account); +xnstat_counter_inc (&threadin->stat.csw);xnarch_switch_to (xnthread_archtcb (threadout),xnthread_archtcb (threadin));
@@ -2607,8 +2609,8 @@ void xnpod_schedule_runnable(xnthread_t nkpod->schedhook (runthread,XNREADY );#endif /* __XENO_SIM__ */ -xnpod_acc_exec_time (sched, runthread); -xnthread_inc_csw (threadin); +xnstat_runtime_switch (sched, &threadin->stat.account); +xnstat_counter_inc (&threadin->stat.csw);xnarch_switch_to (xnthread_archtcb (runthread),xnthread_archtcb (threadin));
ksrc/nucleus/shadow.c +2 -1
@@ -50,6 +50,7 @@#include <nucleus/jhash.h> #include <nucleus/ppd.h> #include <nucleus/trace.h> +#include <nucleus/stat.h> #include <asm/xenomai/features.h> #include <asm/xenomai/syscall.h> #include <asm/xenomai/bits/shadow.h>
@@ -727,7 +728,7 @@ void xnshadow_relax(int notify)rthal_reenter_root (get_switch_lock_owner (), cprio ?SCHED_FIFO :SCHED_NORMAL , cprio); -xnthread_inc_ssw (thread);/* Account for secondary mode switch. */ +xnstat_counter_inc (&thread->stat.ssw);/* Account for secondary mode switch. */ if (notify &&testbits (thread->status,XNTRAPSW ))/* Help debugging spurious relaxes. */
ksrc/nucleus/thread.c +1 -8
@@ -86,14 +86,7 @@ int xnthread_init(xnthread_t *thread, thread->registry.handle =XN_NO_HANDLE ; thread->registry.waitkey =NULL ;#endif /* CONFIG_XENO_OPT_REGISTRY */ - -#ifdef CONFIG_XENO_OPT_STATS - thread->stat.ssw =0 ; - thread->stat.csw =0 ; - thread->stat.pf =0 ; - thread->stat.exec_time =0 ; - thread->stat.exec_start =0 ; -#endif /* CONFIG_XENO_OPT_STATS */ +memset (&thread->stat,0 ,sizeof (thread->stat));/* These will be filled by xnpod_start_thread() */ thread->imask =0 ;
Quoted 8 lines · Jan Kiszka
This patch adds the new abstraction
xnstat_counter(event counter) andxnstat_runtime(runtime accumulator) and related services to maintain and query this data. The whole subsystem evaluates to void ifXENO_OPT_STATSis not selected.Moreover, the patch moves the existing thread statistics (
exec_timeand various counters) over the new infrastructure.
Here was the bug I thought to have found in the second patch: as assumed, the current account was not updated on thread termination. Attached is a corrected revision.
Jan
--- include/nucleus/pod.h | 38 +--------------- include/nucleus/stat.h | 109 +++++++++++++++++++++++++++++++++++++++++++++++ include/nucleus/thread.h | 24 ++-------- ksrc/nucleus/module.c | 59 ++++++++++++------------- ksrc/nucleus/pod.c | 18 ++++--- ksrc/nucleus/shadow.c | 3 - ksrc/nucleus/thread.c | 9 --- 7 files changed, 160 insertions(+), 100 deletions(-)
include/nucleus/pod.h +3 -35
@@ -146,7 +146,9 @@ typedef struct xnsched {xnthread_t rootcb;/*!< Root thread control block. */ #ifdef CONFIG_XENO_OPT_STATS -xnticks_t last_csw;/*!< Last context switch (ticks). */ +xnticks_t last_account_switch;/*!< Last account switch date (ticks). */ + +xnstat_runtime_t *current_account;/*!< Currently active account */ #endif /* CONFIG_XENO_OPT_STATS */ } xnsched_t;
@@ -544,40 +546,6 @@ static inline void xnpod_delete_self (voxnpod_delete_thread (xnpod_current_thread ()); } -#ifdef CONFIG_XENO_OPT_STATS -static inline void xnpod_acc_exec_time (xnsched_t *sched,xnthread_t *thread) -{ -xnticks_t now =xnarch_get_cpu_tsc (); - - thread->stat.exec_time += now - sched->last_csw; - sched->last_csw = now; -} - -static inline void xnpod_reset_exec_stats (xnthread_t *thread) -{ - thread->stat.exec_time =0 ; - thread->stat.exec_start =xnarch_get_cpu_tsc (); -} - -static inline void xnpod_update_csw_date (xnsched_t *sched) -{ - sched->last_csw =xnarch_get_cpu_tsc (); -} - -#else /* !CONFIG_XENO_OPT_STATS */ -static inline void xnpod_acc_exec_time (xnsched_t *sched,xnthread_t *thread) -{ -} - -static inline void xnpod_reset_exec_stats (xnthread_t *thread) -{ -} - -static inline void xnpod_update_csw_date (xnsched_t *sched) -{ -} -#endif /* CONFIG_XENO_OPT_STATS */ - #ifdef __cplusplus }#endif
include/nucleus/stat.h new file +109 -0
109 lines not on this page · raw message
include/nucleus/thread.h +6 -18
@@ -105,6 +105,8 @@#if defined(__KERNEL__) || defined(__XENO_SIM__) +#include <nucleus/stat.h> +#ifdef __XENO_SIM__/* Pseudo-status (must not conflict with other bits) */ #define XNRUNNING XNTHREAD_SPARE0
@@ -158,16 +160,12 @@ typedef struct xnthread {xnticks_t rrcredit;/* Remaining round-robin time credit (ticks) */ -#ifdef CONFIG_XENO_OPT_STATS struct { -unsigned long ssw;/* Primary -> secondary mode switch count */ -unsigned long csw;/* Context switches (includes -secondary -> primary switches) */ -unsigned long pf;/* Number of page faults */ -xnticks_t exec_time;/* Accumulated execution time (tsc) */ -xnticks_t exec_start;/* Start of execution time accumulation (tsc) */ +xnstat_counter_t ssw;/* Primary -> secondary mode switch count */ +xnstat_counter_t csw;/* Context switches (includes secondary -> primary switches) */ +xnstat_counter_t pf;/* Number of page faults */ +xnstat_runtime_t account;/* Runtime accounting entity */ } stat; -#endif /* CONFIG_XENO_OPT_STATS */ int errcode;/* Local errno */
@@ -248,16 +246,6 @@ typedef struct xnhook { (testbits ((thread)->status,XNROOT ) || !xnthread_user_task (thread) ? \ 0 : xnarch_user_pid(xnthread_archtcb(thread))) -#ifdef CONFIG_XENO_OPT_STATS -#define xnthread_inc_ssw (thread) ++(thread)->stat.ssw -#define xnthread_inc_csw (thread) ++(thread)->stat.csw -#define xnthread_inc_pf (thread) ++(thread)->stat.pf -#else /* CONFIG_XENO_OPT_STATS */ -#define xnthread_inc_ssw (thread) do { } while(0) -#define xnthread_inc_csw (thread) do { } while(0) -#define xnthread_inc_pf (thread) do { } while(0) -#endif /* CONFIG_XENO_OPT_STATS */ -#ifdef __cplusplusextern "C" {#endif
ksrc/nucleus/module.c +29 -30
105 lines not on this page · raw message
ksrc/nucleus/pod.c +10 -8
@@ -41,6 +41,7 @@#include <nucleus/registry.h> #include <nucleus/module.h> #include <nucleus/ltt.h> +#include <nucleus/stat.h> #include <asm/xenomai/bits/pod.h> /* NOTE: We need to initialize the globals: remember that this code
@@ -213,7 +214,7 @@ static int xnpod_fault_handler(xnarch_fl/* The page fault counter is not SMP-safe, but it's a simple indicator that something went wrong wrt memory locking anyway. */ -xnthread_inc_pf (thread); +xnstat_counter_inc (&thread->stat.pf);xnshadow_relax (xnarch_fault_notify (fltinfo)); }
@@ -503,6 +504,8 @@ int xnpod_init(xnpod_t *pod, int minpri, sched->rootcb.sched = sched; sched->rootcb.affinity =xnarch_cpumask_of_cpu (cpu); + +xnstat_runtime_set_current (sched, &sched->rootcb.stat.account); }xnarch_hook_ipi (&xnpod_schedule_handler);
@@ -668,8 +671,7 @@ static inline void xnpod_switch_zombie(xxnthread_cleanup_tcb (threadout); -/* no need to update stats of dying thread */ -xnpod_update_csw_date (sched); +xnstat_runtime_finalize (sched, &threadin->stat.account);xnarch_finalize_and_switch (xnthread_archtcb (threadout),xnthread_archtcb (threadin));
@@ -1896,7 +1898,7 @@ int xnpod_migrate_thread(int cpu)xnpod_schedule ();/* Reset execution time stats due to unsync'ed TSCs */ -xnpod_reset_exec_stats (thread); +xnstat_runtime_reset_stats (&thread->stat.account); unlock_and_exit:
@@ -2435,8 +2437,8 @@ void xnpod_schedule(void)xnarch_enter_root (xnthread_archtcb (threadin)); } -xnpod_acc_exec_time (sched, threadout); -xnthread_inc_csw (threadin); +xnstat_runtime_switch (sched, &threadin->stat.account); +xnstat_counter_inc (&threadin->stat.csw);xnarch_switch_to (xnthread_archtcb (threadout),xnthread_archtcb (threadin));
@@ -2607,8 +2609,8 @@ void xnpod_schedule_runnable(xnthread_t nkpod->schedhook (runthread,XNREADY );#endif /* __XENO_SIM__ */ -xnpod_acc_exec_time (sched, runthread); -xnthread_inc_csw (threadin); +xnstat_runtime_switch (sched, &threadin->stat.account); +xnstat_counter_inc (&threadin->stat.csw);xnarch_switch_to (xnthread_archtcb (runthread),xnthread_archtcb (threadin));
ksrc/nucleus/shadow.c +2 -1
@@ -50,6 +50,7 @@#include <nucleus/jhash.h> #include <nucleus/ppd.h> #include <nucleus/trace.h> +#include <nucleus/stat.h> #include <asm/xenomai/features.h> #include <asm/xenomai/syscall.h> #include <asm/xenomai/bits/shadow.h>
@@ -727,7 +728,7 @@ void xnshadow_relax(int notify)rthal_reenter_root (get_switch_lock_owner (), cprio ?SCHED_FIFO :SCHED_NORMAL , cprio); -xnthread_inc_ssw (thread);/* Account for secondary mode switch. */ +xnstat_counter_inc (&thread->stat.ssw);/* Account for secondary mode switch. */ if (notify &&testbits (thread->status,XNTRAPSW ))/* Help debugging spurious relaxes. */
ksrc/nucleus/thread.c +1 -8
@@ -86,14 +86,7 @@ int xnthread_init(xnthread_t *thread, thread->registry.handle =XN_NO_HANDLE ; thread->registry.waitkey =NULL ;#endif /* CONFIG_XENO_OPT_REGISTRY */ - -#ifdef CONFIG_XENO_OPT_STATS - thread->stat.ssw =0 ; - thread->stat.csw =0 ; - thread->stat.pf =0 ; - thread->stat.exec_time =0 ; - thread->stat.exec_start =0 ; -#endif /* CONFIG_XENO_OPT_STATS */ +memset (&thread->stat,0 ,sizeof (thread->stat));/* These will be filled by xnpod_start_thread() */ thread->imask =0 ;