diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/readline/readline.c | 19 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 23 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sun Jun 15 19:50:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/readline/readline.c (readline_event): prevent polling. based on + a patch from error errorsson in [ruby-Bugs-17675]. + Sun Jun 15 19:44:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (yycompile): clear ruby_eval_tree_begin if parse failed. diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 559e1c677b..82ddc8a3cb 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -42,17 +42,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) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 181 +#define RUBY_PATCHLEVEL 182 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |