SMP: Move lock stats to separate header file

cpukit/score/Makefile.am

@@ -129,6 +129,7 @@ include_rtems_score_HEADERS += include/rtems/score/schedulerprioritysmpimpl.h
 include_rtems_score_HEADERS += include/rtems/score/schedulerpriorityaffinitysmp.h
 include_rtems_score_HEADERS += include/rtems/score/schedulersimplesmp.h
 include_rtems_score_HEADERS += include/rtems/score/schedulerstrongapa.h
+include_rtems_score_HEADERS += include/rtems/score/smplockstats.h
 endif
 
 ## src

cpukit/score/include/rtems/score/smplock.h

@@ -24,14 +24,10 @@
 
 #if defined(RTEMS_SMP)
 
+#include <rtems/score/smplockstats.h>
 #include <rtems/score/atomic.h>
 #include <rtems/score/isrlevel.h>
 
-#if defined( RTEMS_PROFILING )
-#include <rtems/score/chainimpl.h>
-#include <string.h>
-#endif
-
 #if defined(RTEMS_PROFILING) || defined(RTEMS_DEBUG)
 #define RTEMS_SMP_LOCK_DO_NOT_INLINE
 #endif
@@ -58,157 +54,6 @@ extern "C" {
  * @{
  */
 
-#if defined( RTEMS_PROFILING )
-
-/**
- * @brief Count of lock contention counters for lock statistics.
- */
-#define SMP_LOCK_STATS_CONTENTION_COUNTS 4
-
-/**
- * @brief SMP lock statistics.
- *
- * The lock acquire attempt instant is the point in time right after the
- * interrupt disable action in the lock acquire sequence.
- *
- * The lock acquire instant is the point in time right after the lock
- * acquisition.  This is the begin of the critical section code execution.
- *
- * The lock release instant is the point in time right before the interrupt
- * enable action in the lock release sequence.
- *
- * The lock section time is the time elapsed between the lock acquire instant
- * and the lock release instant.
- *
- * The lock acquire time is the time elapsed between the lock acquire attempt
- * instant and the lock acquire instant.
- */
-typedef struct {
-  /**
-   * @brief Node for SMP lock statistics chain.
-   */
-  Chain_Node Node;
-
-  /**
-   * @brief The maximum lock acquire time in CPU counter ticks.
-   */
-  CPU_Counter_ticks max_acquire_time;
-
-  /**
-   * @brief The maximum lock section time in CPU counter ticks.
-   */
-  CPU_Counter_ticks max_section_time;
-
-  /**
-   * @brief The count of lock uses.
-   *
-   * This value may overflow.
-   */
-  uint64_t usage_count;
-
-  /**
-   * @brief Total lock acquire time in nanoseconds.
-   *
-   * The average lock acquire time is the total acquire time divided by the
-   * lock usage count.  The ration of the total section and total acquire times
-   * gives a measure for the lock contention.
-   *
-   * This value may overflow.
-   */
-  uint64_t total_acquire_time;
-
-  /**
-   * @brief The counts of lock acquire operations by contention.
-   *
-   * The contention count for index N corresponds to a lock acquire attempt
-   * with an initial queue length of N.  The last index corresponds to all
-   * lock acquire attempts with an initial queue length greater than or equal
-   * to SMP_LOCK_STATS_CONTENTION_COUNTS minus one.
-   *
-   * The values may overflow.
-   */
-  uint64_t contention_counts[SMP_LOCK_STATS_CONTENTION_COUNTS];
-
-  /**
-   * @brief Total lock section time in CPU counter ticks.
-   *
-   * The average lock section time is the total section time divided by the
-   * lock usage count.
-   *
-   * This value may overflow.
-   */
-  uint64_t total_section_time;
-
-  /**
-   * @brief The lock name.
-   */
-  const char *name;
-} SMP_lock_Stats;
-
-/**
- * @brief Local context for SMP lock statistics.
- */
-typedef struct {
-  /**
-   * @brief The last lock acquire instant in CPU counter ticks.
-   *
-   * This value is used to measure the lock section time.
-   */
-  CPU_Counter_ticks acquire_instant;
-
-  /**
-   * @brief The lock stats used for the last lock acquire.
-   */
-  SMP_lock_Stats *stats;
-} SMP_lock_Stats_context;
-
-/**
- * @brief SMP lock statistics initializer for static initialization.
- */
-#define SMP_LOCK_STATS_INITIALIZER( name ) \
-  { { NULL, NULL }, 0, 0, 0, 0, { 0, 0, 0, 0 }, 0, name }
-
-/**
- * @brief Initializes an SMP lock statistics block.
- *
- * @param[in, out] stats The SMP lock statistics block.
- * @param[in] name The name for the SMP lock statistics.  This name must be
- * persistent throughout the life time of this statistics block.
- */
-static inline void _SMP_lock_Stats_initialize(
-  SMP_lock_Stats *stats,
-  const char *name
-)
-{
-  SMP_lock_Stats init = SMP_LOCK_STATS_INITIALIZER( name );
-
-  *stats = init;
-}
-
-/**
- * @brief Destroys an SMP lock statistics block.
- *
- * @param[in] stats The SMP lock statistics block.
- */
-static inline void _SMP_lock_Stats_destroy( SMP_lock_Stats *stats );
-
-/**
- * @brief Updates an SMP lock statistics block during a lock release.
- *
- * @param[in] stats_context The SMP lock statistics context.
- */
-static inline void _SMP_lock_Stats_release_update(
-  const SMP_lock_Stats_context *stats_context
-);
-
-#else /* RTEMS_PROFILING */
-
-#define _SMP_lock_Stats_initialize( stats, name ) do { } while ( 0 )
-
-#define _SMP_lock_Stats_destroy( stats ) do { } while ( 0 )
-
-#endif /* RTEMS_PROFILING */
-
 /**
  * @brief SMP ticket lock control.
  */
@@ -602,158 +447,12 @@ static inline void _SMP_lock_Release_and_ISR_enable(
 bool _SMP_lock_Is_owner( const SMP_lock_Control *lock );
 #endif
 
-#if defined( RTEMS_PROFILING )
-
-typedef struct {
-  SMP_lock_Control Lock;
-  Chain_Control Stats_chain;
-  Chain_Control Iterator_chain;
-} SMP_lock_Stats_control;
-
-typedef struct {
-  Chain_Node Node;
-  SMP_lock_Stats *current;
-} SMP_lock_Stats_iteration_context;
-
-extern SMP_lock_Stats_control _SMP_lock_Stats_control;
-
-static inline void _SMP_lock_Stats_iteration_start(
-  SMP_lock_Stats_iteration_context *iteration_context
-)
-{
-  SMP_lock_Stats_control *control = &_SMP_lock_Stats_control;
-  SMP_lock_Context lock_context;
-
-  _SMP_lock_ISR_disable_and_acquire( &control->Lock, &lock_context );
-
-  _Chain_Append_unprotected(
-    &control->Iterator_chain,
-    &iteration_context->Node
-  );
-  iteration_context->current =
-    (SMP_lock_Stats *) _Chain_First( &control->Stats_chain );
-
-  _SMP_lock_Release_and_ISR_enable( &control->Lock, &lock_context );
-}
-
-static inline bool _SMP_lock_Stats_iteration_next(
-  SMP_lock_Stats_iteration_context *iteration_context,
-  SMP_lock_Stats *snapshot,
-  char *name,
-  size_t name_size
-)
-{
-  SMP_lock_Stats_control *control = &_SMP_lock_Stats_control;
-  SMP_lock_Context lock_context;
-  SMP_lock_Stats *current;
-  bool valid;
-
-  _SMP_lock_ISR_disable_and_acquire( &control->Lock, &lock_context );
-
-  current = iteration_context->current;
-  if ( !_Chain_Is_tail( &control->Stats_chain, &current->Node ) ) {
-    size_t name_len = current->name != NULL ? strlen(current->name) : 0;
-
-    valid = true;
-
-    iteration_context->current = (SMP_lock_Stats *)
-      _Chain_Next( &current->Node );
-
-    *snapshot = *current;
-    snapshot->name = name;
-
-    if ( name_len >= name_size ) {
-      name_len = name_size - 1;
-    }
-
-    name[name_len] = '\0';
-    memcpy(name, current->name, name_len);
-  } else {
-    valid = false;
-  }
-
-  _SMP_lock_Release_and_ISR_enable( &control->Lock, &lock_context );
-
-  return valid;
-}
-
-static inline void _SMP_lock_Stats_iteration_stop(
-  SMP_lock_Stats_iteration_context *iteration_context
-)
-{
-  SMP_lock_Stats_control *control = &_SMP_lock_Stats_control;
-  SMP_lock_Context lock_context;
-
-  _SMP_lock_ISR_disable_and_acquire( &control->Lock, &lock_context );
-  _Chain_Extract_unprotected( &iteration_context->Node );
-  _SMP_lock_Release_and_ISR_enable( &control->Lock, &lock_context );
-}
-
-static inline void _SMP_lock_Stats_destroy( SMP_lock_Stats *stats )
-{
-  if ( !_Chain_Is_node_off_chain( &stats->Node ) ) {
-    SMP_lock_Stats_control *control = &_SMP_lock_Stats_control;
-    SMP_lock_Context lock_context;
-    SMP_lock_Stats_iteration_context *iteration_context;
-    SMP_lock_Stats_iteration_context *iteration_context_tail;
-    SMP_lock_Stats *next_stats;
-
-    _SMP_lock_ISR_disable_and_acquire( &control->Lock, &lock_context );
-
-    next_stats = (SMP_lock_Stats *) _Chain_Next( &stats->Node );
-    _Chain_Extract_unprotected( &stats->Node );
-
-    iteration_context = (SMP_lock_Stats_iteration_context *)
-      _Chain_First( &control->Iterator_chain );
-    iteration_context_tail = (SMP_lock_Stats_iteration_context *)
-      _Chain_Tail( &control->Iterator_chain );
-
-    while ( iteration_context != iteration_context_tail ) {
-      if ( iteration_context->current == stats ) {
-        iteration_context->current = next_stats;
-      }
-
-      iteration_context = (SMP_lock_Stats_iteration_context *)
-        _Chain_Next( &iteration_context->Node );
-    }
-
-    _SMP_lock_Release_and_ISR_enable( &control->Lock, &lock_context );
-  }
-}
-
-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 );
-
-  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_control *control = &_SMP_lock_Stats_control;
-      SMP_lock_Context lock_context;
-
-      _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 );
-    }
-  }
-}
-
-#endif /* RTEMS_PROFILING */
-
 /**@}*/
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* defined( RTEMS_SMP ) */
+#endif /* RTEMS_SMP */
 
 #endif /* _RTEMS_SCORE_SMPLOCK_H */

