From 6b0e2a11aeccf2ebc707c22548a0c15c8c2bae06 Mon Sep 17 00:00:00 2001 From: Michael Leibowitz Date: Thu, 15 Aug 2013 15:02:54 -0700 Subject: Imported Upstream version 1.9.3.p448 --- ext/-test-/add_suffix/bug.c | 32 ------------------- ext/-test-/add_suffix/depend | 1 - ext/-test-/add_suffix/extconf.rb | 4 --- ext/-test-/win32/dln/extconf.rb | 4 ++- ext/-test-/win32/fd_setsize/depend | 2 ++ ext/-test-/win32/fd_setsize/extconf.rb | 3 ++ ext/-test-/win32/fd_setsize/fd_setsize.c | 55 ++++++++++++++++++++++++++++++++ 7 files changed, 63 insertions(+), 38 deletions(-) delete mode 100644 ext/-test-/add_suffix/bug.c delete mode 100644 ext/-test-/add_suffix/depend delete mode 100644 ext/-test-/add_suffix/extconf.rb create mode 100644 ext/-test-/win32/fd_setsize/depend create mode 100644 ext/-test-/win32/fd_setsize/extconf.rb create mode 100644 ext/-test-/win32/fd_setsize/fd_setsize.c (limited to 'ext/-test-') diff --git a/ext/-test-/add_suffix/bug.c b/ext/-test-/add_suffix/bug.c deleted file mode 100644 index 3dc1201..0000000 --- a/ext/-test-/add_suffix/bug.c +++ /dev/null @@ -1,32 +0,0 @@ -static unsigned long ruby_scan_oct(); -static unsigned long ruby_scan_hex(); -static unsigned long ruby_strtoul(); -static void ruby_qsort(); -static char *ruby_strdup(); -static char *ruby_getcwd(); -static double ruby_strtod(); -static char *ruby_dtoa(); -static void ruby_each_words(); -static char *ruby_hdtoa(); -#include "ruby.h" -#include "ruby/defines.h" -#include "ruby/util.h" -#ifndef HAVE_RUBY_ADD_SUFFIX -#define _WIN32 1 -#include "util.c" -#endif - -static VALUE -add_suffix(VALUE self, VALUE path, VALUE suffix) -{ - StringValueCStr(path); - ruby_add_suffix(path, StringValueCStr(suffix)); - return path; -} - -void -Init_bug(void) -{ - VALUE mBug = rb_define_module("Bug"); - rb_define_module_function(mBug, "add_suffix", add_suffix, 2); -} diff --git a/ext/-test-/add_suffix/depend b/ext/-test-/add_suffix/depend deleted file mode 100644 index 943d0d9..0000000 --- a/ext/-test-/add_suffix/depend +++ /dev/null @@ -1 +0,0 @@ -bug.o: $(hdrdir)/ruby/util.h $(top_srcdir)/util.c diff --git a/ext/-test-/add_suffix/extconf.rb b/ext/-test-/add_suffix/extconf.rb deleted file mode 100644 index bffd155..0000000 --- a/ext/-test-/add_suffix/extconf.rb +++ /dev/null @@ -1,4 +0,0 @@ -unless have_func("ruby_add_suffix", "ruby/util.h") - $INCFLAGS << " -I$(top_srcdir)" -end -create_makefile("-test-/add_suffix/bug") diff --git a/ext/-test-/win32/dln/extconf.rb b/ext/-test-/win32/dln/extconf.rb index cc94a67..0b5089a 100644 --- a/ext/-test-/win32/dln/extconf.rb +++ b/ext/-test-/win32/dln/extconf.rb @@ -1,12 +1,14 @@ if $mingw or $mswin $objs = ["dlntest.o"] - $cleanfiles << "$(topdir)/dlntest.dll" + testdll = "$(topdir)/dlntest.dll" + $cleanfiles << testdll config_string('cleanobjs') {|t| $cleanfiles.concat(t.gsub(/\$\*/, 'dlntest').split)} create_makefile("-test-/win32/dln") m = File.read("Makefile") dlntestlib = "dlntest.#{$LIBEXT}" m.sub!(/^OBJS =.*/) {"#{$&} #{dlntestlib}"} + FileUtils.rm_f(RbConfig.expand(testdll.dup)) open("Makefile", "wb") do |mf| mf.puts m, "\n" sodir = $extout ? "$(RUBYARCHDIR)/" : '' diff --git a/ext/-test-/win32/fd_setsize/depend b/ext/-test-/win32/fd_setsize/depend new file mode 100644 index 0000000..4936d6b --- /dev/null +++ b/ext/-test-/win32/fd_setsize/depend @@ -0,0 +1,2 @@ +fd_setsize.o: $(top_srcdir)/win32/win32.c \ + $(hdrdir)/ruby/ruby.h diff --git a/ext/-test-/win32/fd_setsize/extconf.rb b/ext/-test-/win32/fd_setsize/extconf.rb new file mode 100644 index 0000000..ed40f8b --- /dev/null +++ b/ext/-test-/win32/fd_setsize/extconf.rb @@ -0,0 +1,3 @@ +if $mingw or $mswin + create_makefile("-test-/win32/fd_setsize") +end diff --git a/ext/-test-/win32/fd_setsize/fd_setsize.c b/ext/-test-/win32/fd_setsize/fd_setsize.c new file mode 100644 index 0000000..8da8b1e --- /dev/null +++ b/ext/-test-/win32/fd_setsize/fd_setsize.c @@ -0,0 +1,55 @@ +#undef FD_SETSIZE +/* redefine smaller size then default 64 */ +#define FD_SETSIZE 32 +#include + +static VALUE +test_select(VALUE self) +{ + int sd = socket(AF_INET, SOCK_DGRAM, 0); + struct timeval zero; + fd_set read; + fd_set write; + fd_set error; + + zero.tv_sec = 0; + zero.tv_usec = 0; + + FD_ZERO(&read); + FD_ZERO(&write); + FD_ZERO(&error); + + FD_SET(sd, &read); + FD_SET(sd, &write); + FD_SET(sd, &error); + + select(sd+1, &read, &write, &error, &zero); + + return Qtrue; +} + +static VALUE +test_fdset(VALUE self) +{ + int i; + fd_set set; + + FD_ZERO(&set); + + for (i = 0; i < FD_SETSIZE * 2; i++) { + int sd = socket(AF_INET, SOCK_DGRAM, 0); + FD_SET(sd, &set); + if (set.fd_count > FD_SETSIZE) { + return Qfalse; + } + } + return Qtrue; +} + +void +Init_fd_setsize(void) +{ + VALUE m = rb_define_module_under(rb_define_module("Bug"), "Win32"); + rb_define_module_function(m, "test_select", test_select, 0); + rb_define_module_function(m, "test_fdset", test_fdset, 0); +} -- cgit v1.2.3