From 7ea35afa1dc69c240202ef7b10f8f7c7f39807c1 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 10:49:57 +0000 Subject: merge revision(s) 15546: * ext/readline/readline.c (readline_event): prevent polling. based on a patch from error errorsson in [ruby-Bugs-17675]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/readline/readline.c | 19 +++++++++++++++++-- version.h | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e04d91ee4..88337b4466 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 15 19:49:10 2008 Nobuyoshi Nakada + + * ext/readline/readline.c (readline_event): prevent polling. based on + a patch from error errorsson in [ruby-Bugs-17675]. + Sun Jun 15 19:24:42 2008 Nobuyoshi Nakada * parse.y (yycompile): clear ruby_eval_tree_begin if parse failed. diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 4f840ee2c0..3625fadef8 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -38,17 +38,32 @@ static ID completion_proc, completion_case_fold; # define rl_completion_matches completion_matches #endif -static int readline_event(void); static char **readline_attempted_completion_function(const char *text, int start, int end); +#ifdef HAVE_RL_EVENT_HOOK +#ifdef DOSISH +#define BUSY_WAIT 1 +#else +#define BUSY_WAIT 0 +#endif + +static int readline_event(void); static int readline_event() { - CHECK_INTS; +#if BUSY_WAIT rb_thread_schedule(); +#else + fd_set rset; + + FD_ZERO(&rset); + FD_SET(fileno(rl_instream), &rset); + rb_thread_select(fileno(rl_instream) + 1, &rset, NULL, NULL, NULL); return 0; +#endif } +#endif static VALUE readline_readline(argc, argv, self) diff --git a/version.h b/version.h index 3656451480..3bd6fafab5 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 180 +#define RUBY_PATCHLEVEL 181 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3