Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-21 09:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

score: <rtems/score/smplockstats.h>

Browse Source 
Remove <rtems/score/chainimpl.h> include from
<rtems/score/smplockstats.h>.

Close #3598.
This commit is contained in:
Sebastian Huber
2018-11-26 08:29:33 +01:00
parent eaa5ea84ea
commit 5fc727fe77
2 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/include/rtems/score/smplockstats.h
+17 -17
View File
@@ -7,7 +7,7 @@
*/
/*
* Copyright (c) 2013, 2016 embedded brains GmbH
* Copyright (c) 2013, 2018 embedded brains GmbH
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
@@ -17,15 +17,11 @@
#ifndef _RTEMS_SCORE_SMPLOCKSTATS_H
#define _RTEMS_SCORE_SMPLOCKSTATS_H
#include <rtems/score/cpuopts.h>
#include <rtems/score/cpu.h>
#if defined(RTEMS_SMP)
#if defined(RTEMS_PROFILING)
#include <rtems/score/chainimpl.h>
#include <stdint.h>
#endif
#include <rtems/score/chain.h>
#ifdef __cplusplus
extern "C" {
@@ -171,7 +167,10 @@ static inline void _SMP_lock_Stats_initialize(
*/
void _SMP_lock_Stats_destroy( SMP_lock_Stats *stats );
void _SMP_lock_Stats_register( SMP_lock_Stats *stats );
void _SMP_lock_Stats_register_or_max_section_time(
SMP_lock_Stats *stats,
CPU_Counter_ticks max_section_time
);
typedef struct {
CPU_Counter_ticks first;
@@ -223,19 +222,20 @@ static inline void _SMP_lock_Stats_release_update(
const SMP_lock_Stats_context *stats_context
)
{
SMP_lock_Stats *stats = stats_context->stats;
CPU_Counter_ticks first = stats_context->acquire_instant;
CPU_Counter_ticks second = _CPU_Counter_read();
CPU_Counter_ticks delta = _CPU_Counter_difference( second, first );
SMP_lock_Stats *stats;
CPU_Counter_ticks first;
CPU_Counter_ticks second;
CPU_Counter_ticks delta;
stats = stats_context->stats;
first = stats_context->acquire_instant;
second = _CPU_Counter_read();
delta = _CPU_Counter_difference( second, first );
stats->total_section_time += delta;
if ( stats->max_section_time < delta ) {
stats->max_section_time = delta;
if ( _Chain_Is_node_off_chain( &stats->Node ) ) {
_SMP_lock_Stats_register( stats );
}
_SMP_lock_Stats_register_or_max_section_time( stats, delta );
}
}
cpukit/score/src/profilingsmplock.c
+16 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014 embedded brains GmbH. All rights reserved.
* Copyright (c) 2014, 2018 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Dornierstr. 4
@@ -17,6 +17,7 @@
#endif
#include <rtems/score/smplock.h>
#include <rtems/score/chainimpl.h>
#include <string.h>
@@ -81,14 +82,22 @@ void _SMP_lock_Stats_destroy( SMP_lock_Stats *stats )
}
}
void _SMP_lock_Stats_register( SMP_lock_Stats *stats )
void _SMP_lock_Stats_register_or_max_section_time(
SMP_lock_Stats *stats,
CPU_Counter_ticks max_section_time
)
{
SMP_lock_Stats_control *control = &_SMP_lock_Stats_control;
SMP_lock_Context lock_context;
stats->max_section_time = max_section_time;
_SMP_lock_ISR_disable_and_acquire( &control->Lock, &lock_context );
_Chain_Append_unprotected( &control->Stats_chain, &stats->Node );
_SMP_lock_Release_and_ISR_enable( &control->Lock, &lock_context );
if ( _Chain_Is_node_off_chain( &stats->Node ) ) {
SMP_lock_Stats_control *control;
SMP_lock_Context lock_context;
control = &_SMP_lock_Stats_control;
_SMP_lock_ISR_disable_and_acquire( &control->Lock, &lock_context );
_Chain_Append_unprotected( &control->Stats_chain, &stats->Node );
_SMP_lock_Release_and_ISR_enable( &control->Lock, &lock_context );
}
}
void _SMP_lock_Stats_iteration_start(