Changeset 3d5701e for libcfa/src/clock.hfa

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolve conflict

File:

• libcfa/src/clock.hfa (modified) (3 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 : Thu Jun 13 21:21:13 2019
-// Update Count     : 8
+// Last Modified On : Mon Jan  6 12:49:58 2020
+// Update Count     : 9
 //
 
 #include <time.hfa>
-
 
 //######################### C time #########################
@@ -26 +25 @@
 static inline tm * localtime_r( time_t tp, tm * result ) { return localtime_r( &tp, result ); }
 
-
 //######################### Clock #########################
 
 struct Clock {                                                                                  // private
         Duration offset;                                                                        // for virtual clock: contains offset from real-time
-        int clocktype;                                                                          // implementation only -1 (virtual), CLOCK_REALTIME
 };
 
 static inline {
-        void resetClock( Clock & clk ) with( clk ) {
-                clocktype = CLOCK_REALTIME_COARSE;
-        } // Clock::resetClock
-
         void resetClock( Clock & clk, Duration adj ) with( clk ) {
-                clocktype = -1;
                 offset = adj + __timezone`s;                                    // timezone (global) is (UTC - local time) in seconds
         } // resetClock
 
-        void ?{}( Clock & clk ) { resetClock( clk ); }
         void ?{}( Clock & clk, Duration adj ) { resetClock( clk, adj ); }
 
@@ -89 +80 @@
                 return ret;
         } // getTime
+
+        Time getCPUTime() {
+                timespec ts;
+                clock_gettime( CLOCK_THREAD_CPUTIME_ID, &ts );
+                return (Time){ ts };
+    } // getCPUTime
 } // distribution