diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-15 09:14:09 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-15 09:14:09 +0000 |
| commit | 37a4aa21c56148e80442b262b3a394fadcedd0dc (patch) | |
| tree | 2603a4f1346f664bf7908df25ea51aed8d3ba834 | |
| parent | e72f22f530e202f9e10e23a4c2355e5ea16cdb16 (diff) | |
| download | ruby-37a4aa21c56148e80442b262b3a394fadcedd0dc.tar.gz ruby-37a4aa21c56148e80442b262b3a394fadcedd0dc.tar.xz ruby-37a4aa21c56148e80442b262b3a394fadcedd0dc.zip | |
* thread_win32.c (ubf_handle): cancel blocking IO if it can (only
Vista). see [ruby-dev:35446]
* win32/win32.c (errmap): add ERROR_OPERATION_ABORTED as EINTR.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | thread_win32.c | 11 | ||||
| -rw-r--r-- | win32/win32.c | 1 |
3 files changed, 19 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Tue Jul 15 18:12:02 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * thread_win32.c (ubf_handle): cancel blocking IO if it can (only + Vista). see [ruby-dev:35446] + + * win32/win32.c (errmap): add ERROR_OPERATION_ABORTED as EINTR. + Mon Jul 14 20:35:21 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp> * test/win32ole/test_win32ole_event.rb (teardown): fix typo. diff --git a/thread_win32.c b/thread_win32.c index a810fb362..7c31a3f70 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -532,8 +532,19 @@ native_thread_apply_priority(rb_thread_t *th) static void ubf_handle(void *ptr) { + static int checked = 0; + typedef BOOL (WINAPI *cancel_io_func_t)(HANDLE); + static cancel_io_func_t cancel_func = NULL; rb_thread_t *th = (rb_thread_t *)ptr; thread_debug("ubf_handle: %p\n", th); + + if (!checked) { + cancel_func = (cancel_io_func_t)GetProcAddress(GetModuleHandle("kernel32"), "CancelSynchronousIo"); + checked = 1; + } + if (cancel_func) + cancel_func((HANDLE)th->thread_id); + w32_set_event(th->native_thread_data.interrupt_event); } diff --git a/win32/win32.c b/win32/win32.c index 11774cda1..b1e461649 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -164,6 +164,7 @@ static struct { { ERROR_PIPE_BUSY, EAGAIN }, { ERROR_NO_DATA, EPIPE }, { ERROR_PIPE_NOT_CONNECTED, EPIPE }, + { ERROR_OPERATION_ABORTED, EINTR }, { ERROR_NOT_ENOUGH_QUOTA, ENOMEM }, { WSAENAMETOOLONG, ENAMETOOLONG }, { WSAENOTEMPTY, ENOTEMPTY }, |