cpukit/score/include/rtems/score/smplockstats.h

@@ -0,0 +1,236 @@
+/**
+ * @file
+ *
+ * @ingroup ScoreSMPLock
+ *
+ * @brief SMP Lock API
+ */
+
+/*
+ * Copyright (c) 2013, 2016 embedded brains GmbH
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.org/license/LICENSE.
+ */
+
+#ifndef _RTEMS_SCORE_SMPLOCKSTATS_H
+#define _RTEMS_SCORE_SMPLOCKSTATS_H
+
+#include <rtems/score/cpuopts.h>
+
+#if defined(RTEMS_SMP)
+
+#include <rtems/score/chainimpl.h>
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * @addtogroup ScoreSMPLock
+ *
+ * @{
+ */
+
+#if defined(RTEMS_PROFILING)
+
+/**
+ * @brief Count of lock contention counters for lock statistics.
+ */
+#define SMP_LOCK_STATS_CONTENTION_COUNTS 4
+
+/**
+ * @brief SMP lock statistics.
+ *
+ * The lock acquire attempt instant is the point in time right after the
+ * interrupt disable action in the lock acquire sequence.
+ *
+ * The lock acquire instant is the point in time right after the lock
+ * acquisition.  This is the begin of the critical section code execution.
+ *
+ * The lock release instant is the point in time right before the interrupt
+ * enable action in the lock release sequence.
+ *
+ * The lock section time is the time elapsed between the lock acquire instant
+ * and the lock release instant.
+ *
+ * The lock acquire time is the time elapsed between the lock acquire attempt
+ * instant and the lock acquire instant.
+ */
+typedef struct {
+  /**
+   * @brief Node for SMP lock statistics chain.
+   */
+  Chain_Node Node;
+
+  /**
+   * @brief The maximum lock acquire time in CPU counter ticks.
+   */
+  CPU_Counter_ticks max_acquire_time;
+
+  /**
+   * @brief The maximum lock section time in CPU counter ticks.
+   */
+  CPU_Counter_ticks max_section_time;
+
+  /**
+   * @brief The count of lock uses.
+   *
+   * This value may overflow.
+   */
+  uint64_t usage_count;
+
+  /**
+   * @brief Total lock acquire time in nanoseconds.
+   *
+   * The average lock acquire time is the total acquire time divided by the
+   * lock usage count.  The ration of the total section and total acquire times
+   * gives a measure for the lock contention.
+   *
+   * This value may overflow.
+   */
+  uint64_t total_acquire_time;
+
+  /**
+   * @brief The counts of lock acquire operations by contention.
+   *
+   * The contention count for index N corresponds to a lock acquire attempt
+   * with an initial queue length of N.  The last index corresponds to all
+   * lock acquire attempts with an initial queue length greater than or equal
+   * to SMP_LOCK_STATS_CONTENTION_COUNTS minus one.
+   *
+   * The values may overflow.
+   */
+  uint64_t contention_counts[SMP_LOCK_STATS_CONTENTION_COUNTS];
+
+  /**
+   * @brief Total lock section time in CPU counter ticks.
+   *
+   * The average lock section time is the total section time divided by the
+   * lock usage count.
+   *
+   * This value may overflow.
+   */
+  uint64_t total_section_time;
+
+  /**
+   * @brief The lock name.
+   */
+  const char *name;
+} SMP_lock_Stats;
+
+/**
+ * @brief Local context for SMP lock statistics.
+ */
+typedef struct {
+  /**
+   * @brief The last lock acquire instant in CPU counter ticks.
+   *
+   * This value is used to measure the lock section time.
+   */
+  CPU_Counter_ticks acquire_instant;
+
+  /**
+   * @brief The lock stats used for the last lock acquire.
+   */
+  SMP_lock_Stats *stats;
+} SMP_lock_Stats_context;
+
+/**
+ * @brief SMP lock statistics initializer for static initialization.
+ */
+#define SMP_LOCK_STATS_INITIALIZER( name ) \
+  { { NULL, NULL }, 0, 0, 0, 0, { 0, 0, 0, 0 }, 0, name }
+
+/**
+ * @brief Initializes an SMP lock statistics block.
+ *
+ * @param[in, out] stats The SMP lock statistics block.
+ * @param[in] name The name for the SMP lock statistics.  This name must be
+ * persistent throughout the life time of this statistics block.
+ */
+static inline void _SMP_lock_Stats_initialize(
+  SMP_lock_Stats *stats,
+  const char *name
+)
+{
+  SMP_lock_Stats init = SMP_LOCK_STATS_INITIALIZER( name );
+
+  *stats = init;
+}
+
+/**
+ * @brief Destroys an SMP lock statistics block.
+ *
+ * @param[in] stats The SMP lock statistics block.
+ */
+void _SMP_lock_Stats_destroy( SMP_lock_Stats *stats );
+
+void _SMP_lock_Stats_register( SMP_lock_Stats *stats );
+
+/**
+ * @brief Updates an SMP lock statistics block during a lock release.
+ *
+ * @param[in] stats_context The SMP lock statistics context.
+ */
+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 );
+
+  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 );
+    }
+  }
+}
+
+typedef struct {
+  Chain_Node Node;
+  SMP_lock_Stats *current;
+} SMP_lock_Stats_iteration_context;
+
+void _SMP_lock_Stats_iteration_start(
+  SMP_lock_Stats_iteration_context *iteration_context
+);
+
+
+bool _SMP_lock_Stats_iteration_next(
+  SMP_lock_Stats_iteration_context *iteration_context,
+  SMP_lock_Stats                   *snapshot,
+  char                             *name,
+  size_t                            name_size
+);
+
+void _SMP_lock_Stats_iteration_stop(
+  SMP_lock_Stats_iteration_context *iteration_context
+);
+
+#else /* RTEMS_PROFILING */
+
+#define _SMP_lock_Stats_initialize( stats, name ) do { } while ( 0 )
+
+#define _SMP_lock_Stats_destroy( stats ) do { } while ( 0 )
+
+#endif /* !RTEMS_PROFILING */
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* RTEMS_SMP */
+
+#endif /* _RTEMS_SCORE_SMPLOCKSTATS_H */

