1 files changed, 45 insertions, 18 deletions

diff --git a/cpukit/score/src/threadgetcputimeused.c b/cpukit/score/src/threadgetcputimeused.c
index 7406da0bf3..82ad7a3043 100644
--- a/cpukit/score/src/threadgetcputimeused.c
+++ b/cpukit/score/src/threadgetcputimeused.c
@@ -1,24 +1,37 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /**
  * @file
  *
  * @ingroup RTEMSScoreThread
  *
  * @brief This source file contains the implementation of
- *   _Thread_Get_CPU_time_used().
+ *   _Thread_Get_CPU_time_used() and _Thread_Get_CPU_time_used_locked().
  */
 
 /*
- * Copyright (c) 2016 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2016 embedded brains GmbH & Co. KG
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems@embedded-brains.de>
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- * 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.
+ * 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.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -37,25 +50,39 @@ static bool _Thread_Is_scheduled( const Thread_Control *the_thread )
 #endif
 }
 
-void _Thread_Get_CPU_time_used(
-  Thread_Control    *the_thread,
-  Timestamp_Control *cpu_time_used
+Timestamp_Control _Thread_Get_CPU_time_used_locked(
+  Thread_Control *the_thread
 )
 {
+  _Assert( _Thread_State_is_owner( the_thread ) );
+  _Assert(
+    _ISR_lock_Is_owner(
+      &_Scheduler_Get_context( _Thread_Scheduler_get_home( the_thread ) )->Lock
+    )
+  );
+
+  if ( _Thread_Is_scheduled( the_thread ) ) {
+    _Thread_Update_CPU_time_used( the_thread, _Thread_Get_CPU( the_thread ) );
+  }
+
+  return the_thread->cpu_time_used;
+}
+
+Timestamp_Control _Thread_Get_CPU_time_used( Thread_Control *the_thread )
+{
   const Scheduler_Control *scheduler;
   ISR_lock_Context         state_lock_context;
   ISR_lock_Context         scheduler_lock_context;
+  Timestamp_Control        cpu_time_used;
 
   _Thread_State_acquire( the_thread, &state_lock_context );
   scheduler = _Thread_Scheduler_get_home( the_thread );
   _Scheduler_Acquire_critical( scheduler, &scheduler_lock_context );
 
-  if ( _Thread_Is_scheduled( the_thread ) ) {
-    _Thread_Update_CPU_time_used( the_thread, _Thread_Get_CPU( the_thread ) );
-  }
-
-  *cpu_time_used = the_thread->cpu_time_used;
+  cpu_time_used = _Thread_Get_CPU_time_used_locked( the_thread );
 
   _Scheduler_Release_critical( scheduler, &scheduler_lock_context );
   _Thread_State_release( the_thread, &state_lock_context );
+
+  return cpu_time_used;
 }