sched/sched/sched_note.c: Implement interrupt/syscall support
A previous PR added interrupt and system call scheduler notes. This addess buffering support for those notes.
This commit is contained in:
parent
6a19f03756
commit
69e97c19ea
@ -99,7 +99,8 @@ enum note_type_e
|
|||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER
|
#ifdef CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER
|
||||||
,
|
,
|
||||||
NOTE_IRQHANDLER = 20
|
NOTE_IRQ_ENTER = 20,
|
||||||
|
NOTE_IRQ_LEAVE = 21
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -239,7 +240,6 @@ struct note_syscall_enter_s
|
|||||||
{
|
{
|
||||||
struct note_common_s nsc_cmn; /* Common note parameters */
|
struct note_common_s nsc_cmn; /* Common note parameters */
|
||||||
int nsc_nr; /* System call number */
|
int nsc_nr; /* System call number */
|
||||||
bool nsc_enter; /* true: Entering system call */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct note_syscall_leave_s
|
struct note_syscall_leave_s
|
||||||
@ -247,18 +247,16 @@ struct note_syscall_leave_s
|
|||||||
struct note_common_s nsc_cmn; /* Common note parameters */
|
struct note_common_s nsc_cmn; /* Common note parameters */
|
||||||
uintptr_t nsc_result; /* Result of the system call */
|
uintptr_t nsc_result; /* Result of the system call */
|
||||||
int nsc_nr; /* System call number */
|
int nsc_nr; /* System call number */
|
||||||
bool nsc_enter; /* false: Leaving system call */
|
|
||||||
};
|
};
|
||||||
#endif /* CONFIG_SCHED_INSTRUMENTATION_SYSCALL */
|
#endif /* CONFIG_SCHED_INSTRUMENTATION_SYSCALL */
|
||||||
|
|
||||||
#ifdef CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER
|
#ifdef CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER
|
||||||
/* This is the specific form of the NOTE_IRQHANDLER note */
|
/* This is the specific form of the NOTE_IRQ_ENTER/LEAVE notes */
|
||||||
|
|
||||||
struct note_irqhandler_s
|
struct note_irqhandler_s
|
||||||
{
|
{
|
||||||
struct note_common_s nih_cmn; /* Common note parameters */
|
struct note_common_s nih_cmn; /* Common note parameters */
|
||||||
int nih_irq; /* IRQ number */
|
int nih_irq; /* IRQ number */
|
||||||
bool nih_enter; /* true: Entering handler */
|
|
||||||
};
|
};
|
||||||
#endif /* CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER */
|
#endif /* CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER */
|
||||||
#endif /* CONFIG_SCHED_INSTRUMENTATION_BUFFER */
|
#endif /* CONFIG_SCHED_INSTRUMENTATION_BUFFER */
|
||||||
|
@ -1026,7 +1026,7 @@ config SCHED_NOTE_BUFSIZE
|
|||||||
bytes).
|
bytes).
|
||||||
|
|
||||||
config SCHED_NOTE_GET
|
config SCHED_NOTE_GET
|
||||||
bool "Callable interface to get instrumentatin data"
|
bool "Callable interface to get instrumentation data"
|
||||||
default n
|
default n
|
||||||
depends on !SCHED_INSTRUMENTATION_CSECTION && (!SCHED_INSTRUMENTATION_SPINLOCK || !SMP)
|
depends on !SCHED_INSTRUMENTATION_CSECTION && (!SCHED_INSTRUMENTATION_SPINLOCK || !SMP)
|
||||||
---help---
|
---help---
|
||||||
|
@ -1,35 +1,20 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* sched/sched/sched_note.c
|
* sched/sched/sched_note.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright ownership. The
|
||||||
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance with the
|
||||||
|
* License. You may obtain a copy of the License at
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
*
|
*
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
* notice, this list of conditions and the following disclaimer in
|
* License for the specific language governing permissions and limitations
|
||||||
* the documentation and/or other materials provided with the
|
* under the License.
|
||||||
* distribution.
|
|
||||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
|
||||||
* used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
||||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
||||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
||||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
||||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
||||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
@ -53,10 +38,6 @@
|
|||||||
|
|
||||||
#ifdef CONFIG_SCHED_INSTRUMENTATION_BUFFER
|
#ifdef CONFIG_SCHED_INSTRUMENTATION_BUFFER
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Pre-processor Definitions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Private Types
|
* Private Types
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@ -594,6 +575,59 @@ void sched_note_spinabort(FAR struct tcb_s *tcb, FAR volatile void *spinlock)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_SCHED_INSTRUMENTATION_SYSCALL
|
||||||
|
void sched_note_syscall_enter(int nr, int argc, ...)
|
||||||
|
{
|
||||||
|
struct note_syscall_enter_s note;
|
||||||
|
FAR struct tcb_s *tcb = this_task();
|
||||||
|
|
||||||
|
/* Format the note */
|
||||||
|
|
||||||
|
note_common(tcb, ¬e.nsc_cmn, sizeof(struct note_syscall_enter_s),
|
||||||
|
NOTE_CSECTION_ENTER);
|
||||||
|
note.nsc_nr = nr;
|
||||||
|
|
||||||
|
/* Add the note to circular buffer */
|
||||||
|
|
||||||
|
note_add((FAR const uint8_t *)¬e, sizeof(struct note_syscall_enter_s));
|
||||||
|
}
|
||||||
|
|
||||||
|
void sched_note_syscall_leave(int nr, uintptr_t result)
|
||||||
|
{
|
||||||
|
struct note_syscall_leave_s note;
|
||||||
|
FAR struct tcb_s *tcb = this_task();
|
||||||
|
|
||||||
|
/* Format the note */
|
||||||
|
|
||||||
|
note_common(tcb, ¬e.nsc_cmn, sizeof(struct note_syscall_leave_s),
|
||||||
|
NOTE_CSECTION_LEAVE);
|
||||||
|
note.nsc_result = result;
|
||||||
|
note.nsc_nr = nr;
|
||||||
|
|
||||||
|
/* Add the note to circular buffer */
|
||||||
|
|
||||||
|
note_add((FAR const uint8_t *)¬e, sizeof(struct note_syscall_leave_s));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER
|
||||||
|
void sched_note_irqhandler(int irq, FAR void *handler, bool enter)
|
||||||
|
{
|
||||||
|
struct note_irqhandler_s note;
|
||||||
|
FAR struct tcb_s *tcb = this_task();
|
||||||
|
|
||||||
|
/* Format the note */
|
||||||
|
|
||||||
|
note_common(tcb, ¬e.nih_cmn, sizeof(struct note_irqhandler_s),
|
||||||
|
enter ? NOTE_IRQ_ENTER : NOTE_IRQ_LEAVE);
|
||||||
|
note.nih_irq = irq;
|
||||||
|
|
||||||
|
/* Add the note to circular buffer */
|
||||||
|
|
||||||
|
note_add((FAR const uint8_t *)¬e, sizeof(struct note_irqhandler_s));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: sched_note_get
|
* Name: sched_note_get
|
||||||
*
|
*
|
||||||
|
Loading…
Reference in New Issue
Block a user