* configure.in: check struct timespec, clock_gettime, utimensat,

  struct stat.st_atim,
  struct stat.st_atimespec,
  struct stat.st_atimensec,
  struct stat.st_mtim,
  struct stat.st_mtimespec,
  struct stat.st_mtimensec,
  struct stat.st_ctim,
  struct stat.st_ctimespec,
  struct stat.st_ctimensec.

* include/ruby/missing.h: provide struct timespec if not available.

* time.c: support nanosecond-resolution using struct timespec.

* include/ruby/intern.h: provide rb_time_nano_new.

* file.c (utime_internal): use utimensat if available.
  (rb_file_s_utime): refactored.
  (rb_f_test): use stat_atime, stat_mtime, stat_ctime.
  (rb_stat_cmp): check tv_nsec.
  (stat_atimespec): new function.
  (stat_atime): ditto.
  (stat_mtimespec): ditto.
  (stat_mtime): ditto.
  (stat_ctimespec): ditto.
  (stat_ctime): ditto.
  (rb_stat_atime): use stat_atime.
  (rb_file_s_atime): ditto.
  (rb_file_atime): ditto.
  (rb_stat_mtime): use stat_mtime.
  (rb_file_s_mtime): ditto.
  (rb_file_mtime): ditto.
  (rb_file_ctime): use stat_ctime.
  (rb_file_s_ctime): ditto.
  (rb_stat_ctime): ditto.

* variable.c (rb_copy_generic_ivar): clear clone's instance variables
  if obj has no instance variable.

* marshal.c (w_object): dump instance variables of generated string
  for TYPE_USERDEF, even if original object has instance variables.

* lib/time.rb (Time#xmlschema): use nsec instead of usec.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 65 insertions, 1 deletions

diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index db922e1177..92c62ef5e9 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'rational'
 
 class TestTime < Test::Unit::TestCase
   def test_time_add()
@@ -81,4 +82,67 @@ class TestTime < Test::Unit::TestCase
     end
     assert_equal(1.0, bigtime1 - bigtime0)
   end
+
+  def test_at
+    assert_equal(100000, Time.at(0.1).usec)
+    assert_equal(10000, Time.at(0.01).usec)
+    assert_equal(1000, Time.at(0.001).usec)
+    assert_equal(100, Time.at(0.0001).usec)
+    assert_equal(10, Time.at(0.00001).usec)
+    assert_equal(1, Time.at(0.000001).usec)
+    assert_equal(100000000, Time.at(0.1).nsec)
+    assert_equal(10000000, Time.at(0.01).nsec)
+    assert_equal(1000000, Time.at(0.001).nsec)
+    assert_equal(100000, Time.at(0.0001).nsec)
+    assert_equal(10000, Time.at(0.00001).nsec)
+    assert_equal(1000, Time.at(0.000001).nsec)
+    assert_equal(100, Time.at(0.0000001).nsec)
+    assert_equal(10, Time.at(0.00000001).nsec)
+    assert_equal(1, Time.at(0.000000001).nsec)
+  end
+
+  def test_at2
+    assert_equal(100, Time.at(0, 0.1).nsec)
+    assert_equal(10, Time.at(0, 0.01).nsec)
+    assert_equal(1, Time.at(0, 0.001).nsec)
+  end
+
+  def test_at_rational
+    assert_equal(1, Time.at(Rational(1,1) / 1000000000).nsec)
+    assert_equal(1, Time.at(1167609600 + Rational(1,1) / 1000000000).nsec)
+  end
+
+  def test_utc_subsecond
+    assert_equal(100000, Time.utc(2007,1,1,0,0,1.1).usec)
+    assert_equal(100000, Time.utc(2007,1,1,0,0,Rational(11,10)).usec)
+  end
+
+  def test_eq_nsec
+    assert_equal(Time.at(0, 0.123), Time.at(0, 0.123))
+    assert_not_equal(Time.at(0, 0.123), Time.at(0, 0.124))
+  end
+
+  def assert_marshal_roundtrip(t)
+    iv_names = t.instance_variables
+    iv_vals1 = iv_names.map {|n| t.instance_variable_get n }
+    m = Marshal.dump(t)
+    t2 = Marshal.load(m)
+    iv_vals2 = iv_names.map {|n| t2.instance_variable_get n }
+    assert_equal(t, t2)
+    assert_equal(iv_vals1, iv_vals2)
+    t2
+  end
+
+  def test_marshal_nsec
+    assert_marshal_roundtrip(Time.at(0, 0.123))
+    assert_marshal_roundtrip(Time.at(0, 0.120))
+  end
+
+  def test_marshal_ivar
+    t = Time.at(123456789, 987654.321)
+    t.instance_eval { @var = 135 }
+    assert_marshal_roundtrip(t)
+    assert_marshal_roundtrip(Marshal.load(Marshal.dump(t)))
+  end
+
 end
diff --git a/test/yaml/test_yaml.rb b/test/yaml/test_yaml.rb
index ce367713f2..77602c1123 100644
--- a/test/yaml/test_yaml.rb
+++ b/test/yaml/test_yaml.rb
@@ -54,7 +54,7 @@ class YAML_Unit_Tests < Test::Unit::TestCase
 			hour = zone[0,3].to_i * 3600
 			min = zone[3,2].to_i * 60
 			ofs = (hour + min)
-			val = Time.at( val.to_f - ofs )
+			val = Time.at( val.tv_sec - ofs, val.tv_nsec / 1000.0 )
 		end
 		return val
 	end