From b168d75a46747ccc64f45dc18ee02b0f6d6c1825 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 6 Oct 2008 17:17:49 -0500
Subject: [PATCH] add timespec>timestamp word

---
 basis/calendar/calendar.factor |  9 ++++++++-
 basis/structs/structs.factor   | 10 ++++++++++
 basis/unix/time/time.factor    | 12 ------------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/basis/calendar/calendar.factor b/basis/calendar/calendar.factor
index 31c835aada..8a27a46aa2 100644
--- a/basis/calendar/calendar.factor
+++ b/basis/calendar/calendar.factor
@@ -402,9 +402,16 @@ PRIVATE>
 : time-since-midnight ( timestamp -- duration )
     dup midnight time- ;
 
+: since-1970 ( time -- timestamp )
+    unix-1970 time+ >local-time ;
+
 : timeval>unix-time ( timeval -- timestamp )
     [ timeval-sec seconds ] [ timeval-usec microseconds ] bi
-    time+ unix-1970 time+ >local-time ;
+    time+ since-1970 ;
+
+: timespec>unix-time ( timeval -- timestamp )
+    [ timespec-sec seconds ] [ timespec-nsec nanoseconds ] bi
+    time+ since-1970 ;
 
 M: timestamp sleep-until timestamp>millis sleep-until ;
 
diff --git a/basis/structs/structs.factor b/basis/structs/structs.factor
index f54917dc47..51ac517af3 100644
--- a/basis/structs/structs.factor
+++ b/basis/structs/structs.factor
@@ -10,3 +10,13 @@ C-STRUCT: timeval
     "timeval" <c-object>
     [ set-timeval-usec ] keep
     [ set-timeval-sec ] keep ;
+
+C-STRUCT: timespec
+    { "time_t" "sec" }
+    { "long" "nsec" } ;
+
+: make-timespec ( ms -- timespec )
+    1000 /mod 1000000 *
+    "timespec" <c-object>
+    [ set-timespec-nsec ] keep
+    [ set-timespec-sec ] keep ;
diff --git a/basis/unix/time/time.factor b/basis/unix/time/time.factor
index 4fbb20dca0..26b42ddfe7 100644
--- a/basis/unix/time/time.factor
+++ b/basis/unix/time/time.factor
@@ -1,6 +1,4 @@
-
 USING: kernel alien.syntax alien.c-types math ;
-
 IN: unix.time
 
 TYPEDEF: uint time_t
@@ -18,16 +16,6 @@ C-STRUCT: tm
     { "long" "gmtoff" } ! Seconds: 0-59 (K&R says 0-61?)
     { "char*" "zone" } ;
 
-C-STRUCT: timespec
-    { "time_t" "sec" }
-    { "long" "nsec" } ;
-
-: make-timespec ( ms -- timespec )
-    1000 /mod 1000000 *
-    "timespec" <c-object>
-    [ set-timespec-nsec ] keep
-    [ set-timespec-sec ] keep ;
-
 FUNCTION: time_t time ( time_t* t ) ;
 FUNCTION: tm* localtime ( time_t* clock ) ;
 FUNCTION: int gettimeofday ( timespec* TP, void* TZP ) ;