sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sched/irq: Include a few ProcFS-related changes missed in commit 1ac9558460

Browse Source
This commit is contained in:
Gregory Nutt 2018-11-26 12:01:36 -06:00
parent 1ac9558460
commit 553c566650
3 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/or1k/nsh/defconfig
View File

@ -79,7 +79,6 @@ CONFIG_PTHREAD_STACK_DEFAULT=1024
CONFIG_RAM_SIZE=4194304 CONFIG_RAM_SIZE=4194304
CONFIG_RAM_START=0x0000 CONFIG_RAM_START=0x0000
CONFIG_RAW_BINARY=y CONFIG_RAW_BINARY=y
CONFIG_SCHED_IRQMONITOR=y
CONFIG_SDCLONE_DISABLE=y CONFIG_SDCLONE_DISABLE=y
CONFIG_START_DAY=7 CONFIG_START_DAY=7
CONFIG_START_MONTH=12 CONFIG_START_MONTH=12

2
sched/irq/irq_initialize.c
View File

@ -97,9 +97,7 @@ void irq_initialize(void)
g_irqvector[i].mscount = 0; g_irqvector[i].mscount = 0;
g_irqvector[i].lscount = 0; g_irqvector[i].lscount = 0;
#endif #endif
#ifdef CONFIG_SCHED_TICKLESS
g_irqvector[i].time = 0; g_irqvector[i].time = 0;
#endif
#endif #endif
} }

31
sched/irq/irq_procfs.c
View File

@ -59,8 +59,6 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Output format: /* Output format:
*
* In Tickless mode (where IRQ timing is available):
* *
* 1111111111222222222233333333334444444444 * 1111111111222222222233333333334444444444
* 1234567890123456789012345678901234567890123456789 * 1234567890123456789012345678901234567890123456789
@ -68,37 +66,20 @@
* IRQ HANDLER ARGUMENT COUNT RATE TIME * IRQ HANDLER ARGUMENT COUNT RATE TIME
* DDD XXXXXXXX XXXXXXXX DDDDDDDDDD DDDD.DDD DDDD * DDD XXXXXXXX XXXXXXXX DDDDDDDDDD DDDD.DDD DDDD
* *
* In other modes:
*
* 11111111112222222222333333333344
* 12345678901234567890123456789012345678901
*
* IRQ HANDLER ARGUMENT COUNT RATE
* DDD XXXXXXXX XXXXXXXX DDDDDDDDDD DDDD.DDD
*
* NOTE: This assumes that an address can be represented in 32-bits. In * NOTE: This assumes that an address can be represented in 32-bits. In
* the typical configuration where CONFIG_HAVE_LONG_LONG=y, the COUNT field * the typical configuration where CONFIG_HAVE_LONG_LONG=y, the COUNT field
* may not be wide enough. * may not be wide enough.
*/ */
#ifdef CONFIG_SCHED_TICKLESS #define HDR_FMT "IRQ HANDLER ARGUMENT COUNT RATE TIME\n"
# define HDR_FMT "IRQ HANDLER ARGUMENT COUNT RATE TIME\n" #define IRQ_FMT "%3u %08lx %08lx %10lu %4lu.%03lu %4lu\n"
# define IRQ_FMT "%3u %08lx %08lx %10lu %4lu.%03lu %4lu\n"
#else
# define HDR_FMT "IRQ HANDLER ARGUMENT COUNT RATE\n"
# define IRQ_FMT "%3u %08lx %08lx %10lu %4lu.%03lu\n"
#endif
/* Determines the size of an intermediate buffer that must be large enough /* Determines the size of an intermediate buffer that must be large enough
* to handle the longest line generated by this logic (plus a couple of * to handle the longest line generated by this logic (plus a couple of
* bytes). * bytes).
*/ */
#ifdef CONFIG_SCHED_TICKLESS #define IRQ_LINELEN 50
# define IRQ_LINELEN 50
#else
# define IRQ_LINELEN 44
#endif
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
@ -198,9 +179,7 @@ static int irq_callback(int irq, FAR struct irq_info_s *info,
info->mscount = 0; info->mscount = 0;
info->lscount = 0; info->lscount = 0;
#endif #endif
#ifdef CONFIG_SCHED_TICKLESS
info->time = 0; info->time = 0;
#endif
leave_critical_section(flags); leave_critical_section(flags);
/* Don't bother if count == 0. /* Don't bother if count == 0.
@ -273,11 +252,7 @@ static int irq_callback(int irq, FAR struct irq_info_s *info,
(unsigned int)irq, (unsigned int)irq,
(unsigned long)((uintptr_t)copy.handler), (unsigned long)((uintptr_t)copy.handler),
(unsigned long)((uintptr_t)copy.arg), (unsigned long)((uintptr_t)copy.arg),
#ifdef CONFIG_SCHED_TICKLESS
count, intpart, fracpart, copy.time / 1000); count, intpart, fracpart, copy.time / 1000);
#else
count, intpart, fracpart);
#endif
copysize = procfs_memcpy(irqfile->line, linesize, irqfile->buffer, copysize = procfs_memcpy(irqfile->line, linesize, irqfile->buffer,
irqfile->remaining, &irqfile->offset); irqfile->remaining, &irqfile->offset);