timestamp 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad73a196958d666f5bab820ab2079d733273915
-  data.tar.gz: 8802615c4538ae3fac8a6552449e160db3a23728
+  metadata.gz: bc008a9363a9c26447094ca046df57a8b852fdbd
+  data.tar.gz: 281dafc2af4e211c9b62a448e54f6d0978185001
 SHA512:
-  metadata.gz: a4582283b0d921b1942b029637d618c0b22c0a8e1a008a587b23d8bdbb32af34f6366dad9d1fcfe69bbfc6c1e8e967b7f2bdf38cdd3264aefb29b9abdcd4963d
-  data.tar.gz: 497584ec3c6169d9640610969ed1f96a8921ecfaf1653c0b443a195191e885ba0cd096c2233c642c17ea445a0b5e0e91ef2d8c5de629aa3681c51afdbd2dad45
+  metadata.gz: fc93f38b4f32bdc2499156ec830ae1c40f620641634e11a4b96aa72f0657ef9b6566b8ab384333e2a5d37b5a8906902e93a688a605730d00498a139daffa63f3
+  data.tar.gz: a2d3d8aaf764f80d7b2198f55a21558a912ece7190a2240c3fd9f5f9ecfcf0762227d58fdefd9660e22b20c815d2ef7e71ea19d5f7eda60b9ab562bec1d42b53

data/ext/timestamp/Timestamp.c

@@ -1,49 +1,116 @@
+/*
+ * Copyright (c) 2013, Matthew Kerwin
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "ruby.h"
 #include <time.h>
 
+#if defined(HAVE_SYS_TIME_H)
+#include <sys/time.h>
+#endif
+
 /*
  *  call-seq:
- *     Time.current_timestamp -> int
- *     Time.timestamp         -> int
+ *     Time.timestamp  -> int
+ * 
+ * Returns a nanosecond timestamp on the system's monotonic clock.
+ *
+ *     Time.timestamp  #=> 17817203921822
+ */
+
+static VALUE
+time_s_timestamp(VALUE klass)
+{
+    VALUE t;
+
+#ifdef HAVE_CLOCK_GETTIME
+    struct timespec ts;
+    if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1) {
+	rb_sys_fail("clock_gettime");
+    }
+    t = rb_uint2big(ts.tv_sec*1000000000 + ts.tv_nsec);
+#else
+    struct timeval tv;
+    if (gettimeofday(&tv, 0) < 0) {
+	rb_sys_fail("gettimeofday");
+    }
+    t = rb_uint2big(tv.tv_sec*1000000000 + tv.tv_usec*1000);
+#endif
+
+    return t;
+}
+
+/*
+ *  call-seq:
+ *     Time.unix_timestamp  -> int
  *
  *  Returns the current time as an integer number of seconds
  *  since the Epoch.
  *
- *     Time.current_timestamp  #=> 1363352771
- *     Time.timestamp          #=> 1363352771
+ *     Time.unix_timestamp  #=> 1363352771
  */
 
 static VALUE
-time_s_current_timestamp(VALUE klass)
+time_s_unix_timestamp(VALUE klass)
 {
     return INT2NUM( time(NULL) );
 }
 
 /*
  *  call-seq:
- *     Time.microtime  -> float
+ *     Time.unix_microtime  -> float
  *
  *  Returns the current time as a floating-point number of seconds
  *  since the Epoch.
  *
- *     Time.microtime  #=> 1363352771.315240
+ *     Time.unix_microtime  #=> 1363352771.315240
  */
 
 static VALUE
-time_s_microtime(VALUE klass)
+time_s_unix_microtime(VALUE klass)
 {
-    struct timeval tv;
     double t;
+#ifdef HAVE_CLOCK_GETTIME
+    struct timespec ts;
+    if (clock_gettime(CLOCK_REALTIME, &ts) == -1) {
+	rb_sys_fail("clock_gettime");
+    }
+    t = (double)ts.tv_sec;
+    t += ((double)ts.tv_nsec / 1000000000.0);
+#else
+    struct timeval tv;
     if (gettimeofday(&tv, 0) < 0) {
-        rb_sys_fail("gettimeofday");
+	rb_sys_fail("gettimeofday");
     }
     t = (double)tv.tv_sec;
     t += ((double)tv.tv_usec / 1000000.0);
+#endif
     return rb_float_new(t);
 }
 
 void Init_timestamp() {
-    rb_define_singleton_method(rb_cTime, "current_timestamp", time_s_current_timestamp, 0);
-    rb_define_singleton_method(rb_cTime, "timestamp", time_s_current_timestamp, 0);
-    rb_define_singleton_method(rb_cTime, "microtime", time_s_microtime, 0);
+    rb_define_singleton_method(rb_cTime, "timestamp", time_s_timestamp, 0);
+    rb_define_singleton_method(rb_cTime, "unix_timestamp", time_s_unix_timestamp, 0);
+    rb_define_singleton_method(rb_cTime, "unix_microtime", time_s_unix_microtime, 0);
 }

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: timestamp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies: []
-description: Defines Time.current_timestamp , from https://bugs.ruby-lang.org/issues/8096
+description: Defines Time.timestamp and .unix_timestamp , from https://bugs.ruby-lang.org/issues/8096
 email:
 - matthew@kerwin.net.au
 executables: []
@@ -43,5 +43,5 @@ rubyforge_project:
 rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
-summary: Time.current_timestamp
+summary: Time.timestamp
 test_files: []