diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-29 13:36:19 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-29 13:36:19 +0000 |
| commit | 1ae1099ef072fd5fa5d1fde1e73c8c1df8d8d2f4 (patch) | |
| tree | 8313e0ef11e0e2a7fed0581515cc47995343387e /os/kernel/include | |
| parent | 61f841306aaa11b1471db1deb00470ea48f646fd (diff) | |
| download | ChibiOS-1ae1099ef072fd5fa5d1fde1e73c8c1df8d8d2f4.tar.gz ChibiOS-1ae1099ef072fd5fa5d1fde1e73c8c1df8d8d2f4.tar.bz2 ChibiOS-1ae1099ef072fd5fa5d1fde1e73c8c1df8d8d2f4.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6038 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/include')
| -rw-r--r-- | os/kernel/include/ch.h | 2 | ||||
| -rw-r--r-- | os/kernel/include/chstats.h | 105 | ||||
| -rw-r--r-- | os/kernel/include/chtm.h (renamed from os/kernel/include/chrt.h) | 16 |
3 files changed, 114 insertions, 9 deletions
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h index efade76bf..e30ddd515 100644 --- a/os/kernel/include/ch.h +++ b/os/kernel/include/ch.h @@ -108,7 +108,7 @@ typedef struct thread thread_t; #include "chconf.h"
#include "chtypes.h"
#include "chdebug.h"
-#include "chrt.h"
+#include "chtm.h"
#include "chstats.h"
#include "chcore.h"
#include "chsys.h"
diff --git a/os/kernel/include/chstats.h b/os/kernel/include/chstats.h new file mode 100644 index 000000000..a94a84814 --- /dev/null +++ b/os/kernel/include/chstats.h @@ -0,0 +1,105 @@ +/*
+ ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+ 2011,2012,2013 Giovanni Di Sirio.
+
+ This file is part of ChibiOS/RT.
+
+ ChibiOS/RT is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ ChibiOS/RT is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file chstats.h
+ * @brief Statistics module macros and structures.
+ *
+ * @addtogroup statistics
+ * @{
+ */
+
+#ifndef _CHSTATS_H_
+#define _CHSTATS_H_
+
+#if CH_DBG_STATISTICS || defined(__DOXYGEN__)
+
+/*===========================================================================*/
+/* Module constants. */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Module pre-compile time settings. */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Derived constants and error checks. */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Module data structures and types. */
+/*===========================================================================*/
+
+/**
+ * @brief Type of a kernel statistics structure.
+ */
+typedef struct {
+ ucnt_t nirq; /**< @brief IRQ number.
+ @note Fast Interrupts are not
+ accounted for. */
+ ucnt_t nctxswc; /**< @brief Context switch number. */
+ time_measurement_t critical; /**< @brief Critical zones measurement. */
+ time_measurement_t isr; /**< @brief ISR measurement. */
+} kernel_stats_t;
+
+/*===========================================================================*/
+/* Module macros. */
+/*===========================================================================*/
+
+/**
+ * @brief Increases the IRQ counter.
+ */
+#define _stats_increase_irq() kernel_stats.nirq++
+
+/**
+ * @brief Increases the context switch counter.
+ */
+#define _stats_increase_ctxswc() kernel_stats.nctxswc++
+
+/*===========================================================================*/
+/* External declarations. */
+/*===========================================================================*/
+
+#if !defined(__DOXYGEN__)
+extern kernel_stats_t kernel_stats;
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+/*===========================================================================*/
+/* Module inline functions. */
+/*===========================================================================*/
+
+#else /* !CH_DBG_STATISTICS */
+
+/* Stub functions for when the statistics module is disabled. */
+#define _stats_increase_irq()
+#define _stats_increase_ctxswc()
+
+#endif /* !CH_DBG_STATISTICS */
+
+#endif /* _CHSTATS_H_ */
+
+/** @} */
diff --git a/os/kernel/include/chrt.h b/os/kernel/include/chtm.h index caf27747e..a7500a26b 100644 --- a/os/kernel/include/chrt.h +++ b/os/kernel/include/chtm.h @@ -19,17 +19,17 @@ */
/**
- * @file chrt.h
- * @brief Real Time Counter and Measurement module macros and structures.
+ * @file chtm.h
+ * @brief Time Measurement module macros and structures.
*
- * @addtogroup realtime_counter
+ * @addtogroup time_measurement
* @{
*/
-#ifndef _CHRT_H_
-#define _CHRT_H_
+#ifndef _CHTM_H_
+#define _CHTM_H_
-#if CH_CFG_USE_RT || defined(__DOXYGEN__)
+#if CH_CFG_USE_TM || defined(__DOXYGEN__)
#define port_rt_get_counter_value() 0
@@ -164,8 +164,8 @@ extern "C" { /* Module inline functions. */
/*===========================================================================*/
-#endif /* CH_CFG_USE_RT */
+#endif /* CH_CFG_USE_TM */
-#endif /* _CHRT_H_ */
+#endif /* _CHTM_H_ */
/** @} */
|