cpukit/score/preinstall.am

@@ -450,4 +450,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulersimplesmp.h
 $(PROJECT_INCLUDE)/rtems/score/schedulerstrongapa.h: include/rtems/score/schedulerstrongapa.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulerstrongapa.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulerstrongapa.h
+
+$(PROJECT_INCLUDE)/rtems/score/smplockstats.h: include/rtems/score/smplockstats.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smplockstats.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smplockstats.h
 endif

cpukit/score/src/profilingsmplock.c

@@ -18,8 +18,17 @@
 
 #include <rtems/score/smplock.h>
 
-#if defined( RTEMS_PROFILING )
+#include <string.h>
-SMP_lock_Stats_control _SMP_lock_Stats_control = {
+
+#if defined(RTEMS_SMP) && defined(RTEMS_PROFILING)
+
+typedef struct {
+  SMP_lock_Control Lock;
+  Chain_Control Stats_chain;
+  Chain_Control Iterator_chain;
+} SMP_lock_Stats_control;
+
+static SMP_lock_Stats_control _SMP_lock_Stats_control = {
   .Lock = {
     .Ticket_lock = {
       .next_ticket = ATOMIC_INITIALIZER_UINT( 0U ),
@@ -39,4 +48,119 @@ SMP_lock_Stats_control _SMP_lock_Stats_control = {
     _SMP_lock_Stats_control.Iterator_chain
   )
 };
-#endif /* defined( RTEMS_PROFILING ) */
+
+void _SMP_lock_Stats_destroy( SMP_lock_Stats *stats )
+{
+  if ( !_Chain_Is_node_off_chain( &stats->Node ) ) {
+    SMP_lock_Stats_control *control = &_SMP_lock_Stats_control;
+    SMP_lock_Context lock_context;
+    SMP_lock_Stats_iteration_context *iteration_context;
+    SMP_lock_Stats_iteration_context *iteration_context_tail;
+    SMP_lock_Stats *next_stats;
+
+    _SMP_lock_ISR_disable_and_acquire( &control->Lock, &lock_context );
+
+    next_stats = (SMP_lock_Stats *) _Chain_Next( &stats->Node );
+    _Chain_Extract_unprotected( &stats->Node );
+
+    iteration_context = (SMP_lock_Stats_iteration_context *)
+      _Chain_First( &control->Iterator_chain );
+    iteration_context_tail = (SMP_lock_Stats_iteration_context *)
+      _Chain_Tail( &control->Iterator_chain );
+
+    while ( iteration_context != iteration_context_tail ) {
+      if ( iteration_context->current == stats ) {
+        iteration_context->current = next_stats;
+      }
+
+      iteration_context = (SMP_lock_Stats_iteration_context *)
+        _Chain_Next( &iteration_context->Node );
+    }
+
+    _SMP_lock_Release_and_ISR_enable( &control->Lock, &lock_context );
+  }
+}
+
+void _SMP_lock_Stats_register( SMP_lock_Stats *stats )
+{
+      SMP_lock_Stats_control *control = &_SMP_lock_Stats_control;
+      SMP_lock_Context lock_context;
+
+      _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(
+  SMP_lock_Stats_iteration_context *iteration_context
+)
+{
+  SMP_lock_Stats_control *control = &_SMP_lock_Stats_control;
+  SMP_lock_Context lock_context;
+
+  _SMP_lock_ISR_disable_and_acquire( &control->Lock, &lock_context );
+
+  _Chain_Append_unprotected(
+    &control->Iterator_chain,
+    &iteration_context->Node
+  );
+  iteration_context->current =
+    (SMP_lock_Stats *) _Chain_First( &control->Stats_chain );
+
+  _SMP_lock_Release_and_ISR_enable( &control->Lock, &lock_context );
+}
+
+bool _SMP_lock_Stats_iteration_next(
+  SMP_lock_Stats_iteration_context *iteration_context,
+  SMP_lock_Stats                   *snapshot,
+  char                             *name,
+  size_t                            name_size
+)
+{
+  SMP_lock_Stats_control *control = &_SMP_lock_Stats_control;
+  SMP_lock_Context lock_context;
+  SMP_lock_Stats *current;
+  bool valid;
+
+  _SMP_lock_ISR_disable_and_acquire( &control->Lock, &lock_context );
+
+  current = iteration_context->current;
+  if ( !_Chain_Is_tail( &control->Stats_chain, &current->Node ) ) {
+    size_t name_len = current->name != NULL ? strlen(current->name) : 0;
+
+    valid = true;
+
+    iteration_context->current = (SMP_lock_Stats *)
+      _Chain_Next( &current->Node );
+
+    *snapshot = *current;
+    snapshot->name = name;
+
+    if ( name_len >= name_size ) {
+      name_len = name_size - 1;
+    }
+
+    name[name_len] = '\0';
+    memcpy(name, current->name, name_len);
+  } else {
+    valid = false;
+  }
+
+  _SMP_lock_Release_and_ISR_enable( &control->Lock, &lock_context );
+
+  return valid;
+}
+
+void _SMP_lock_Stats_iteration_stop(
+  SMP_lock_Stats_iteration_context *iteration_context
+)
+{
+  SMP_lock_Stats_control *control = &_SMP_lock_Stats_control;
+  SMP_lock_Context lock_context;
+
+  _SMP_lock_ISR_disable_and_acquire( &control->Lock, &lock_context );
+  _Chain_Extract_unprotected( &iteration_context->Node );
+  _SMP_lock_Release_and_ISR_enable( &control->Lock, &lock_context );
+}
+
+#endif /* RTEMS_SMP && RTEMS_PROFILING */