2003-07-23 05:26:53 -04:00
|
|
|
/**********************************************************************
|
|
|
|
|
|
|
|
io/wait.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
$Date$
|
|
|
|
created at: Tue Aug 28 09:08:06 JST 2001
|
|
|
|
|
|
|
|
All the files in this distribution are covered under the Ruby's
|
|
|
|
license (see the file COPYING).
|
|
|
|
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
#include "ruby.h"
|
|
|
|
#include "rubyio.h"
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
2005-07-17 00:47:38 -04:00
|
|
|
#if defined(FIONREAD_HEADER)
|
2003-07-23 05:26:53 -04:00
|
|
|
#include FIONREAD_HEADER
|
2005-07-17 23:23:47 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_RB_W32_IOCTLSOCKET
|
2005-07-17 00:47:38 -04:00
|
|
|
#define ioctl ioctlsocket
|
2005-07-17 23:23:47 -04:00
|
|
|
#define ioctl_arg u_long
|
|
|
|
#define ioctl_arg2num(i) ULONG2NUM(i)
|
|
|
|
#else
|
|
|
|
#define ioctl_arg int
|
|
|
|
#define ioctl_arg2num(i) INT2NUM(i)
|
2005-07-17 00:47:38 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_RB_W32_IS_SOCKET
|
2005-07-17 23:23:47 -04:00
|
|
|
#define FIONREAD_POSSIBLE_P(fd) rb_w32_is_socket(fd)
|
2005-07-17 00:47:38 -04:00
|
|
|
#else
|
2005-07-17 23:23:47 -04:00
|
|
|
#define FIONREAD_POSSIBLE_P(fd) ((fd),Qtrue)
|
2005-07-17 00:47:38 -04:00
|
|
|
#endif
|
2003-07-23 05:26:53 -04:00
|
|
|
|
|
|
|
static VALUE io_ready_p _((VALUE io));
|
|
|
|
static VALUE io_wait _((int argc, VALUE *argv, VALUE io));
|
|
|
|
void Init_wait _((void));
|
|
|
|
|
|
|
|
EXTERN struct timeval rb_time_interval _((VALUE time));
|
|
|
|
|
|
|
|
/*
|
2006-08-27 19:03:20 -04:00
|
|
|
* call-seq:
|
2006-08-27 22:31:34 -04:00
|
|
|
* io.ready? -> true, false or nil
|
2006-08-27 19:03:20 -04:00
|
|
|
*
|
|
|
|
* Returns non-nil if input available without blocking, or nil.
|
2003-07-23 05:26:53 -04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2006-07-17 09:59:09 -04:00
|
|
|
io_ready_p(VALUE io)
|
2003-07-23 05:26:53 -04:00
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
2005-07-17 23:23:47 -04:00
|
|
|
ioctl_arg n;
|
2003-07-23 05:26:53 -04:00
|
|
|
|
|
|
|
GetOpenFile(io, fptr);
|
|
|
|
rb_io_check_readable(fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (rb_io_read_pending(fptr)) return Qtrue;
|
2005-07-17 00:47:38 -04:00
|
|
|
if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qfalse;
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (ioctl(fptr->fd, FIONREAD, &n)) rb_sys_fail(0);
|
2005-07-17 23:23:47 -04:00
|
|
|
if (n > 0) return ioctl_arg2num(n);
|
2003-07-23 05:26:53 -04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2005-06-03 10:23:17 -04:00
|
|
|
struct wait_readable_arg {
|
|
|
|
rb_fdset_t fds;
|
|
|
|
struct timeval *timeout;
|
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef HAVE_RB_FD_INIT
|
|
|
|
static VALUE
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
wait_readable(VALUE p)
|
2005-06-03 10:23:17 -04:00
|
|
|
{
|
|
|
|
struct wait_readable_arg *arg = (struct wait_readable_arg *)p;
|
|
|
|
rb_fdset_t *fds = &arg->fds;
|
|
|
|
|
|
|
|
return (VALUE)rb_thread_select(rb_fd_max(fds), rb_fd_ptr(fds), NULL, NULL, arg->timeout);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2003-07-23 05:26:53 -04:00
|
|
|
/*
|
2006-08-27 19:03:20 -04:00
|
|
|
* call-seq:
|
2006-08-27 22:31:34 -04:00
|
|
|
* io.wait -> IO, true, false or nil
|
|
|
|
* io.wait(timeout) -> IO, true, false or nil
|
2006-08-27 19:03:20 -04:00
|
|
|
*
|
|
|
|
* Waits until input is available or times out and returns self or nil when
|
|
|
|
* EOF is reached.
|
|
|
|
*/
|
|
|
|
|
2003-07-23 05:26:53 -04:00
|
|
|
static VALUE
|
2006-06-20 14:02:17 -04:00
|
|
|
io_wait(int argc, VALUE *argv, VALUE io)
|
2003-07-23 05:26:53 -04:00
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
2005-06-03 10:23:17 -04:00
|
|
|
struct wait_readable_arg arg;
|
2005-07-17 23:23:47 -04:00
|
|
|
int fd, i;
|
|
|
|
ioctl_arg n;
|
2003-07-23 05:26:53 -04:00
|
|
|
VALUE timeout;
|
2005-06-03 10:23:17 -04:00
|
|
|
struct timeval timerec;
|
2003-07-23 05:26:53 -04:00
|
|
|
|
|
|
|
GetOpenFile(io, fptr);
|
|
|
|
rb_io_check_readable(fptr);
|
|
|
|
rb_scan_args(argc, argv, "01", &timeout);
|
|
|
|
if (NIL_P(timeout)) {
|
2005-06-03 10:23:17 -04:00
|
|
|
arg.timeout = 0;
|
2003-07-23 05:26:53 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
timerec = rb_time_interval(timeout);
|
2005-06-03 10:23:17 -04:00
|
|
|
arg.timeout = &timerec;
|
2003-07-23 05:26:53 -04:00
|
|
|
}
|
|
|
|
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (rb_io_read_pending(fptr)) return Qtrue;
|
2005-07-17 00:47:38 -04:00
|
|
|
if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qfalse;
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
fd = fptr->fd;
|
2005-06-03 10:23:17 -04:00
|
|
|
rb_fd_init(&arg.fds);
|
|
|
|
rb_fd_set(fd, &arg.fds);
|
|
|
|
#ifdef HAVE_RB_FD_INIT
|
2005-07-17 23:23:47 -04:00
|
|
|
i = (int)rb_ensure(wait_readable, (VALUE)&arg,
|
2005-06-03 10:23:17 -04:00
|
|
|
(VALUE (*)_((VALUE)))rb_fd_term, (VALUE)&arg.fds);
|
|
|
|
#else
|
2005-07-17 23:23:47 -04:00
|
|
|
i = rb_thread_select(fd + 1, rb_fd_ptr(&arg.fds), NULL, NULL, arg.timeout);
|
2005-06-03 10:23:17 -04:00
|
|
|
#endif
|
2005-07-17 23:23:47 -04:00
|
|
|
if (i < 0)
|
2003-07-23 05:26:53 -04:00
|
|
|
rb_sys_fail(0);
|
|
|
|
rb_io_check_closed(fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (ioctl(fptr->fd, FIONREAD, &n)) rb_sys_fail(0);
|
2003-07-23 05:26:53 -04:00
|
|
|
if (n > 0) return io;
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2006-08-27 19:03:20 -04:00
|
|
|
/*
|
|
|
|
* IO wait methods
|
|
|
|
*/
|
|
|
|
|
2003-07-23 05:26:53 -04:00
|
|
|
void
|
|
|
|
Init_wait()
|
|
|
|
{
|
|
|
|
rb_define_method(rb_cIO, "ready?", io_ready_p, 0);
|
|
|
|
rb_define_method(rb_cIO, "wait", io_wait, -1);
|
|
|
|
}
|