ruby-changes:30776
From: nobu <ko1@a...>
Date: Fri, 6 Sep 2013 14:23:36 +0900 (JST)
Subject: [ruby-changes:30776] nobu:r42855 (trunk): win32.c: clock_getres
nobu 2013-09-06 14:23:28 +0900 (Fri, 06 Sep 2013) New Revision: 42855 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42855 Log: win32.c: clock_getres * win32/win32.c (clock_getres): required as well as clock_gettime(). [ruby-dev:47699] [Bug #8869] Modified files: trunk/ChangeLog trunk/include/ruby/win32.h trunk/win32/Makefile.sub trunk/win32/win32.c Index: include/ruby/win32.h =================================================================== --- include/ruby/win32.h (revision 42854) +++ include/ruby/win32.h (revision 42855) @@ -317,6 +317,7 @@ extern int link(const char *, const char https://github.com/ruby/ruby/blob/trunk/include/ruby/win32.h#L317 extern int rb_w32_ulink(const char *, const char *); extern int gettimeofday(struct timeval *, struct timezone *); extern int clock_gettime(clockid_t, struct timespec *); +extern int clock_getres(clockid_t, struct timespec *); extern rb_pid_t waitpid (rb_pid_t, int *, int); extern rb_pid_t rb_w32_spawn(int, const char *, const char*); extern rb_pid_t rb_w32_aspawn(int, const char *, char *const *); Index: ChangeLog =================================================================== --- ChangeLog (revision 42854) +++ ChangeLog (revision 42855) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Fri Sep 6 14:23:22 2013 Nobuyoshi Nakada <nobu@r...> + + * win32/win32.c (clock_getres): required as well as clock_gettime(). + [ruby-dev:47699] [Bug #8869] + Fri Sep 6 11:45:27 2013 Nobuyoshi Nakada <nobu@r...> * transcode.c (rb_econv_append): new function to append a string data Index: win32/win32.c =================================================================== --- win32/win32.c (revision 42854) +++ win32/win32.c (revision 42855) @@ -4346,6 +4346,35 @@ clock_gettime(clockid_t clock_id, struct https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L4346 } /* License: Ruby's */ +int +clock_getres(clockid_t clock_id, struct timespec *sp) +{ + switch (clock_id) { + case CLOCK_REALTIME: + { + sp->tv_sec = 0; + sp->tv_nsec = 1000; + return 0; + } + case CLOCK_MONOTONIC: + { + LARGE_INTEGER freq; + LARGE_INTEGER count; + if (!QueryPerformanceFrequency(&freq)) { + errno = map_errno(GetLastError()); + return -1; + } + sp->tv_sec = 0; + sp->tv_nsec = (long)(1000000000.0 / freq.QuadPart); + return 0; + } + default: + errno = EINVAL; + return -1; + } +} + +/* License: Ruby's */ char * rb_w32_getcwd(char *buffer, int size) { Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 42854) +++ win32/Makefile.sub (revision 42855) @@ -642,6 +642,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/ https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L642 #define HAVE_MEMMOVE 1 #define HAVE_MKDIR 1 #define HAVE_CLOCK_GETTIME 1 +#define HAVE_CLOCK_GETRES 1 #define HAVE_SPAWNV 1 #define HAVE_STRCASECMP 1 #define HAVE_STRNCASECMP 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/