From 511ad6d9f3de0efe0f0488486ccbd5ccb4b89d7f Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Wed, 15 Aug 2012 08:29:00 -0700 Subject: [PATCH] calendar.unix: inline some things. --- basis/calendar/unix/unix.factor | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/basis/calendar/unix/unix.factor b/basis/calendar/unix/unix.factor index c02f836da8..f106f8810e 100644 --- a/basis/calendar/unix/unix.factor +++ b/basis/calendar/unix/unix.factor @@ -7,23 +7,26 @@ IN: calendar.unix : timeval>seconds ( timeval -- seconds ) [ sec>> ] [ usec>> 1,000,000 / ] bi + ; inline +: timeval>micros ( timeval -- micros ) + [ sec>> 1,000,000 * ] [ usec>> ] bi + ; inline + : timeval>duration ( timeval -- duration ) - timeval>seconds seconds ; + timeval>seconds seconds ; inline : timeval>unix-time ( timeval -- timestamp ) - [ unix-1970 ] dip timeval>seconds +second ; + [ unix-1970 ] dip timeval>seconds +second ; inline : timespec>seconds ( timespec -- seconds ) [ sec>> ] [ nsec>> 1,000,000,000 / ] bi + ; inline : timespec>duration ( timespec -- duration ) - timespec>seconds seconds ; + timespec>seconds seconds ; inline : timespec>unix-time ( timespec -- timestamp ) - [ unix-1970 ] dip timespec>seconds +second ; + [ unix-1970 ] dip timespec>seconds +second ; inline : get-time ( -- alien ) - f time time_t localtime ; + f time time_t localtime ; inline : timezone-name ( -- string ) get-time zone>> ; @@ -32,11 +35,10 @@ M: unix gmt-offset ( -- hours minutes seconds ) get-time gmtoff>> 3600 /mod 60 /mod ; : current-timeval ( -- timeval ) - timeval f [ gettimeofday io-error ] 2keep drop ; + timeval f [ gettimeofday io-error ] 2keep drop ; inline : system-micros ( -- n ) - current-timeval - [ sec>> 1,000,000 * ] [ usec>> ] bi + ; + current-timeval timeval>micros ; M: unix gmt current-timeval timeval>unix-time ;