Changeset 4834563

Timestamp:

Jan 6, 2020, 2:13:42 PM (5 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:

90cb6f7

Parents:

e0c235c

Message:

refactor clock out of time because time.hfa too large for 32-bit build

Location:

libcfa/src

Files:

• clock.hfa (added)
• startup.cfa (modified) (2 diffs)
• time.hfa (modified) (2 diffs)

libcfa/src/startup.cfa

@@ -10 +10 @@
 // Created On       : Tue Jul 24 16:21:57 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Nov 30 07:07:56 2019
-// Update Count     : 13
+// Last Modified On : Fri Dec 13 13:16:45 2019
+// Update Count     : 29
 //
 
+#include <time.h>                                                                               // tzset
 #include "startup.hfa"
-#include <time.h>                                                                               // tzset
 
 extern "C" {
-    static void __cfaabi_appready_startup( void ) __attribute__(( constructor( STARTUP_PRIORITY_APPREADY ) ));
+    void __cfaabi_appready_startup( void ) __attribute__(( constructor( STARTUP_PRIORITY_APPREADY ) ));
     void __cfaabi_appready_startup( void ) {
                 tzset();                                                                                // initialize time global variables
@@ -27 +27 @@
     } // __cfaabi_appready_startup
 
-    static void __cfaabi_appready_shutdown( void ) __attribute__(( destructor( STARTUP_PRIORITY_APPREADY ) ));
+    void __cfaabi_appready_shutdown( void ) __attribute__(( destructor( STARTUP_PRIORITY_APPREADY ) ));
     void __cfaabi_appready_shutdown( void ) {
                 #ifdef __CFA_DEBUG__

libcfa/src/time.hfa

@@ -10 +10 @@
 // Created On       : Wed Mar 14 23:18:57 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan  5 19:01:07 2020
-// Update Count     : 652
+// Last Modified On : Mon Jan  6 12:50:16 2020
+// Update Count     : 653
 //
 
@@ -207 +207 @@
 } // ?{}
 
-//######################### C time #########################
-
-static inline char * ctime( time_t tp ) { char * buf = ctime( &tp ); buf[24] = '\0'; return buf; }
-static inline char * ctime_r( time_t tp, char * buf ) { ctime_r( &tp, buf ); buf[24] = '\0'; return buf; }
-static inline tm * gmtime( time_t tp ) { return gmtime( &tp ); }
-static inline tm * gmtime_r( time_t tp, tm * result ) { return gmtime_r( &tp, result ); }
-static inline tm * localtime( time_t tp ) { return localtime( &tp ); }
-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
-};
-
-static inline {
-        void resetClock( Clock & clk, Duration adj ) with( clk ) {
-                offset = adj + __timezone`s;                                    // timezone (global) is (UTC - local time) in seconds
-        } // resetClock
-
-        void ?{}( Clock & clk, Duration adj ) { resetClock( clk, adj ); }
-
-        Duration getResNsec() {
-                struct timespec res;
-                clock_getres( CLOCK_REALTIME, &res );
-                return ((int64_t)res.tv_sec * TIMEGRAN + res.tv_nsec)`ns;
-        } // getRes
-
-        Duration getRes() {
-                struct timespec res;
-                clock_getres( CLOCK_REALTIME_COARSE, &res );
-                return ((int64_t)res.tv_sec * TIMEGRAN + res.tv_nsec)`ns;
-        } // getRes
-
-        Time getTimeNsec() {                                                            // with nanoseconds
-                timespec curr;
-                clock_gettime( CLOCK_REALTIME, &curr );
-                return (Time){ curr };
-        } // getTimeNsec
-
-        Time getTime() {                                                                        // without nanoseconds
-                timespec curr;
-                clock_gettime( CLOCK_REALTIME_COARSE, &curr );
-                curr.tv_nsec = 0;
-                return (Time){ curr };
-        } // getTime
-
-        Time getTime( Clock & clk ) with( clk ) {
-                return getTime() + offset;
-        } // getTime
-
-        Time ?()( Clock & clk ) with( clk ) {                           // alternative syntax
-                return getTime() + offset;
-        } // getTime
-
-        timeval getTime( Clock & clk ) {
-                return (timeval){ clk() };
-        } // getTime
-
-        tm getTime( Clock & clk ) with( clk ) {
-                tm ret;
-                localtime_r( getTime( clk ).tv_sec, &ret );
-                return ret;
-        } // getTime
-
-        Time getCPUTime() {
-                timespec ts;
-                clock_gettime( CLOCK_THREAD_CPUTIME_ID, &ts );
-                return (Time){ ts };
-    } // getCPUTime
-} // distribution
-
 // Local Variables: //
 // mode: c //