Changeset ba068c0

Timestamp:

Sep 9, 2023, 2:11:23 PM (8 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

fc9f514

Parents:

5cfb8b1

Message:

rename clock routines processor and program to processor_cpu and program_cpu to deal with name clash with processor

Location:

libcfa/src

Files:

• clock.hfa (modified) (2 diffs)
• concurrency/kernel/cluster.hfa (modified) (2 diffs)

libcfa/src/clock.hfa

@@ -10 +10 @@
 // Created On       : Thu Apr 12 14:36:06 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 18 08:12:16 2021
-// Update Count     : 28
+// Last Modified On : Sat Sep  9 14:07:17 2023
+// Update Count     : 30
 //
 
@@ -91 +91 @@
         // discontinuous jumps when the OS is not running the kernal thread. A duration is returned because the value is
         // relative and cannot be converted to real-time (wall-clock) time.
-        Duration processor() {                                                          // non-monotonic duration of kernel thread
+        Duration processor_cpu() {                                                      // non-monotonic duration of kernel thread
                 timespec ts;
                 clock_gettime( CLOCK_THREAD_CPUTIME_ID, &ts );
                 return (Duration){ ts };
-        } // processor
+        } // processor_cpu
 
         // Program CPU-time watch measures CPU time consumed by all processors (kernel threads) in the UNIX process.  This
         // watch is affected by discontinuous jumps when the OS is not running the kernel threads. A duration is returned
         // because the value is relative and cannot be converted to real-time (wall-clock) time.
-        Duration program() {                                                            // non-monotonic duration of program CPU
+        Duration program_cpu() {                                                        // non-monotonic duration of program CPU
                 timespec ts;
                 clock_gettime( CLOCK_PROCESS_CPUTIME_ID, &ts );
                 return (Duration){ ts };
-        } // program
+        } // program_cpu
 
         // Monotonic duration from machine boot and including system suspension. This watch is unaffected by discontinuous

libcfa/src/concurrency/kernel/cluster.hfa

@@ -31 +31 @@
 
 // warn normally all ints
-#define warn_large_before warnf( !strict || old_avg < 33_000_000_000, "Suspiciously large previous average: %'llu (%llx), %'" PRId64 "ms \n", old_avg, old_avg, program()`ms )
-#define warn_large_after warnf( !strict || ret < 33_000_000_000, "Suspiciously large new average after %'" PRId64 "ms cputime: %'llu (%llx) from %'llu-%'llu (%'llu, %'llu) and %'llu\n", program()`ms, ret, ret, currtsc, intsc, new_val, new_val / 1000000, old_avg )
+#define warn_large_before warnf( !strict || old_avg < 33_000_000_000, "Suspiciously large previous average: %'llu (%llx), %'" PRId64 "ms \n", old_avg, old_avg, program_cpu()`ms )
+#define warn_large_after warnf( !strict || ret < 33_000_000_000, "Suspiciously large new average after %'" PRId64 "ms cputime: %'llu (%llx) from %'llu-%'llu (%'llu, %'llu) and %'llu\n", program_cpu()`ms, ret, ret, currtsc, intsc, new_val, new_val / 1000000, old_avg )
 
 // 8X linear factor is just 8 * x
@@ -42 +42 @@
 static inline __readyQ_avg_t __to_readyQ_avg(unsigned long long intsc) { if(unlikely(0 == intsc)) return 0.0; else return log2((__readyQ_avg_t)intsc); }
 
-#define warn_large_before warnf( !strict || old_avg < 35.0, "Suspiciously large previous average: %'lf, %'" PRId64 "ms \n", old_avg, program()`ms )
-#define warn_large_after warnf( !strict || ret < 35.3, "Suspiciously large new average after %'" PRId64 "ms cputime: %'lf from %'llu-%'llu (%'llu, %'llu) and %'lf\n", program()`ms, ret, currtsc, intsc, new_val, new_val / 1000000, old_avg ); \
+#define warn_large_before warnf( !strict || old_avg < 35.0, "Suspiciously large previous average: %'lf, %'" PRId64 "ms \n", old_avg, program_cpu()`ms )
+#define warn_large_after warnf( !strict || ret < 35.3, "Suspiciously large new average after %'" PRId64 "ms cputime: %'lf from %'llu-%'llu (%'llu, %'llu) and %'lf\n", program_cpu()`ms, ret, currtsc, intsc, new_val, new_val / 1000000, old_avg ); \
 verify(ret >= 0)