diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/socket/ancdata.c | 60 | ||||
| -rw-r--r-- | test/socket/test_socket.rb | 4 |
3 files changed, 68 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Tue Feb 24 19:45:15 2009 Tanaka Akira <akr@fsij.org> + + * ext/socket/ancdata.c (ancillary_timestamp): new method. + Tue Feb 24 19:01:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * common.mk (main): split from exts and makes main program after diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 9ecca28b9e..0761db6787 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -202,6 +202,65 @@ ancillary_unix_rights(VALUE self) /* * call-seq: + * ancillarydata.timestamp => time + * + * returns the timestamp as a time object. + * + * _ancillarydata_ should be one of following type: + * - SOL_SOCKET/SCM_TIMESTAMP (micro second) GNU/Linux, FreeBSD, NetBSD, OpenBSD, Solaris, MacOS X + * - SOL_SOCKET/SCM_TIMESTAMPNS (nano second) GNU/Linux + * + * Addrinfo.udp("127.0.0.1", 0).bind {|s1| + * Addrinfo.udp("127.0.0.1", 0).bind {|s2| + * s1.setsockopt(:SOCKET, :TIMESTAMP, true) + * s2.send "a", 0, s1.local_address + * ctl = s1.recvmsg.last + * p ctl #=> #<Socket::AncillaryData: INET SOCKET TIMESTAMP 2009-02-24 17:35:46.775581> + * t = ctl.timestamp + * p t #=> 2009-02-24 17:35:46 +0900 + * p t.usec #=> 775581 + * p t.nsec #=> 775581000 + * } + * } + * + */ +static VALUE +ancillary_timestamp(VALUE self) +{ + int level, type; + VALUE data; + VALUE result = Qnil; + + level = ancillary_level(self); + type = ancillary_type(self); + data = ancillary_data(self); + +#ifdef SCM_TIMESTAMP + if (level == SOL_SOCKET && type == SCM_TIMESTAMP && + RSTRING_LEN(data) == sizeof(struct timeval)) { + struct timeval tv; + memcpy((char*)&tv, RSTRING_PTR(data), sizeof(tv)); + result = rb_time_new(tv.tv_sec, tv.tv_usec); + } +#endif + +#ifdef SCM_TIMESTAMPNS + if (level == SOL_SOCKET && type == SCM_TIMESTAMPNS && + RSTRING_LEN(data) == sizeof(struct timespec)) { + struct timespec ts; + memcpy((char*)&ts, RSTRING_PTR(data), sizeof(ts)); + result = rb_time_nano_new(ts.tv_sec, ts.tv_nsec); + } +#endif + + if (result == Qnil) + rb_raise(rb_eTypeError, "timestamp ancillary data expected"); + + return result; +} + +/* + * call-seq: * Socket::AncillaryData.int(family, cmsg_level, cmsg_type, integer) => ancillarydata * * Creates a new Socket::AncillaryData object which contains a int as data. @@ -1597,6 +1656,7 @@ Init_ancdata(void) rb_define_method(rb_cAncillaryData, "type", ancillary_type_m, 0); rb_define_method(rb_cAncillaryData, "data", ancillary_data, 0); rb_define_method(rb_cAncillaryData, "unix_rights", ancillary_unix_rights, 0); + rb_define_method(rb_cAncillaryData, "timestamp", ancillary_timestamp, 0); rb_define_method(rb_cAncillaryData, "cmsg_is?", ancillary_cmsg_is_p, 2); rb_define_singleton_method(rb_cAncillaryData, "int", ancillary_s_int, 4); rb_define_method(rb_cAncillaryData, "int", ancillary_int, 0); diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index 82389864a5..e8b8959b41 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -289,6 +289,8 @@ class TestSocket < Test::Unit::TestCase t2 = Time.now.strftime("%Y-%m-%d") pat = Regexp.union([t1, t2].uniq) assert_match(pat, stamp.inspect) + pat = /\.#{"%06d" % stamp.timestamp.usec}/ + assert_match(pat, stamp.inspect) end def test_timestampns @@ -312,6 +314,8 @@ class TestSocket < Test::Unit::TestCase t2 = Time.now.strftime("%Y-%m-%d") pat = Regexp.union([t1, t2].uniq) assert_match(pat, stamp.inspect) + pat = /\.#{"%09d" % stamp.timestamp.nsec}/ + assert_match(pat, stamp.inspect) end def test_bintime |