diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-09 12:33:36 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-09 12:33:36 +0000 |
commit | 888e5cbbe7398aa814f5a0208a0fd30cfe337f3b (patch) | |
tree | a11856e6a49e1ce090bf243437495c5f19c2869e | |
parent | a71ee2ce41e7f698cdc01d59816de6fe24775850 (diff) | |
download | ruby-888e5cbbe7398aa814f5a0208a0fd30cfe337f3b.tar.gz |
* process.c: Remove spaces between SI prefix and unit to follow
SI brochure.
http://www.bipm.org/en/si/si_brochure/
https://www.nmij.jp/library/units/si/
* time.c: Ditto.
* ext/socket/ancdata.c: Ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ext/socket/ancdata.c | 4 | ||||
-rw-r--r-- | process.c | 12 | ||||
-rw-r--r-- | time.c | 16 |
4 files changed, 27 insertions, 16 deletions
@@ -1,3 +1,14 @@ +Mon Sep 9 21:31:45 2013 Tanaka Akira <akr@fsij.org> + + * process.c: Remove spaces between SI prefix and unit to follow + SI brochure. + http://www.bipm.org/en/si/si_brochure/ + https://www.nmij.jp/library/units/si/ + + * time.c: Ditto. + + * ext/socket/ancdata.c: Ditto. + Mon Sep 9 16:55:59 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_method.c (rb_add_refined_method_entry): clear cache in the diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 144c2bf162..9a68a0c289 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -276,8 +276,8 @@ ancillary_unix_rights(VALUE self) * 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 + * - SOL_SOCKET/SCM_TIMESTAMP (microsecond) GNU/Linux, FreeBSD, NetBSD, OpenBSD, Solaris, MacOS X + * - SOL_SOCKET/SCM_TIMESTAMPNS (nanosecond) GNU/Linux * - SOL_SOCKET/SCM_BINTIME (2**(-64) second) FreeBSD * * Addrinfo.udp("127.0.0.1", 0).bind {|s1| @@ -6917,7 +6917,7 @@ get_mach_timebase_info(void) * [:GETTIMEOFDAY_BASED_CLOCK_REALTIME] * Use gettimeofday() defined by SUS. * (SUSv4 obsoleted it, though.) - * The resolution is 1 micro second. + * The resolution is 1 microsecond. * [:TIME_BASED_CLOCK_REALTIME] * Use time() defined by ISO C. * The resolution is 1 second. @@ -6935,7 +6935,7 @@ get_mach_timebase_info(void) * The resolution is the clock tick. * "getconf CLK_TCK" command shows the clock ticks per second. * (The clock ticks per second is defined by HZ macro in older systems.) - * If it is 100 and clock_t is 32 bits integer type, the resolution is 10 milli second and + * If it is 100 and clock_t is 32 bits integer type, the resolution is 10 millisecond and * cannot represent over 497 days. * * Emulations for +CLOCK_PROCESS_CPUTIME_ID+: @@ -6944,7 +6944,7 @@ get_mach_timebase_info(void) * getrusage() is used with RUSAGE_SELF to obtain the time only for * the calling process (excluding the time for child processes). * The result is addition of user time (ru_utime) and system time (ru_stime). - * The resolution is 1 micro second. + * The resolution is 1 microsecond. * [:TIMES_BASED_CLOCK_PROCESS_CPUTIME_ID] * Use times() defined by POSIX. * The result is addition of user time (tms_utime) and system time (tms_stime). @@ -6952,14 +6952,14 @@ get_mach_timebase_info(void) * The resolution is the clock tick. * "getconf CLK_TCK" command shows the clock ticks per second. * (The clock ticks per second is defined by HZ macro in older systems.) - * If it is 100, the resolution is 10 milli second. + * If it is 100, the resolution is 10 millisecond. * [:CLOCK_BASED_CLOCK_PROCESS_CPUTIME_ID] * Use clock() defined by ISO C. * The resolution is 1/CLOCKS_PER_SEC. * CLOCKS_PER_SEC is the C-level macro defined by time.h. * SUS defines CLOCKS_PER_SEC is 1000000. * Non-Unix systems may define it a different value, though. - * If CLOCKS_PER_SEC is 1000000 as SUS, the resolution is 1 micro second. + * If CLOCKS_PER_SEC is 1000000 as SUS, the resolution is 1 microsecond. * If CLOCKS_PER_SEC is 1000000 and clock_t is 32 bits integer type, it cannot represent over 72 minutes. * * If the given +clock_id+ is not supported, Errno::EINVAL is raised. @@ -7157,7 +7157,7 @@ rb_clock_gettime(int argc, VALUE *argv) * +clock_id+ can be a symbol as +Process.clock_gettime+. * However the result may not be accurate. * For example, +Process.clock_getres(:GETTIMEOFDAY_BASED_CLOCK_REALTIME)+ - * returns 1.0e-06 which means 1 micro second, but actual resolution can be more coarse. + * returns 1.0e-06 which means 1 microsecond, but actual resolution can be more coarse. * * If the given +clock_id+ is not supported, Errno::EINVAL is raised. * @@ -4399,14 +4399,14 @@ strftimev(const char *fmt, VALUE time, rb_encoding *enc) * %L - Millisecond of the second (000..999) * The digits under millisecond are truncated to not produce 1000. * %N - Fractional seconds digits, default is 9 digits (nanosecond) - * %3N milli second (3 digits) - * %6N micro second (6 digits) - * %9N nano second (9 digits) - * %12N pico second (12 digits) - * %15N femto second (15 digits) - * %18N atto second (18 digits) - * %21N zepto second (21 digits) - * %24N yocto second (24 digits) + * %3N millisecond (3 digits) + * %6N microsecond (6 digits) + * %9N nanosecond (9 digits) + * %12N picosecond (12 digits) + * %15N femtosecond (15 digits) + * %18N attosecond (18 digits) + * %21N zeptosecond (21 digits) + * %24N yoctosecond (24 digits) * The digits under the specified length are truncated to avoid * carry up. * |