diff options
| -rw-r--r-- | .document | 9 | ||||
| -rw-r--r-- | .gitignore | 20 | ||||
| -rw-r--r-- | COPYING | 165 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 40 | ||||
| -rw-r--r-- | GNUmakefile | 189 | ||||
| -rw-r--r-- | HACKING | 66 | ||||
| -rw-r--r-- | ISSUES | 36 | ||||
| -rw-r--r-- | LICENSE | 18 | ||||
| -rw-r--r-- | README | 66 | ||||
| -rw-r--r-- | Rakefile | 156 | ||||
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | ext/kgio/extconf.rb | 19 | ||||
| -rw-r--r-- | ext/kgio/kgio_ext.c | 743 | ||||
| -rw-r--r-- | kgio.gemspec | 36 | ||||
| -rw-r--r-- | lib/kgio.rb | 10 | ||||
| -rw-r--r-- | setup.rb | 1586 | ||||
| -rw-r--r-- | test/lib_read_write.rb | 152 | ||||
| -rw-r--r-- | test/test_pipe_popen.rb | 14 | ||||
| -rw-r--r-- | test/test_pipe_read_write.rb | 9 | ||||
| -rw-r--r-- | test/test_socketpair_read_write.rb | 9 | ||||
| -rw-r--r-- | test/test_tcp_connect.rb | 56 | ||||
| -rw-r--r-- | test/test_tcp_server.rb | 31 | ||||
| -rw-r--r-- | test/test_unix_connect.rb | 58 | ||||
| -rw-r--r-- | test/test_unix_server.rb | 34 |
24 files changed, 3527 insertions, 0 deletions
diff --git a/.document b/.document new file mode 100644 index 0000000..2ecef94 --- /dev/null +++ b/.document @@ -0,0 +1,9 @@ +LICENSE +README +TODO +NEWS +ChangeLog +ISSUES +HACKING +lib +ext/kgio/kgio_ext.c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..88d1bfe --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +/local.mk +*.o +*.log +*.so +*.rbc +/.config +/InstalledFiles +/doc +/local.mk +/test/install-* +Makefile +log/ +pkg/ +/NEWS +/ChangeLog +/.manifest +/GIT-VERSION-FILE +/man +tags +TAGS @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN new file mode 100755 index 0000000..92e03e3 --- /dev/null +++ b/GIT-VERSION-GEN @@ -0,0 +1,40 @@ +#!/bin/sh + +GVF=GIT-VERSION-FILE +DEF_VER=v0.0.0.GIT + +LF=' +' + +# First see if there is a version file (included in release tarballs), +# then try git-describe, then default. +if test -f version +then + VN=$(cat version) || VN="$DEF_VER" +elif test -d .git -o -f .git && + VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && + case "$VN" in + *$LF*) (exit 1) ;; + v[0-9]*) + git update-index -q --refresh + test -z "$(git diff-index --name-only HEAD --)" || + VN="$VN-dirty" ;; + esac +then + VN=$(echo "$VN" | sed -e 's/-/./g'); +else + VN="$DEF_VER" +fi + +VN=$(expr "$VN" : v*'\(.*\)') + +if test -r $GVF +then + VC=$(sed -e 's/^GIT_VERSION = //' <$GVF) +else + VC=unset +fi +test "$VN" = "$VC" || { + echo >&2 "GIT_VERSION = $VN" + echo "GIT_VERSION = $VN" >$GVF +} diff --git a/GNUmakefile b/GNUmakefile new file mode 100644 index 0000000..559bc75 --- /dev/null +++ b/GNUmakefile @@ -0,0 +1,189 @@ +# use GNU Make to run tests in parallel, and without depending on RubyGems +all:: +RUBY = ruby +RAKE = rake +RSYNC = rsync +GIT_URL = git://git.bogomips.org/kgio.git + +GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE + @./GIT-VERSION-GEN +-include GIT-VERSION-FILE +-include local.mk +ifeq ($(DLEXT),) # "so" for Linux + DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]') +endif +ifeq ($(RUBY_VERSION),) + RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION') +endif + +install: + $(prep_setup_rb) + $(RM) -r .install-tmp + mkdir .install-tmp + $(RUBY) setup.rb all + $(RM) $^ + $(RM) -r .install-tmp + $(prep_setup_rb) + +setup_rb_files := .config InstalledFiles +prep_setup_rb := @-$(RM) $(setup_rb_files);$(MAKE) -C $(ext) clean + +clean: + -$(MAKE) -C ext/kgio clean + $(RM) $(setup_rb_files) ext/kgio/Makefile + +pkg_extra := GIT-VERSION-FILE NEWS ChangeLog +manifest: $(pkg_extra) + $(RM) .manifest + $(MAKE) .manifest + +.manifest: + (git ls-files && \ + for i in $@ $(pkg_extra) $(man1_paths); \ + do echo $$i; done) | LC_ALL=C sort > $@+ + cmp $@+ $@ || mv $@+ $@ + $(RM) $@+ + +NEWS: GIT-VERSION-FILE + $(RAKE) -s news_rdoc > $@+ + mv $@+ $@ + +latest: NEWS + @awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' $< + +SINCE = +ChangeLog: LOG_VERSION = \ + $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \ + echo $(GIT_VERSION) || git describe) +ifneq ($(SINCE),) +ChangeLog: log_range = v$(SINCE)..$(LOG_VERSION) +endif +ChangeLog: GIT-VERSION-FILE + @echo "ChangeLog from $(GIT_URL) ($(log_range))" > $@+ + @echo >> $@+ + git log $(log_range) | sed -e 's/^/ /' >> $@+ + mv $@+ $@ + +news_atom := http://unicorn.bogomips.org/kgio/NEWS.atom.xml +cgit_atom := http://git.bogomips.org/cgit/kgio.git/atom/?h=master +atom = <link rel="alternate" title="Atom feed" href="$(1)" \ + type="application/atom+xml"/> + +# using rdoc 2.5.x +doc: .document NEWS ChangeLog + rdoc -t "$(shell sed -ne '1s/^= //p' README)" + install -m644 COPYING doc/COPYING + install -m644 $(shell grep '^[A-Z]' .document) doc/ + $(RUBY) -i -p -e \ + '$$_.gsub!("</title>",%q{\&$(call atom,$(cgit_atom))})' \ + doc/ChangeLog.html + $(RUBY) -i -p -e \ + '$$_.gsub!("</title>",%q{\&$(call atom,$(news_atom))})' \ + doc/NEWS.html doc/README.html + $(RAKE) -s news_atom > doc/NEWS.atom.xml + cd doc && ln README.html tmp && mv tmp index.html + +ifneq ($(VERSION),) +rfproject := rainbows +rfpackage := kgio +pkggem := pkg/$(rfpackage)-$(VERSION).gem +pkgtgz := pkg/$(rfpackage)-$(VERSION).tgz +release_notes := release_notes-$(VERSION) +release_changes := release_changes-$(VERSION) + +release-notes: $(release_notes) +release-changes: $(release_changes) +$(release_changes): + $(RAKE) -s release_changes > $@+ + $(VISUAL) $@+ && test -s $@+ && mv $@+ $@ +$(release_notes): + GIT_URL=$(GIT_URL) $(RAKE) -s release_notes > $@+ + $(VISUAL) $@+ && test -s $@+ && mv $@+ $@ + +# ensures we're actually on the tagged $(VERSION), only used for release +verify: + test x"$(shell umask)" = x0022 + git rev-parse --verify refs/tags/v$(VERSION)^{} + git diff-index --quiet HEAD^0 + test `git rev-parse --verify HEAD^0` = \ + `git rev-parse --verify refs/tags/v$(VERSION)^{}` + +fix-perms: + -git ls-tree -r HEAD | awk '/^100644 / {print $$NF}' | xargs chmod 644 + -git ls-tree -r HEAD | awk '/^100755 / {print $$NF}' | xargs chmod 755 + +gem: $(pkggem) + +install-gem: $(pkggem) + gem install $(CURDIR)/$< + +$(pkggem): manifest fix-perms + gem build $(rfpackage).gemspec + mkdir -p pkg + mv $(@F) $@ + +$(pkgtgz): distdir = $(basename $@) +$(pkgtgz): HEAD = v$(VERSION) +$(pkgtgz): manifest fix-perms + @test -n "$(distdir)" + $(RM) -r $(distdir) + mkdir -p $(distdir) + tar c `cat .manifest` | (cd $(distdir) && tar x) + cd pkg && tar c $(basename $(@F)) | gzip -9 > $(@F)+ + mv $@+ $@ + +package: $(pkgtgz) $(pkggem) + +test-release: verify package $(release_notes) $(release_changes) +release: verify package $(release_notes) $(release_changes) + # make tgz release on RubyForge + rubyforge add_release -f -n $(release_notes) -a $(release_changes) \ + $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz) + # push gem to Gemcutter + gem push $(pkggem) + # in case of gem downloads from RubyForge releases page + -rubyforge add_file \ + $(rfproject) $(rfpackage) $(VERSION) $(pkggem) +else +gem install-gem: GIT-VERSION-FILE + $(MAKE) $@ VERSION=$(GIT_VERSION) +endif + +ext := ext/kgio/kgio_ext.$(DLEXT) +ext/kgio/Makefile: ext/kgio/extconf.rb + cd $(@D) && $(RUBY) extconf.rb + +$(ext): ext/kgio/kgio_ext.c ext/kgio/Makefile + $(MAKE) -C $(@D) + +all:: test + +build: $(ext) +test_units := $(wildcard test/test_*.rb) +test: test-unit +test-unit: $(test_units) +$(test_units): build + $(RUBY) -I lib:ext/kgio $@ + +# this requires GNU coreutils variants +publish_doc: + -git set-file-times + $(RM) -r doc ChangeLog NEWS + $(MAKE) doc LOG_VERSION=$(shell git tag -l | tail -1) + $(MAKE) -s latest > doc/LATEST + find doc/images doc/js -type f | \ + TZ=UTC xargs touch -d '1970-01-01 00:00:00' doc/rdoc.css + $(MAKE) doc_gz + chmod 644 $$(find doc -type f) + $(RSYNC) -av doc/ unicorn.bogomips.org:/srv/unicorn/kgio/ + git ls-files | xargs touch + +# Create gzip variants of the same timestamp as the original so nginx +# "gzip_static on" can serve the gzipped versions directly. +doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$') +doc_gz: + touch doc/NEWS.atom.xml -d "$$(awk 'NR==1{print $$4,$$5,$$6}' NEWS)" + for i in $(docs); do \ + gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done + +.PHONY: .FORCE-GIT-VERSION-FILE doc manifest man test $(test_units) @@ -0,0 +1,66 @@ += kgio Hacker's Guide + +=== Documentation + +We use RDoc 2.5.x with Darkfish for documentation as much as possible, +if you're on Ruby 1.8 you want to install the latest "rdoc" gem. Due to +the lack of RDoc-to-manpage converters we know about, we're writing +manpages in Markdown and converting to troff/HTML with Pandoc. + +Please wrap documentation at 72 characters-per-line or less (long URLs +are exempt) so it is comfortably readable from terminals. + +When referencing mailing list posts, use +"http://mid.gmane.org/$MESSAGE_ID" if possible since the Message-ID +remains searchable even if Gmane becomes unavailable. + +=== Code Compatibility + +We target Ruby 1.8.6+, 1.9.1+ and Rubinius 1.1+ and their +respective C APIs. + +All of our C code should be compatible with all reasonably modern Unices +and should run on compilers supported by the versions of Ruby we target. + +We will NEVER support non-Free platforms under any circumstances. + +Our C code follows K&R indentation style (hard tabs, tabs are always 8 +characters wide) and NOT the indentation style of Matz Ruby. + +== Contributing + +Contributions are welcome in the form of patches, pull requests, code +review, testing, documentation, user support or any other feedback. The +{Unicornmailing list}[mailto:mongrel-unicorn@rubyforge.org] is the +central coordination point for all user and developer feedback and bug +reports. + +=== Submitting Patches + +Follow conventions already established in the code and do not exceed 80 +characters per line. + +Inline patches (from "git format-patch -M") to the mailing list are +preferred because they allow code review and comments in the reply to +the patch. + +We will adhere to mostly the same conventions for patch submissions as +git itself. See the Documentation/SubmittingPatches document +distributed with git on on patch submission guidelines to follow. Just +don't email the git mailing list or maintainer with kgio patches :) + +== Running Development Versions + +It is easy to install the contents of your git working directory: + +Via RubyGems (RubyGems 1.3.5+ recommended for prerelease versions): + + gmake install-gem + +Without RubyGems (via setup.rb): + + gmake install + +It is not at all recommended to mix a RubyGems installation with an +installation done without RubyGems, however. + @@ -0,0 +1,36 @@ += Issues + +The Unicorn {mailing list}[mailto:mongrel-unicorn@rubyforge.org] is the best +place to report bugs, submit patches and/or obtain support after you +have searched the mailing list archives and +{documentation}[http://unicorn.bogomips.org/kgio]. + +* No subscription is needed to post to the mailing list, + let us know that we need to Cc: replies to you if you're unsubscribed. +* Do not {top post}[http://catb.org/jargon/html/T/top-post.html] in replies +* Quote only the relevant portions of the message you're replying to +* Do not send HTML mail + +If your issue is of a sensitive nature or you're just shy in public, +then feel free to email us privately at mailto:unicorn@bogomips.org +instead and your issue will be handled discreetly. + +If you don't get a response within a few days, we may have forgotten +about it so feel free to ask again. + +== Submitting Patches + +See the HACKING document (and additionally, the +Documentation/SubmittingPatches document distributed with git) on +guidelines for patch submission. + +== Mailing List Info + +* subscribe: http://rubyforge.org/mailman/listinfo/mongrel-unicorn +* post: mailto:mongrel-unicorn@rubyforge.org +* private: mailto:unicorn@bogomips.org + +== Mailing List Archives + +* nntp://news.gmane.org/gmane.comp.lang.ruby.unicorn.general +* http://rubyforge.org/pipermail/mongrel-unicorn @@ -0,0 +1,18 @@ +kgio is copyrighted Free Software by all contributors, see logs in +revision control for names and email addresses of all of them. + +You can redistribute it and/or modify it under the terms of the GNU +Lesser General Public License (LGPL) as published by the Free Software +Foundation, version {2.1}[http://www.gnu.org/licenses/lgpl-2.1.txt] or +or {3}[http://www.gnu.org/licenses/lgpl-3.0.txt] (see link:COPYING). +The kgio project leader (Eric Wong) reserves the right to +relicense kgio under future versions of the LGPL. + +kgio is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with the GNU C Library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 @@ -0,0 +1,66 @@ += kgio - kinder, gentler I/O for Ruby + +kgio provides non-blocking I/O methods for Ruby without raising +exceptions on EAGAIN and EINPROGRESS. It is intended for use with the +Unicorn and Rainbows! Rack servers, but may be used by other +applications. + +== Features + +* Avoids exceptions on common EAGAIN/EINPROGRESS errors, returning + Kgio::WaitReadable or Kgio::WaitWritable instead. + These exceptions got more expensive to hit under Ruby 1.9.2 + (but should be fixed in Ruby 1.9.3 to 1.9.1 performance levels) + +* Returns the unwritten portion of the string on partial writes, + making it ideal for buffering unwritten portions. + +* May be assigned Kgio.wait_writable= and Kgio.wait_readable= + methods to allow socket/pipe objects to make custom callbacks + (such as adding the file descriptor to a poll set and yielding + the current Fiber). + +* Uses + {accept4}[http://kernel.org/doc/man-pages/online/pages/man2/accept4.2.html] + on new GNU/Linux systems to avoid unnecessary fcntl() calls + +* uses MSG_DONTWAIT where available to further avoid unnecessary fcntl() calls + +== Install + +The library consists of a C extension so you'll need a C compiler +and Ruby development libraries/headers. + +You may download the tarball from the Mongrel project page on Rubyforge +and run setup.rb after unpacking it: + +http://rubyforge.org/frs/?group_id=8977 + +You may also install it via RubyGems on Gemcutter: + + gem install kgio + +You can get the latest source via git from the following locations +(these versions may not be stable): + + git://git.bogomips.org/kgio.git + git://repo.or.cz/kgio.git (mirror) + +You may browse the code from the web and download the latest snapshot +tarballs here: + +* http://git.bogomips.org/cgit/kgio.git (cgit) +* http://repo.or.cz/w/kgio.git (gitweb) + +See the HACKING guide on how to contribute and build prerelease gems +from git. + +== Contact + +All feedback (bug reports, user/development dicussion, patches, pull +requests) go to the mailing list/newsgroup. See the ISSUES document for +information on the +{Unicorn mailing list}[mailto:mongrel-unicorn@rubyforge.org]. + +For the latest on kgio releases, you may check our NEWS page (and +subscribe to our Atom feed). diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..52787c6 --- /dev/null +++ b/Rakefile @@ -0,0 +1,156 @@ +# -*- encoding: binary -*- + +# most tasks are in the GNUmakefile which offers better parallelism + +def tags + timefmt = '%Y-%m-%dT%H:%M:%SZ' + @tags ||= `git tag -l`.split(/\n/).map do |tag| + if %r{\Av[\d\.]+\z} =~ tag + header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/, 3) + header = header.split(/\n/) + tagger = header.grep(/\Atagger /).first + body ||= "initial" + { + :time => Time.at(tagger.split(/ /)[-2].to_i).utc.strftime(timefmt), + :tagger_name => %r{^tagger ([^<]+)}.match(tagger)[1].strip, + :tagger_email => %r{<([^>]+)>}.match(tagger)[1].strip, + :id => `git rev-parse refs/tags/#{tag}`.chomp!, + :tag => tag, + :subject => subject, + :body => body, + } + end + end.compact.sort { |a,b| b[:time] <=> a[:time] } +end + +cgit_url = "http://git.bogomips.org/cgit/kgio.git" +git_url = ENV['GIT_URL'] || 'git://git.bogomips.org/kgio.git' +web_url = "http://unicorn.bogomips.org/kgio" + +desc 'prints news as an Atom feed' +task :news_atom do + require 'nokogiri' + new_tags = tags[0,10] + puts(Nokogiri::XML::Builder.new do + feed :xmlns => "http://www.w3.org/2005/Atom" do + id! "#{web_url}NEWS.atom.xml" + title "kgio news" + subtitle "socket methods using MSG_DONTWAIT and more" + link! :rel => "alternate", :type => "text/html", + :href => "#{web_url}NEWS.html" + updated(new_tags.empty? ? "1970-01-01T00:00:00Z" : new_tags.first[:time]) + new_tags.each do |tag| + entry do + title tag[:subject] + updated tag[:time] + published tag[:time] + author { + name tag[:tagger_name] + email tag[:tagger_email] + } + url = "#{cgit_url}/tag/?id=#{tag[:tag]}" + link! :rel => "alternate", :type => "text/html", :href =>url + id! url + message_only = tag[:body].split(/\n.+\(\d+\):\n {6}/s).first.strip + content({:type =>:text}, message_only) + content(:type =>:xhtml) { pre tag[:body] } + end + end + end + end.to_xml) +end + +desc 'prints RDoc-formatted news' +task :news_rdoc do + tags.each do |tag| + time = tag[:time].tr!('T', ' ').gsub!(/:\d\dZ/, ' UTC') + puts "=== #{tag[:tag].sub(/^v/, '')} / #{time}" + puts "" + + body = tag[:body] + puts tag[:body].gsub(/^/sm, " ").gsub(/[ \t]+$/sm, "") + puts "" + end +end + +desc "print release changelog for Rubyforge" +task :release_changes do + version = ENV['VERSION'] or abort "VERSION= needed" + version = "v#{version}" + vtags = tags.map { |tag| tag[:tag] =~ /\Av/ and tag[:tag] }.sort + prev = vtags[vtags.index(version) - 1] + if prev + system('git', 'diff', '--stat', prev, version) or abort $? + puts "" + system('git', 'log', "#{prev}..#{version}") or abort $? + else + system('git', 'log', version) or abort $? + end +end + +desc "print release notes for Rubyforge" +task :release_notes do + spec = Gem::Specification.load('kgio.gemspec') + puts spec.description.strip + puts "" + puts "* #{spec.homepage}" + puts "* #{spec.email}" + puts "* #{git_url}" + + _, _, body = `git cat-file tag v#{spec.version}`.split(/\n\n/, 3) + print "\nChanges:\n\n" + puts body +end + +desc "read news article from STDIN and post to rubyforge" +task :publish_news do + require 'rubyforge' + IO.select([STDIN], nil, nil, 1) or abort "E: news must be read from stdin" + msg = STDIN.readlines + subject = msg.shift + blank = msg.shift + blank == "\n" or abort "no newline after subject!" + subject.strip! + body = msg.join("").strip! + + rf = RubyForge.new.configure + rf.login + rf.post_news('rainbows', subject, body) +end + +desc "post to RAA" +task :raa_update do + require 'net/http' + require 'net/netrc' + rc = Net::Netrc.locate('kgio-raa') or abort "~/.netrc not found" + password = rc.password + + s = Gem::Specification.load('kgio.gemspec') + desc = [ s.description.strip ] + desc << "" + desc << "* #{s.email}" + desc << "* #{git_url}" + desc << "* #{cgit_url}" + desc = desc.join("\n") + uri = URI.parse('http://raa.ruby-lang.org/regist.rhtml') + form = { + :name => s.name, + :short_description => s.summary, + :version => s.version.to_s, + :status => 'experimental', + :owner => s.authors.first, + :email => s.email, + :category_major => 'Library', + :category_minor => 'System', + :url => s.homepage, + :download => 'http://rubyforge.org/frs/?group_id=8977', + :license => "Ruby's", + :description_style => 'Plain', + :description => desc, + :pass => password, + :submit => 'Update', + } + res = Net::HTTP.post_form(uri, form) + p res + puts res.body +end @@ -0,0 +1,5 @@ +* more API documentation + +* return (instead of raise) EOFError? + +* SSL/TLS support diff --git a/ext/kgio/extconf.rb b/ext/kgio/extconf.rb new file mode 100644 index 0000000..2eb35f7 --- /dev/null +++ b/ext/kgio/extconf.rb @@ -0,0 +1,19 @@ +require 'mkmf' +$CPPFLAGS << ' -D_GNU_SOURCE' + +have_func('accept4', %w(sys/socket.h)) +if have_header('ruby/io.h') + have_struct_member("rb_io_t", "fd", "ruby/io.h") + have_struct_member("rb_io_t", "mode", "ruby/io.h") +else + rubyio = %w(ruby.h rubyio.h) + rb_io_t = have_type("OpenFile", rubyio) ? "OpenFile" : "rb_io_t" + have_struct_member(rb_io_t, "f", rubyio) + have_struct_member(rb_io_t, "f2", rubyio) + have_struct_member(rb_io_t, "mode", rubyio) + have_func('rb_fdopen') +end +have_func('rb_io_ascii8bit_binmode') + +dir_config('kgio') +create_makefile('kgio_ext') diff --git a/ext/kgio/kgio_ext.c b/ext/kgio/kgio_ext.c new file mode 100644 index 0000000..8bbb40f --- /dev/null +++ b/ext/kgio/kgio_ext.c @@ -0,0 +1,743 @@ +#include <ruby.h> +#ifdef HAVE_RUBY_IO_H +# include <ruby/io.h> +#else +# include <rubyio.h> +#endif +#include <errno.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/un.h> +#include <fcntl.h> +#include <unistd.h> +#include <arpa/inet.h> +#include <assert.h> + +#ifndef SOCK_CLOEXEC +# if (FD_CLOEXEC == O_NONBLOCK) +# define SOCK_CLOEXEC 1 +# define SOCK_NONBLOCK 2 +# else +# define SOCK_CLOEXEC FD_CLOEXEC +# define SOCK_NONBLOCK O_NONBLOCK +# endif +#endif + +static void set_nonblocking(int fd) +{ + int flags = fcntl(fd, F_GETFL); + + if (flags == -1) + rb_sys_fail("fcntl(F_GETFL)"); + if ((flags & O_NONBLOCK) == O_NONBLOCK) + return; + flags = fcntl(fd, F_SETFL, flags | O_NONBLOCK); + if (flags == -1) + rb_sys_fail("fcntl(F_SETFL)"); +} + +#ifndef HAVE_ACCEPT4 +/* accept4() is currently a Linux-only goodie */ +static int +accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags) +{ + int fd = accept(sockfd, addr, addrlen); + + if (fd >= 0) { + if ((flags & SOCK_CLOEXEC) == SOCK_CLOEXEC) + (void)fcntl(fd, F_SETFD, FD_CLOEXEC); + + /* + * Some systems inherit O_NONBLOCK across accept(). + * We also expect our users to use MSG_DONTWAIT + * where possible, so fcntl() is completely unnecessary. + */ + if ((flags & SOCK_NONBLOCK) == SOCK_NONBLOCK) + set_nonblocking(fd); + errno = 0; + } + return fd; +} +#endif /* !HAVE_ACCEPT4 */ + +static int accept4_flags = SOCK_CLOEXEC; +static VALUE cSocket; +static VALUE localhost; +static VALUE mKgio_WaitReadable, mKgio_WaitWritable; +static ID io_wait_rd, io_wait_wr; +static ID iv_kgio_addr, id_ruby; + +#if ! HAVE_RB_IO_T +# define rb_io_t OpenFile +#endif + +#ifdef GetReadFile +# define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr))) +#else +# if !HAVE_RB_IO_T || (RUBY_VERSION_MAJOR == 1 && RUBY_VERSION_MINOR == 8) +# define FPTR_TO_FD(fptr) fileno(fptr->f) +# else +# define FPTR_TO_FD(fptr) fptr->fd +# endif +#endif + +#if defined(MakeOpenFile) && \ + defined(HAVE_RB_IO_T) && (HAVE_RB_IO_T == 1) && \ + defined(HAVE_RB_IO_ASCII8BIT_BINMODE) && \ + defined(HAVE_ST_FD) && \ + defined(HAVE_ST_MODE) +# define SOCK_FOR_FD (19) +# define FMODE_NOREVLOOKUP 0x100 +#elif defined(MakeOpenFile) && \ + defined(HAVE_RB_FDOPEN) && \ + defined(HAVE_ST_F) && \ + defined(HAVE_ST_F2) && \ + defined(HAVE_ST_MODE) +# define SOCK_FOR_FD (18) +#else +# define SOCK_FOR_FD (-1) +#endif + +#if SOCK_FOR_FD == 19 /* modeled after ext/socket/init.c */ +static VALUE sock_for_fd(VALUE klass, int fd) +{ + VALUE sock = rb_obj_alloc(klass); + rb_io_t *fp; + + MakeOpenFile(sock, fp); + fp->fd = fd; + fp->mode = FMODE_READWRITE|FMODE_DUPLEX|FMODE_NOREVLOOKUP; + rb_io_ascii8bit_binmode(sock); + rb_io_synchronized(fp); + return sock; +} +#elif SOCK_FOR_FD == 18 /* modeled after init_sock() in ext/socket/socket.c */ +static VALUE sock_for_fd(VALUE klass, int fd) +{ + VALUE sock = rb_obj_alloc(klass); + rb_io_t *fp; + + MakeOpenFile(sock, fp); + fp->f = rb_fdopen(fd, "r"); + fp->f2 = rb_fdopen(fd, "w"); + fp->mode = FMODE_READWRITE; + rb_io_synchronized(fp); + return sock; +} +#else /* Rubinius, et al. */ +static ID id_for_fd; +static VALUE sock_for_fd(VALUE klass, int fd) +{ + return rb_funcall(klass, id_for_fd, 1, INT2NUM(fd)); +} +static void init_sock_for_fd(void) +{ + id_for_fd = rb_intern("for_fd"); +} +#endif /* sock_for_fd */ +#if SOCK_FOR_FD > 0 +# define init_sock_for_fd() if (0) +#endif + +struct io_args { + VALUE io; + VALUE buf; + char *ptr; + long len; + int fd; +}; + +static int my_fileno(VALUE io) +{ + rb_io_t *fptr; + int fd; + + if (TYPE(io) != T_FILE) + io = rb_convert_type(io, T_FILE, "IO", "to_io"); + GetOpenFile(io, fptr); + fd = FPTR_TO_FD(fptr); + + if (fd < 0) + rb_raise(rb_eIOError, "closed stream"); + return fd; +} + +static int maybe_wait_readable(VALUE io) +{ + if (io_wait_rd) { + if (io_wait_rd == id_ruby) { + if (! rb_io_wait_readable(my_fileno(io))) + rb_sys_fail("wait readable"); + errno = 0; + } else { + errno = 0; + (void)rb_funcall(io, io_wait_rd, 0, 0); + } + return 1; + } + errno = 0; + return 0; +} + +static int maybe_wait_writable(VALUE io) +{ + if (io_wait_wr) { + if (io_wait_wr == id_ruby) { + if (! rb_io_wait_writable(my_fileno(io))) + rb_sys_fail("wait writable"); + errno = 0; + } else { + errno = 0; + (void)rb_funcall(io, io_wait_wr, 0, 0); + } + return 1; + } + errno = 0; + return 0; +} + +static void prepare_read(struct io_args *a, int argc, VALUE *argv, VALUE io) +{ + VALUE length; + + a->io = io; + a->fd = my_fileno(io); + rb_scan_args(argc, argv, "11", &length, &a->buf); + a->len = NUM2LONG(length); + if (NIL_P(a->buf)) { + a->buf = rb_str_new(NULL, a->len); + } else { + StringValue(a->buf); + rb_str_resize(a->buf, a->len); + } + a->ptr = RSTRING_PTR(a->buf); +} + +static int read_check(struct io_args *a, long n, const char *msg) +{ + if (n == -1) { + if (errno == EINTR) + return -1; + rb_str_set_len(a->buf, 0); + if (errno == EAGAIN) { + if (maybe_wait_readable(a->io)) { + return -1; + } else { + a->buf = mKgio_WaitReadable; + return 0; + } + } + rb_sys_fail(msg); + } + rb_str_set_len(a->buf, n); + if (n == 0) + rb_eof_error(); + return 0; +} + +#ifdef MSG_DONTWAIT + +/* + * Document-method: Kgio::SocketMethods#kgio_read + * + * call-seq: + * + * socket.kgio_read(maxlen) => buffer or Kgio::WaitReadable + * socket.kgio_read(maxlen, buffer) => buffer or Kgio::WaitReadable + * + * Reads at most maxlen bytes from the stream socket. Returns with a + * newly allocated buffer, or may reuse an existing buffer. This + * returns Kgio::WaitReadble unless Kgio.wait_readable is set, in + * which case it will call the method referred to by Kgio.wait_readable. + */ +static VALUE kgio_recv(int argc, VALUE *argv, VALUE io) +{ + struct io_args a; + long n; + + prepare_read(&a, argc, argv, io); +retry: + n = (long)recv(a.fd, a.ptr, a.len, MSG_DONTWAIT); + if (read_check(&a, n, "recv") != 0) + goto retry; + return a.buf; +} +#else /* ! MSG_DONTWAIT */ +# define kgio_recv kgio_write +#endif /* MSG_DONTWAIT */ + +/* + * Document-method: Kgio::PipeMethods#kgio_read + * + * call-seq: + * + * socket.kgio_read(maxlen) -> buffer or Kgio::WaitReadable + * socket.kgio_read(maxlen, buffer) -> buffer or Kgio::WaitReadable + * + * Reads at most maxlen bytes from the stream socket. Returns with a + * newly allocated buffer, or may reuse an existing buffer. This + * returns Kgio::WaitReadble unless Kgio.wait_readable is set, in + * which case it will call the method referred to by Kgio.wait_readable. + */ +static VALUE kgio_read(int argc, VALUE *argv, VALUE io) +{ + struct io_args a; + long n; + + prepare_read(&a, argc, argv, io); + set_nonblocking(a.fd); +retry: + n = (long)read(a.fd, a.ptr, a.len); + if (read_check(&a, n, "read") != 0) + goto retry; + return a.buf; +} + +static void prepare_write(struct io_args *a, VALUE io, VALUE str) +{ + a->buf = (TYPE(str) == T_STRING) ? str : rb_obj_as_string(str); + a->ptr = RSTRING_PTR(a->buf); + a->len = RSTRING_LEN(a->buf); + a->io = io; + a->fd = my_fileno(io); +} + +static int write_check(struct io_args *a, long n, const char *msg) +{ + if (a->len == n) { + a->buf = Qnil; + } else if (n == -1) { + if (errno == EINTR) + return -1; + if (errno == EAGAIN) { + if (maybe_wait_writable(a->io)) + return -1; + a->buf = mKgio_WaitWritable; + return 0; + } + rb_sys_fail(msg); + } else { + assert(n >= 0 && n < a->len && "write/send syscall broken?"); + a->buf = rb_str_new(a->ptr + n, a->len - n); + } + return 0; +} + +/* + * Returns a String containing the unwritten portion if there was a + * partial write. + * + * Returns true if the write was completed. + * + * Returns Kgio::WaitWritable if the write would block and + * Kgio.wait_writable is not set + */ +static VALUE kgio_write(VALUE io, VALUE str) +{ + struct io_args a; + long n; + + prepare_write(&a, io, str); + set_nonblocking(a.fd); +retry: + n = (long)write(a.fd, a.ptr, a.len); + if (write_check(&a, n, "write") != 0) + goto retry; + return a.buf; +} + +#ifdef MSG_DONTWAIT +/* + * This method behaves like Kgio::PipeMethods#kgio_write, except + * it will use send(2) with the MSG_DONTWAIT flag on sockets to + * avoid unnecessary calls to fcntl(2). + */ +static VALUE kgio_send(VALUE io, VALUE str) +{ + struct io_args a; + long n; + + prepare_write(&a, io, str); +retry: + n = (long)send(a.fd, a.ptr, a.len, MSG_DONTWAIT); + if (write_check(&a, n, "send") != 0) + goto retry; + return a.buf; +} +#else /* ! MSG_DONTWAIT */ +# define kgio_send kgio_write +#endif /* ! MSG_DONTWAIT */ + +/* + * call-seq: + * + * Kgio.wait_readable = :method_name + * + * Sets a method for kgio_read to call when a read would block. + * This is useful for non-blocking frameworks that use Fibers, + * as the method referred to this may cause the current Fiber + * to yield execution. + * + * A special value of ":ruby" will cause Ruby to wait using the + * rb_io_wait_readable() function, giving kgio_read similar semantics to + * IO#readpartial. + */ +static VALUE set_wait_rd(VALUE mod, VALUE sym) +{ + switch (TYPE(sym)) { + case T_SYMBOL: + io_wait_rd = SYM2ID(sym); + return sym; + case T_NIL: + io_wait_rd = 0; + return sym; + } + rb_raise(rb_eTypeError, "must be a symbol or nil"); + return sym; +} + +static VALUE set_wait_wr(VALUE mod, VALUE sym) +{ + switch (TYPE(sym)) { + case T_SYMBOL: + io_wait_wr = SYM2ID(sym); + return sym; + case T_NIL: + io_wait_wr = 0; + return sym; + } + rb_raise(rb_eTypeError, "must be a symbol or nil"); + return sym; +} + +static VALUE wait_wr(VALUE mod) +{ + return io_wait_wr ? ID2SYM(io_wait_wr) : Qnil; +} + +static VALUE wait_rd(VALUE mod) +{ + return io_wait_rd ? ID2SYM(io_wait_rd) : Qnil; +} + +static VALUE +my_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) +{ + int client; + +retry: + client = accept4(sockfd, addr, addrlen, accept4_flags); + if (client == -1) { + switch (errno) { + case EAGAIN: +#ifdef ECONNABORTED + case ECONNABORTED: +#endif /* ECONNABORTED */ +#ifdef EPROTO + case EPROTO: +#endif /* EPROTO */ + return Qnil; + case ENOMEM: + case EMFILE: + case ENFILE: +#ifdef ENOBUFS + case ENOBUFS: +#endif /* ENOBUFS */ + errno = 0; + rb_gc(); + client = accept4(sockfd, addr, addrlen, accept4_flags); + break; + case EINTR: + goto retry; + } + if (client == -1) + rb_sys_fail("accept"); + } + return sock_for_fd(cSocket, client); +} + +/* non-blocking flag should be set on this socket before accept() is called */ +static VALUE unix_accept(VALUE io) +{ + int fd = my_fileno(io); + VALUE rv = my_accept(fd, NULL, NULL); + + if (! NIL_P(rv)) + rb_ivar_set(rv, iv_kgio_addr, localhost); + + return rv; +} + +/* non-blocking flag should be set on this socket before accept() is called */ +static VALUE tcp_accept(VALUE io) +{ + int fd = my_fileno(io); + struct sockaddr_in addr; + socklen_t addrlen = sizeof(struct sockaddr_in); + VALUE host; + const char *name; + VALUE rv = my_accept(fd, (struct sockaddr *)&addr, &addrlen); + + if (NIL_P(rv)) + return rv; + + host = rb_str_new(0, INET_ADDRSTRLEN); + addrlen = (socklen_t)INET_ADDRSTRLEN; + name = inet_ntop(AF_INET, &addr.sin_addr, RSTRING_PTR(host), addrlen); + if (name == NULL) + rb_sys_fail("inet_ntop"); + rb_str_set_len(host, strlen(name)); + rb_ivar_set(rv, iv_kgio_addr, host); + + return rv; +} + +static VALUE get_cloexec(VALUE mod) +{ + return (accept4_flags & SOCK_CLOEXEC) == SOCK_CLOEXEC ? Qtrue : Qfalse; +} + +static VALUE get_nonblock(VALUE mod) +{ + return (accept4_flags & SOCK_NONBLOCK)==SOCK_NONBLOCK ? Qtrue : Qfalse; +} + +static VALUE set_cloexec(VALUE mod, VALUE boolean) +{ + switch (TYPE(boolean)) { + case T_TRUE: + accept4_flags |= SOCK_CLOEXEC; + return boolean; + case T_FALSE: + accept4_flags &= ~SOCK_CLOEXEC; + return boolean; + } + rb_raise(rb_eTypeError, "not true or false"); + return Qnil; +} + +static VALUE set_nonblock(VALUE mod, VALUE boolean) +{ + switch (TYPE(boolean)) { + case T_TRUE: + accept4_flags |= SOCK_NONBLOCK; + return boolean; + case T_FALSE: + accept4_flags &= ~SOCK_NONBLOCK; + return boolean; + } + rb_raise(rb_eTypeError, "not true or false"); + return Qnil; +} + +static VALUE +my_connect(VALUE klass, int domain, void *addr, socklen_t addrlen) +{ + int rc; + int fd = socket(domain, SOCK_STREAM, 0); + + if (fd == -1) { + switch (errno) { + case EMFILE: + case ENFILE: +#ifdef ENOBUFS + case ENOBUFS: +#endif /* ENOBUFS */ + errno = 0; + rb_gc(); + fd = socket(domain, SOCK_STREAM, 0); + } + if (fd == -1) + rb_sys_fail("socket"); + } + set_nonblocking(fd); + rc = connect(fd, addr, addrlen); + if (rc == -1) { + if (errno == EINPROGRESS) { + VALUE io = sock_for_fd(klass, fd); + + (void)maybe_wait_writable(io); + return io; + } + rb_sys_fail("connect"); + } + return sock_for_fd(klass, fd); +} + +/* + * call-seq: + * + * Kgio::TCPSocket.new('127.0.0.1', 80) -> socket + * + * Creates a new Kgio::TCPSocket object and initiates a + * non-blocking connection. The caller should select/poll + * on the socket for writability before attempting to write + * or optimistically attempt a write and handle Kgio::WaitWritable + * or Errno::EAGAIN. + * + * Unlike the TCPSocket.new in Ruby, this does NOT perform DNS + * lookups (which is subject to a different set of timeouts and + * best handled elsewhere). + * + * This is only intended as a convenience for testing, + * Kgio::Socket.new (along with a cached/memoized addr argument) + * is recommended for applications that repeatedly connect to + * the same backend servers. + */ +static VALUE kgio_tcp_connect(VALUE klass, VALUE ip, VALUE port) +{ + struct sockaddr_in addr = { 0 }; + + addr.sin_family = AF_INET; + addr.sin_port = htons((unsigned short)NUM2INT(port)); + + switch (inet_pton(AF_INET, StringValuePtr(ip), &addr.sin_addr)) { + case 1: + return my_connect(klass, PF_INET, &addr, sizeof(addr)); + case -1: + rb_sys_fail("inet_pton"); + } + rb_raise(rb_eArgError, "invalid address: %s", + StringValuePtr(ip)); + return Qnil; +} + +/* + * call-seq: + * + * Kgio::UNIXSocket.new("/path/to/unix/socket") -> socket + * + * Creates a new Kgio::UNIXSocket object and initiates a + * non-blocking connection. The caller should select/poll + * on the socket for writability before attempting to write + * or optimistically attempt a write and handle Kgio::WaitWritable + * or Errno::EAGAIN. + * + * This is only intended as a convenience for testing, + * Kgio::Socket.new (along with a cached/memoized addr argument) + * is recommended for applications that repeatedly connect to + * the same backend servers. + */ +static VALUE kgio_unix_connect(VALUE klass, VALUE path) +{ + struct sockaddr_un addr = { 0 }; + long len; + + StringValue(path); + len = RSTRING_LEN(path); + if (sizeof(addr.sun_path) <= len) + rb_raise(rb_eArgError, + "too long unix socket path (max: %dbytes)", + (int)sizeof(addr.sun_path)-1); + + memcpy(addr.sun_path, RSTRING_PTR(path), len); + addr.sun_family = AF_UNIX; + + return my_connect(klass, PF_UNIX, &addr, sizeof(addr)); +} + +/* + * call-seq: + * + * addr = Socket.pack_sockaddr_in(80, 'example.com') + * Kgio::Socket.new(addr) -> socket + * + * addr = Socket.pack_sockaddr_un("/tmp/unix.sock") + * Kgio::Socket.new(addr) -> socket + * + * Generic connect method for addr generated by Socket.pack_sockaddr_in + * or Socket.pack_sockaddr_un + */ +static VALUE kgio_connect(VALUE klass, VALUE addr) +{ + int domain; + socklen_t addrlen; + struct sockaddr *sockaddr; + + if (TYPE(addr) == T_STRING) { + sockaddr = (struct sockaddr *)(RSTRING_PTR(addr)); + addrlen = (socklen_t)RSTRING_LEN(addr); + } else { + rb_raise(rb_eTypeError, "invalid address"); + } + switch (((struct sockaddr_in *)(sockaddr))->sin_family) { + case AF_UNIX: domain = PF_UNIX; break; + case AF_INET: domain = PF_INET; break; +#ifdef AF_INET6 /* IPv6 support incomplete */ + case AF_INET6: domain = PF_INET6; break; +#endif /* AF_INET6 */ + default: + rb_raise(rb_eArgError, "invalid address family"); + } + + return my_connect(klass, domain, sockaddr, addrlen); +} + +void Init_kgio_ext(void) +{ + VALUE mKgio = rb_define_module("Kgio"); + VALUE mPipeMethods, mSocketMethods; + VALUE cUNIXServer, cTCPServer, cUNIXSocket, cTCPSocket; + + rb_require("socket"); + cSocket = rb_const_get(rb_cObject, rb_intern("Socket")); + cSocket = rb_define_class_under(mKgio, "Socket", cSocket); + + localhost = rb_str_new2("127.0.0.1"); + rb_const_set(mKgio, rb_intern("LOCALHOST"), localhost); + + /* + * The kgio_read method will return this when waiting for + * a read is required. + */ + mKgio_WaitReadable = rb_define_module_under(mKgio, "WaitReadable"); + + /* + * The kgio_write method will return this when waiting for + * a write is required. + */ + mKgio_WaitWritable = rb_define_module_under(mKgio, "WaitWritable"); + + rb_define_singleton_method(mKgio, "wait_readable=", set_wait_rd, 1); + rb_define_singleton_method(mKgio, "wait_writable=", set_wait_wr, 1); + rb_define_singleton_method(mKgio, "wait_readable", wait_rd, 0); + rb_define_singleton_method(mKgio, "wait_writable", wait_wr, 0); + rb_define_singleton_method(mKgio, "accept_cloexec?", get_cloexec, 0); + rb_define_singleton_method(mKgio, "accept_cloexec=", set_cloexec, 1); + rb_define_singleton_method(mKgio, "accept_nonblock?", get_nonblock, 0); + rb_define_singleton_method(mKgio, "accept_nonblock=", set_nonblock, 1); + + mPipeMethods = rb_define_module_under(mKgio, "PipeMethods"); + rb_define_method(mPipeMethods, "kgio_read", kgio_read, -1); + rb_define_method(mPipeMethods, "kgio_write", kgio_write, 1); + + mSocketMethods = rb_define_module_under(mKgio, "SocketMethods"); + rb_define_method(mSocketMethods, "kgio_read", kgio_recv, -1); + rb_define_method(mSocketMethods, "kgio_write", kgio_send, 1); + + rb_define_attr(mSocketMethods, "kgio_addr", 1, 1); + rb_include_module(cSocket, mSocketMethods); + rb_define_singleton_method(cSocket, "new", kgio_connect, 1); + + cUNIXServer = rb_const_get(rb_cObject, rb_intern("UNIXServer")); + cUNIXServer = rb_define_class_under(mKgio, "UNIXServer", cUNIXServer); + rb_define_method(cUNIXServer, "kgio_accept", unix_accept, 0); + + cTCPServer = rb_const_get(rb_cObject, rb_intern("TCPServer")); + cTCPServer = rb_define_class_under(mKgio, "TCPServer", cTCPServer); + rb_define_method(cTCPServer, "kgio_accept", tcp_accept, 0); + + cTCPSocket = rb_const_get(rb_cObject, rb_intern("TCPSocket")); + cTCPSocket = rb_define_class_under(mKgio, "TCPSocket", cTCPSocket); + rb_include_module(cTCPSocket, mSocketMethods); + rb_define_singleton_method(cTCPSocket, "new", kgio_tcp_connect, 2); + + cUNIXSocket = rb_const_get(rb_cObject, rb_intern("UNIXSocket")); + cUNIXSocket = rb_define_class_under(mKgio, "UNIXSocket", cUNIXSocket); + rb_include_module(cUNIXSocket, mSocketMethods); + rb_define_singleton_method(cUNIXSocket, "new", kgio_unix_connect, 1); + + iv_kgio_addr = rb_intern("@kgio_addr"); + id_ruby = rb_intern("ruby"); + init_sock_for_fd(); +} diff --git a/kgio.gemspec b/kgio.gemspec new file mode 100644 index 0000000..285f065 --- /dev/null +++ b/kgio.gemspec @@ -0,0 +1,36 @@ +ENV["VERSION"] or abort "VERSION= must be specified" +manifest = File.readlines('.manifest').map! { |x| x.chomp! } +summary = File.readlines("README")[0].gsub(/\A=\s+\S+[^\w]+/, '').strip +description = File.read("README").split(/\n\n/)[1].strip + +Gem::Specification.new do |s| + s.name = %q{kgio} + s.version = ENV["VERSION"] + + s.homepage = 'http://unicorn.bogomips.org/kgio/' + s.authors = ["kgio hackers"] + s.date = Time.now.utc.strftime('%Y-%m-%d') + s.description = description + s.email = %q{mongrel-unicorn@rubyforge.org} + + s.extra_rdoc_files = File.readlines('.document').map! do |x| + x.chomp! + if File.directory?(x) + manifest.grep(%r{\A#{x}/}) + elsif File.file?(x) + x + else + nil + end + end.flatten.compact + + s.files = manifest + s.rdoc_options = [ "-t", summary ] + s.require_paths = %w(lib ext) + s.rubyforge_project = %q{rainbows} + s.summary = summary + s.test_files = Dir['test/test_*.rb'] + s.extensions = %w(ext/kgio/extconf.rb) + + # s.license = %w(GPL Ruby) # disabled for compatibility with older RubyGems +end diff --git a/lib/kgio.rb b/lib/kgio.rb new file mode 100644 index 0000000..d8b8a35 --- /dev/null +++ b/lib/kgio.rb @@ -0,0 +1,10 @@ +require 'kgio_ext' + +# use Kgio::Pipe.popen and Kgio::Pipe.new instead of IO.popen +# and IO.pipe to get kgio_read and kgio_write methods. +class Kgio::Pipe < IO + include Kgio::PipeMethods + class << self + alias new pipe + end +end diff --git a/setup.rb b/setup.rb new file mode 100644 index 0000000..5eb5006 --- /dev/null +++ b/setup.rb @@ -0,0 +1,1586 @@ +# -*- encoding: binary -*- +# +# setup.rb +# +# Copyright (c) 2000-2005 Minero Aoki +# +# This program is free software. +# You can distribute/modify this program under the terms of +# the GNU LGPL, Lesser General Public License version 2.1. +# + +unless Enumerable.method_defined?(:map) # Ruby 1.4.6 + module Enumerable + alias map collect + end +end + +unless File.respond_to?(:read) # Ruby 1.6 + def File.read(fname) + open(fname) {|f| + return f.read + } + end +end + +unless Errno.const_defined?(:ENOTEMPTY) # Windows? + module Errno + class ENOTEMPTY + # We do not raise this exception, implementation is not needed. + end + end +end + +def File.binread(fname) + open(fname, 'rb') {|f| + return f.read + } +end + +# for corrupted Windows' stat(2) +def File.dir?(path) + File.directory?((path[-1,1] == '/') ? path : path + '/') +end + + +class ConfigTable + + include Enumerable + + def initialize(rbconfig) + @rbconfig = rbconfig + @items = [] + @table = {} + # options + @install_prefix = nil + @config_opt = nil + @verbose = true + @no_harm = false + end + + attr_accessor :install_prefix + attr_accessor :config_opt + + attr_writer :verbose + + def verbose? + @verbose + end + + attr_writer :no_harm + + def no_harm? + @no_harm + end + + def [](key) + lookup(key).resolve(self) + end + + def []=(key, val) + lookup(key).set val + end + + def names + @items.map {|i| i.name } + end + + def each(&block) + @items.each(&block) + end + + def key?(name) + @table.key?(name) + end + + def lookup(name) + @table[name] or setup_rb_error "no such config item: #{name}" + end + + def add(item) + @items.push item + @table[item.name] = item + end + + def remove(name) + item = lookup(name) + @items.delete_if {|i| i.name == name } + @table.delete_if {|name, i| i.name == name } + item + end + + def load_script(path, inst = nil) + if File.file?(path) + MetaConfigEnvironment.new(self, inst).instance_eval File.read(path), path + end + end + + def savefile + '.config' + end + + def load_savefile + begin + File.foreach(savefile()) do |line| + k, v = *line.split(/=/, 2) + self[k] = v.strip + end + rescue Errno::ENOENT + setup_rb_error $!.message + "\n#{File.basename($0)} config first" + end + end + + def save + @items.each {|i| i.value } + File.open(savefile(), 'w') {|f| + @items.each do |i| + f.printf "%s=%s\n", i.name, i.value if i.value? and i.value + end + } + end + + def load_standard_entries + standard_entries(@rbconfig).each do |ent| + add ent + end + end + + def standard_entries(rbconfig) + c = rbconfig + + rubypath = File.join(c['bindir'], c['ruby_install_name'] + c['EXEEXT']) + + major = c['MAJOR'].to_i + minor = c['MINOR'].to_i + teeny = c['TEENY'].to_i + version = "#{major}.#{minor}" + + # ruby ver. >= 1.4.4? + newpath_p = ((major >= 2) or + ((major == 1) and + ((minor >= 5) or + ((minor == 4) and (teeny >= 4))))) + + if c['rubylibdir'] + # V > 1.6.3 + libruby = "#{c['prefix']}/lib/ruby" + librubyver = c['rubylibdir'] + librubyverarch = c['archdir'] + siteruby = c['sitedir'] + siterubyver = c['sitelibdir'] + siterubyverarch = c['sitearchdir'] + elsif newpath_p + # 1.4.4 <= V <= 1.6.3 + libruby = "#{c['prefix']}/lib/ruby" + librubyver = "#{c['prefix']}/lib/ruby/#{version}" + librubyverarch = "#{c['prefix']}/lib/ruby/#{version}/#{c['arch']}" + siteruby = c['sitedir'] + siterubyver = "$siteruby/#{version}" + siterubyverarch = "$siterubyver/#{c['arch']}" + else + # V < 1.4.4 + libruby = "#{c['prefix']}/lib/ruby" + librubyver = "#{c['prefix']}/lib/ruby/#{version}" + librubyverarch = "#{c['prefix']}/lib/ruby/#{version}/#{c['arch']}" + siteruby = "#{c['prefix']}/lib/ruby/#{version}/site_ruby" + siterubyver = siteruby + siterubyverarch = "$siterubyver/#{c['arch']}" + end + parameterize = lambda {|path| + path.sub(/\A#{Regexp.quote(c['prefix'])}/, '$prefix') + } + + if arg = c['configure_args'].split.detect {|arg| /--with-make-prog=/ =~ arg } + makeprog = arg.sub(/'/, '').split(/=/, 2)[1] + else + makeprog = 'make' + end + + [ + ExecItem.new('installdirs', 'std/site/home', + 'std: install under libruby; site: install under site_ruby; home: install under $HOME')\ + {|val, table| + case val + when 'std' + table['rbdir'] = '$librubyver' + table['sodir'] = '$librubyverarch' + when 'site' + table['rbdir'] = '$siterubyver' + table['sodir'] = '$siterubyverarch' + when 'home' + setup_rb_error '$HOME was not set' unless ENV['HOME'] + table['prefix'] = ENV['HOME'] + table['rbdir'] = '$libdir/ruby' + table['sodir'] = '$libdir/ruby' + end + }, + PathItem.new('prefix', 'path', c['prefix'], + 'path prefix of target environment'), + PathItem.new('bindir', 'path', parameterize.call(c['bindir']), + 'the directory for commands'), + PathItem.new('libdir', 'path', parameterize.call(c['libdir']), + 'the directory for libraries'), + PathItem.new('datadir', 'path', parameterize.call(c['datadir']), + 'the directory for shared data'), + PathItem.new('mandir', 'path', parameterize.call(c['mandir']), + 'the directory for man pages'), + PathItem.new('sysconfdir', 'path', parameterize.call(c['sysconfdir']), + 'the directory for system configuration files'), + PathItem.new('localstatedir', 'path', parameterize.call(c['localstatedir']), + 'the directory for local state data'), + PathItem.new('libruby', 'path', libruby, + 'the directory for ruby libraries'), + PathItem.new('librubyver', 'path', librubyver, + 'the directory for standard ruby libraries'), + PathItem.new('librubyverarch', 'path', librubyverarch, + 'the directory for standard ruby extensions'), + PathItem.new('siteruby', 'path', siteruby, + 'the directory for version-independent aux ruby libraries'), + PathItem.new('siterubyver', 'path', siterubyver, + 'the directory for aux ruby libraries'), + PathItem.new('siterubyverarch', 'path', siterubyverarch, + 'the directory for aux ruby binaries'), + PathItem.new('rbdir', 'path', '$siterubyver', + 'the directory for ruby scripts'), + PathItem.new('sodir', 'path', '$siterubyverarch', + 'the directory for ruby extentions'), + PathItem.new('rubypath', 'path', rubypath, + 'the path to set to #! line'), + ProgramItem.new('rubyprog', 'name', rubypath, + 'the ruby program using for installation'), + ProgramItem.new('makeprog', 'name', makeprog, + 'the make program to compile ruby extentions'), + SelectItem.new('shebang', 'all/ruby/never', 'ruby', + 'shebang line (#!) editing mode'), + BoolItem.new('without-ext', 'yes/no', 'no', + 'does not compile/install ruby extentions') + ] + end + private :standard_entries + + def load_multipackage_entries + multipackage_entries().each do |ent| + add ent + end + end + + def multipackage_entries + [ + PackageSelectionItem.new('with', 'name,name...', '', 'ALL', + 'package names that you want to install'), + PackageSelectionItem.new('without', 'name,name...', '', 'NONE', + 'package names that you do not want to install') + ] + end + private :multipackage_entries + + ALIASES = { + 'std-ruby' => 'librubyver', + 'stdruby' => 'librubyver', + 'rubylibdir' => 'librubyver', + 'archdir' => 'librubyverarch', + 'site-ruby-common' => 'siteruby', # For backward compatibility + 'site-ruby' => 'siterubyver', # For backward compatibility + 'bin-dir' => 'bindir', + 'bin-dir' => 'bindir', + 'rb-dir' => 'rbdir', + 'so-dir' => 'sodir', + 'data-dir' => 'datadir', + 'ruby-path' => 'rubypath', + 'ruby-prog' => 'rubyprog', + 'ruby' => 'rubyprog', + 'make-prog' => 'makeprog', + 'make' => 'makeprog' + } + + def fixup + ALIASES.each do |ali, name| + @table[ali] = @table[name] + end + @items.freeze + @table.freeze + @options_re = /\A--(#{@table.keys.join('|')})(?:=(.*))?\z/ + end + + def parse_opt(opt) + m = @options_re.match(opt) or setup_rb_error "config: unknown option #{opt}" + m.to_a[1,2] + end + + def dllext + @rbconfig['DLEXT'] + end + + def value_config?(name) + lookup(name).value? + end + + class Item + def initialize(name, template, default, desc) + @name = name.freeze + @template = template + @value = default + @default = default + @description = desc + end + + attr_reader :name + attr_reader :description + + attr_accessor :default + alias help_default default + + def help_opt + "--#{@name}=#{@template}" + end + + def value? + true + end + + def value + @value + end + + def resolve(table) + @value.gsub(%r<\$([^/]+)>) { table[$1] } + end + + def set(val) + @value = check(val) + end + + private + + def check(val) + setup_rb_error "config: --#{name} requires argument" unless val + val + end + end + + class BoolItem < Item + def config_type + 'bool' + end + + def help_opt + "--#{@name}" + end + + private + + def check(val) + return 'yes' unless val + case val + when /\Ay(es)?\z/i, /\At(rue)?\z/i then 'yes' + when /\An(o)?\z/i, /\Af(alse)\z/i then 'no' + else + setup_rb_error "config: --#{@name} accepts only yes/no for argument" + end + end + end + + class PathItem < Item + def config_type + 'path' + end + + private + + def check(path) + setup_rb_error "config: --#{@name} requires argument" unless path + path[0,1] == '$' ? path : File.expand_path(path) + end + end + + class ProgramItem < Item + def config_type + 'program' + end + end + + class SelectItem < Item + def initialize(name, selection, default, desc) + super + @ok = selection.split('/') + end + + def config_type + 'select' + end + + private + + def check(val) + unless @ok.include?(val.strip) + setup_rb_error "config: use --#{@name}=#{@template} (#{val})" + end + val.strip + end + end + + class ExecItem < Item + def initialize(name, selection, desc, &block) + super name, selection, nil, desc + @ok = selection.split('/') + @action = block + end + + def config_type + 'exec' + end + + def value? + false + end + + def resolve(table) + setup_rb_error "$#{name()} wrongly used as option value" + end + + undef set + + def evaluate(val, table) + v = val.strip.downcase + unless @ok.include?(v) + setup_rb_error "invalid option --#{@name}=#{val} (use #{@template})" + end + @action.call v, table + end + end + + class PackageSelectionItem < Item + def initialize(name, template, default, help_default, desc) + super name, template, default, desc + @help_default = help_default + end + + attr_reader :help_default + + def config_type + 'package' + end + + private + + def check(val) + unless File.dir?("packages/#{val}") + setup_rb_error "config: no such package: #{val}" + end + val + end + end + + class MetaConfigEnvironment + def initialize(config, installer) + @config = config + @installer = installer + end + + def config_names + @config.names + end + + def config?(name) + @config.key?(name) + end + + def bool_config?(name) + @config.lookup(name).config_type == 'bool' + end + + def path_config?(name) + @config.lookup(name).config_type == 'path' + end + + def value_config?(name) + @config.lookup(name).config_type != 'exec' + end + + def add_config(item) + @config.add item + end + + def add_bool_config(name, default, desc) + @config.add BoolItem.new(name, 'yes/no', default ? 'yes' : 'no', desc) + end + + def add_path_config(name, default, desc) + @config.add PathItem.new(name, 'path', default, desc) + end + + def set_config_default(name, default) + @config.lookup(name).default = default + end + + def remove_config(name) + @config.remove(name) + end + + # For only multipackage + def packages + raise '[setup.rb fatal] multi-package metaconfig API packages() called for single-package; contact application package vendor' unless @installer + @installer.packages + end + + # For only multipackage + def declare_packages(list) + raise '[setup.rb fatal] multi-package metaconfig API declare_packages() called for single-package; contact application package vendor' unless @installer + @installer.packages = list + end + end + +end # class ConfigTable + + +# This module requires: #verbose?, #no_harm? +module FileOperations + + def mkdir_p(dirname, prefix = nil) + dirname = prefix + File.expand_path(dirname) if prefix + $stderr.puts "mkdir -p #{dirname}" if verbose? + return if no_harm? + + # Does not check '/', it's too abnormal. + dirs = File.expand_path(dirname).split(%r<(?=/)>) + if /\A[a-z]:\z/i =~ dirs[0] + disk = dirs.shift + dirs[0] = disk + dirs[0] + end + dirs.each_index do |idx| + path = dirs[0..idx].join('') + Dir.mkdir path unless File.dir?(path) + end + end + + def rm_f(path) + $stderr.puts "rm -f #{path}" if verbose? + return if no_harm? + force_remove_file path + end + + def rm_rf(path) + $stderr.puts "rm -rf #{path}" if verbose? + return if no_harm? + remove_tree path + end + + def remove_tree(path) + if File.symlink?(path) + remove_file path + elsif File.dir?(path) + remove_tree0 path + else + force_remove_file path + end + end + + def remove_tree0(path) + Dir.foreach(path) do |ent| + next if ent == '.' + next if ent == '..' + entpath = "#{path}/#{ent}" + if File.symlink?(entpath) + remove_file entpath + elsif File.dir?(entpath) + remove_tree0 entpath + else + force_remove_file entpath + end + end + begin + Dir.rmdir path + rescue Errno::ENOTEMPTY + # directory may not be empty + end + end + + def move_file(src, dest) + force_remove_file dest + begin + File.rename src, dest + rescue + File.open(dest, 'wb') {|f| + f.write File.binread(src) + } + File.chmod File.stat(src).mode, dest + File.unlink src + end + end + + def force_remove_file(path) + begin + remove_file path + rescue + end + end + + def remove_file(path) + File.chmod 0777, path + File.unlink path + end + + def install(from, dest, mode, prefix = nil) + $stderr.puts "install #{from} #{dest}" if verbose? + return if no_harm? + + realdest = prefix ? prefix + File.expand_path(dest) : dest + realdest = File.join(realdest, File.basename(from)) if File.dir?(realdest) + str = File.binread(from) + if diff?(str, realdest) + verbose_off { + rm_f realdest if File.exist?(realdest) + } + File.open(realdest, 'wb') {|f| + f.write str + } + File.chmod mode, realdest + + File.open("#{objdir_root()}/InstalledFiles", 'a') {|f| + if prefix + f.puts realdest.sub(prefix, '') + else + f.puts realdest + end + } + end + end + + def diff?(new_content, path) + return true unless File.exist?(path) + new_content != File.binread(path) + end + + def command(*args) + $stderr.puts args.join(' ') if verbose? + system(*args) or raise RuntimeError, + "system(#{args.map{|a| a.inspect }.join(' ')}) failed" + end + + def ruby(*args) + command config('rubyprog'), *args + end + + def make(task = nil) + command(*[config('makeprog'), task].compact) + end + + def extdir?(dir) + File.exist?("#{dir}/MANIFEST") or File.exist?("#{dir}/extconf.rb") + end + + def files_of(dir) + Dir.open(dir) {|d| + return d.select {|ent| File.file?("#{dir}/#{ent}") } + } + end + + DIR_REJECT = %w( . .. CVS SCCS RCS CVS.adm .svn ) + + def directories_of(dir) + Dir.open(dir) {|d| + return d.select {|ent| File.dir?("#{dir}/#{ent}") } - DIR_REJECT + } + end + +end + + +# This module requires: #srcdir_root, #objdir_root, #relpath +module HookScriptAPI + + def get_config(key) + @config[key] + end + + alias config get_config + + # obsolete: use metaconfig to change configuration + def set_config(key, val) + @config[key] = val + end + + # + # srcdir/objdir (works only in the package directory) + # + + def curr_srcdir + "#{srcdir_root()}/#{relpath()}" + end + + def curr_objdir + "#{objdir_root()}/#{relpath()}" + end + + def srcfile(path) + "#{curr_srcdir()}/#{path}" + end + + def srcexist?(path) + File.exist?(srcfile(path)) + end + + def srcdirectory?(path) + File.dir?(srcfile(path)) + end + + def srcfile?(path) + File.file?(srcfile(path)) + end + + def srcentries(path = '.') + Dir.open("#{curr_srcdir()}/#{path}") {|d| + return d.to_a - %w(. ..) + } + end + + def srcfiles(path = '.') + srcentries(path).select {|fname| + File.file?(File.join(curr_srcdir(), path, fname)) + } + end + + def srcdirectories(path = '.') + srcentries(path).select {|fname| + File.dir?(File.join(curr_srcdir(), path, fname)) + } + end + +end + + +class ToplevelInstaller + + Version = '3.4.1' + Copyright = 'Copyright (c) 2000-2005 Minero Aoki' + + TASKS = [ + [ 'all', 'do config, setup, then install' ], + [ 'config', 'saves your configurations' ], + [ 'show', 'shows current configuration' ], + [ 'setup', 'compiles ruby extentions and others' ], + [ 'install', 'installs files' ], + [ 'test', 'run all tests in test/' ], + [ 'clean', "does `make clean' for each extention" ], + [ 'distclean',"does `make distclean' for each extention" ] + ] + + def ToplevelInstaller.invoke + config = ConfigTable.new(load_rbconfig()) + config.load_standard_entries + config.load_multipackage_entries if multipackage? + config.fixup + klass = (multipackage?() ? ToplevelInstallerMulti : ToplevelInstaller) + klass.new(File.dirname($0), config).invoke + end + + def ToplevelInstaller.multipackage? + File.dir?(File.dirname($0) + '/packages') + end + + def ToplevelInstaller.load_rbconfig + if arg = ARGV.detect {|arg| /\A--rbconfig=/ =~ arg } + ARGV.delete(arg) + load File.expand_path(arg.split(/=/, 2)[1]) + $".push 'rbconfig.rb' + else + require 'rbconfig' + end + ::Config::CONFIG + end + + def initialize(ardir_root, config) + @ardir = File.expand_path(ardir_root) + @config = config + # cache + @valid_task_re = nil + end + + def config(key) + @config[key] + end + + def inspect + "#<#{self.class} #{__id__()}>" + end + + def invoke + run_metaconfigs + case task = parsearg_global() + when nil, 'all' + parsearg_config + init_installers + exec_config + exec_setup + exec_install + else + case task + when 'config', 'test' + ; + when 'clean', 'distclean' + @config.load_savefile if File.exist?(@config.savefile) + else + @config.load_savefile + end + __send__ "parsearg_#{task}" + init_installers + __send__ "exec_#{task}" + end + end + + def run_metaconfigs + @config.load_script "#{@ardir}/metaconfig" + end + + def init_installers + @installer = Installer.new(@config, @ardir, File.expand_path('.')) + end + + # + # Hook Script API bases + # + + def srcdir_root + @ardir + end + + def objdir_root + '.' + end + + def relpath + '.' + end + + # + # Option Parsing + # + + def parsearg_global + while arg = ARGV.shift + case arg + when /\A\w+\z/ + setup_rb_error "invalid task: #{arg}" unless valid_task?(arg) + return arg + when '-q', '--quiet' + @config.verbose = false + when '--verbose' + @config.verbose = true + when '--help' + print_usage $stdout + exit 0 + when '--version' + puts "#{File.basename($0)} version #{Version}" + exit 0 + when '--copyright' + puts Copyright + exit 0 + else + setup_rb_error "unknown global option '#{arg}'" + end + end + nil + end + + def valid_task?(t) + valid_task_re() =~ t + end + + def valid_task_re + @valid_task_re ||= /\A(?:#{TASKS.map {|task,desc| task }.join('|')})\z/ + end + + def parsearg_no_options + unless ARGV.empty? + task = caller(0).first.slice(%r<`parsearg_(\w+)'>, 1) + setup_rb_error "#{task}: unknown options: #{ARGV.join(' ')}" + end + end + + alias parsearg_show parsearg_no_options + alias parsearg_setup parsearg_no_options + alias parsearg_test parsearg_no_options + alias parsearg_clean parsearg_no_options + alias parsearg_distclean parsearg_no_options + + def parsearg_config + evalopt = [] + set = [] + @config.config_opt = [] + while i = ARGV.shift + if /\A--?\z/ =~ i + @config.config_opt = ARGV.dup + break + end + name, value = *@config.parse_opt(i) + if @config.value_config?(name) + @config[name] = value + else + evalopt.push [name, value] + end + set.push name + end + evalopt.each do |name, value| + @config.lookup(name).evaluate value, @config + end + # Check if configuration is valid + set.each do |n| + @config[n] if @config.value_config?(n) + end + end + + def parsearg_install + @config.no_harm = false + @config.install_prefix = '' + while a = ARGV.shift + case a + when '--no-harm' + @config.no_harm = true + when /\A--prefix=/ + path = a.split(/=/, 2)[1] + path = File.expand_path(path) unless path[0,1] == '/' + @config.install_prefix = path + else + setup_rb_error "install: unknown option #{a}" + end + end + end + + def print_usage(out) + out.puts 'Typical Installation Procedure:' + out.puts " $ ruby #{File.basename $0} config" + out.puts " $ ruby #{File.basename $0} setup" + out.puts " # ruby #{File.basename $0} install (may require root privilege)" + out.puts + out.puts 'Detailed Usage:' + out.puts " ruby #{File.basename $0} <global option>" + out.puts " ruby #{File.basename $0} [<global options>] <task> [<task options>]" + + fmt = " %-24s %s\n" + out.puts + out.puts 'Global options:' + out.printf fmt, '-q,--quiet', 'suppress message outputs' + out.printf fmt, ' --verbose', 'output messages verbosely' + out.printf fmt, ' --help', 'print this message' + out.printf fmt, ' --version', 'print version and quit' + out.printf fmt, ' --copyright', 'print copyright and quit' + out.puts + out.puts 'Tasks:' + TASKS.each do |name, desc| + out.printf fmt, name, desc + end + + fmt = " %-24s %s [%s]\n" + out.puts + out.puts 'Options for CONFIG or ALL:' + @config.each do |item| + out.printf fmt, item.help_opt, item.description, item.help_default + end + out.printf fmt, '--rbconfig=path', 'rbconfig.rb to load',"running ruby's" + out.puts + out.puts 'Options for INSTALL:' + out.printf fmt, '--no-harm', 'only display what to do if given', 'off' + out.printf fmt, '--prefix=path', 'install path prefix', '' + out.puts + end + + # + # Task Handlers + # + + def exec_config + @installer.exec_config + @config.save # must be final + end + + def exec_setup + @installer.exec_setup + end + + def exec_install + @installer.exec_install + end + + def exec_test + @installer.exec_test + end + + def exec_show + @config.each do |i| + printf "%-20s %s\n", i.name, i.value if i.value? + end + end + + def exec_clean + @installer.exec_clean + end + + def exec_distclean + @installer.exec_distclean + end + +end # class ToplevelInstaller + + +class ToplevelInstallerMulti < ToplevelInstaller + + include FileOperations + + def initialize(ardir_root, config) + super + @packages = directories_of("#{@ardir}/packages") + raise 'no package exists' if @packages.empty? + @root_installer = Installer.new(@config, @ardir, File.expand_path('.')) + end + + def run_metaconfigs + @config.load_script "#{@ardir}/metaconfig", self + @packages.each do |name| + @config.load_script "#{@ardir}/packages/#{name}/metaconfig" + end + end + + attr_reader :packages + + def packages=(list) + raise 'package list is empty' if list.empty? + list.each do |name| + raise "directory packages/#{name} does not exist"\ + unless File.dir?("#{@ardir}/packages/#{name}") + end + @packages = list + end + + def init_installers + @installers = {} + @packages.each do |pack| + @installers[pack] = Installer.new(@config, + "#{@ardir}/packages/#{pack}", + "packages/#{pack}") + end + with = extract_selection(config('with')) + without = extract_selection(config('without')) + @selected = @installers.keys.select {|name| + (with.empty? or with.include?(name)) \ + and not without.include?(name) + } + end + + def extract_selection(list) + a = list.split(/,/) + a.each do |name| + setup_rb_error "no such package: #{name}" unless @installers.key?(name) + end + a + end + + def print_usage(f) + super + f.puts 'Inluded packages:' + f.puts ' ' + @packages.sort.join(' ') + f.puts + end + + # + # Task Handlers + # + + def exec_config + run_hook 'pre-config' + each_selected_installers {|inst| inst.exec_config } + run_hook 'post-config' + @config.save # must be final + end + + def exec_setup + run_hook 'pre-setup' + each_selected_installers {|inst| inst.exec_setup } + run_hook 'post-setup' + end + + def exec_install + run_hook 'pre-install' + each_selected_installers {|inst| inst.exec_install } + run_hook 'post-install' + end + + def exec_test + run_hook 'pre-test' + each_selected_installers {|inst| inst.exec_test } + run_hook 'post-test' + end + + def exec_clean + rm_f @config.savefile + run_hook 'pre-clean' + each_selected_installers {|inst| inst.exec_clean } + run_hook 'post-clean' + end + + def exec_distclean + rm_f @config.savefile + run_hook 'pre-distclean' + each_selected_installers {|inst| inst.exec_distclean } + run_hook 'post-distclean' + end + + # + # lib + # + + def each_selected_installers + Dir.mkdir 'packages' unless File.dir?('packages') + @selected.each do |pack| + $stderr.puts "Processing the package `#{pack}' ..." if verbose? + Dir.mkdir "packages/#{pack}" unless File.dir?("packages/#{pack}") + Dir.chdir "packages/#{pack}" + yield @installers[pack] + Dir.chdir '../..' + end + end + + def run_hook(id) + @root_installer.run_hook id + end + + # module FileOperations requires this + def verbose? + @config.verbose? + end + + # module FileOperations requires this + def no_harm? + @config.no_harm? + end + +end # class ToplevelInstallerMulti + + +class Installer + + FILETYPES = %w( bin lib ext data conf man ) + + include FileOperations + include HookScriptAPI + + def initialize(config, srcroot, objroot) + @config = config + @srcdir = File.expand_path(srcroot) + @objdir = File.expand_path(objroot) + @currdir = '.' + end + + def inspect + "#<#{self.class} #{File.basename(@srcdir)}>" + end + + def noop(rel) + end + + # + # Hook Script API base methods + # + + def srcdir_root + @srcdir + end + + def objdir_root + @objdir + end + + def relpath + @currdir + end + + # + # Config Access + # + + # module FileOperations requires this + def verbose? + @config.verbose? + end + + # module FileOperations requires this + def no_harm? + @config.no_harm? + end + + def verbose_off + begin + save, @config.verbose = @config.verbose?, false + yield + ensure + @config.verbose = save + end + end + + # + # TASK config + # + + def exec_config + exec_task_traverse 'config' + end + + alias config_dir_bin noop + alias config_dir_lib noop + + def config_dir_ext(rel) + extconf if extdir?(curr_srcdir()) + end + + alias config_dir_data noop + alias config_dir_conf noop + alias config_dir_man noop + + def extconf + ruby "#{curr_srcdir()}/extconf.rb", *@config.config_opt + end + + # + # TASK setup + # + + def exec_setup + exec_task_traverse 'setup' + end + + def setup_dir_bin(rel) + files_of(curr_srcdir()).each do |fname| + update_shebang_line "#{curr_srcdir()}/#{fname}" + end + end + + alias setup_dir_lib noop + + def setup_dir_ext(rel) + make if extdir?(curr_srcdir()) + end + + alias setup_dir_data noop + alias setup_dir_conf noop + alias setup_dir_man noop + + def update_shebang_line(path) + return if no_harm? + return if config('shebang') == 'never' + old = Shebang.load(path) + if old + $stderr.puts "warning: #{path}: Shebang line includes too many args. It is not portable and your program may not work." if old.args.size > 1 + new = new_shebang(old) + return if new.to_s == old.to_s + else + return unless config('shebang') == 'all' + new = Shebang.new(config('rubypath')) + end + $stderr.puts "updating shebang: #{File.basename(path)}" if verbose? + open_atomic_writer(path) {|output| + File.open(path, 'rb') {|f| + f.gets if old # discard + output.puts new.to_s + output.print f.read + } + } + end + + def new_shebang(old) + if /\Aruby/ =~ File.basename(old.cmd) + Shebang.new(config('rubypath'), old.args) + elsif File.basename(old.cmd) == 'env' and old.args.first == 'ruby' + Shebang.new(config('rubypath'), old.args[1..-1]) + else + return old unless config('shebang') == 'all' + Shebang.new(config('rubypath')) + end + end + + def open_atomic_writer(path, &block) + tmpfile = File.basename(path) + '.tmp' + begin + File.open(tmpfile, 'wb', &block) + File.rename tmpfile, File.basename(path) + ensure + File.unlink tmpfile if File.exist?(tmpfile) + end + end + + class Shebang + def Shebang.load(path) + line = nil + File.open(path) {|f| + line = f.gets + } + return nil unless /\A#!/ =~ line + parse(line) + end + + def Shebang.parse(line) + cmd, *args = *line.strip.sub(/\A\#!/, '').split(' ') + new(cmd, args) + end + + def initialize(cmd, args = []) + @cmd = cmd + @args = args + end + + attr_reader :cmd + attr_reader :args + + def to_s + "#! #{@cmd}" + (@args.empty? ? '' : " #{@args.join(' ')}") + end + end + + # + # TASK install + # + + def exec_install + rm_f 'InstalledFiles' + exec_task_traverse 'install' + end + + def install_dir_bin(rel) + install_files targetfiles(), "#{config('bindir')}/#{rel}", 0755 + end + + def install_dir_lib(rel) + install_files libfiles(), "#{config('rbdir')}/#{rel}", 0644 + end + + def install_dir_ext(rel) + return unless extdir?(curr_srcdir()) + install_files rubyextentions('.'), + "#{config('sodir')}/#{File.dirname(rel)}", + 0555 + end + + def install_dir_data(rel) + install_files targetfiles(), "#{config('datadir')}/#{rel}", 0644 + end + + def install_dir_conf(rel) + # FIXME: should not remove current config files + # (rename previous file to .old/.org) + install_files targetfiles(), "#{config('sysconfdir')}/#{rel}", 0644 + end + + def install_dir_man(rel) + install_files targetfiles(), "#{config('mandir')}/#{rel}", 0644 + end + + def install_files(list, dest, mode) + mkdir_p dest, @config.install_prefix + list.each do |fname| + install fname, dest, mode, @config.install_prefix + end + end + + def libfiles + glob_reject(%w(*.y *.output), targetfiles()) + end + + def rubyextentions(dir) + ents = glob_select("*.#{@config.dllext}", targetfiles()) + if ents.empty? + setup_rb_error "no ruby extention exists: 'ruby #{$0} setup' first" + end + ents + end + + def targetfiles + mapdir(existfiles() - hookfiles()) + end + + def mapdir(ents) + ents.map {|ent| + if File.exist?(ent) + then ent # objdir + else "#{curr_srcdir()}/#{ent}" # srcdir + end + } + end + + # picked up many entries from cvs-1.11.1/src/ignore.c + JUNK_FILES = %w( + core RCSLOG tags TAGS .make.state + .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb + *~ *.old *.bak *.BAK *.orig *.rej _$* *$ + + *.org *.in .* + ) + + def existfiles + glob_reject(JUNK_FILES, (files_of(curr_srcdir()) | files_of('.'))) + end + + def hookfiles + %w( pre-%s post-%s pre-%s.rb post-%s.rb ).map {|fmt| + %w( config setup install clean ).map {|t| sprintf(fmt, t) } + }.flatten + end + + def glob_select(pat, ents) + re = globs2re([pat]) + ents.select {|ent| re =~ ent } + end + + def glob_reject(pats, ents) + re = globs2re(pats) + ents.reject {|ent| re =~ ent } + end + + GLOB2REGEX = { + '.' => '\.', + '$' => '\$', + '#' => '\#', + '*' => '.*' + } + + def globs2re(pats) + /\A(?:#{ + pats.map {|pat| pat.gsub(/[\.\$\#\*]/) {|ch| GLOB2REGEX[ch] } }.join('|') + })\z/ + end + + # + # TASK test + # + + TESTDIR = 'test' + + def exec_test + unless File.directory?('test') + $stderr.puts 'no test in this package' if verbose? + return + end + $stderr.puts 'Running tests...' if verbose? + begin + require 'test/unit' + rescue LoadError + setup_rb_error 'test/unit cannot loaded. You need Ruby 1.8 or later to invoke this task.' + end + runner = Test::Unit::AutoRunner.new(true) + runner.to_run << TESTDIR + runner.run + end + + # + # TASK clean + # + + def exec_clean + exec_task_traverse 'clean' + rm_f @config.savefile + rm_f 'InstalledFiles' + end + + alias clean_dir_bin noop + alias clean_dir_lib noop + alias clean_dir_data noop + alias clean_dir_conf noop + alias clean_dir_man noop + + def clean_dir_ext(rel) + return unless extdir?(curr_srcdir()) + make 'clean' if File.file?('Makefile') + end + + # + # TASK distclean + # + + def exec_distclean + exec_task_traverse 'distclean' + rm_f @config.savefile + rm_f 'InstalledFiles' + end + + alias distclean_dir_bin noop + alias distclean_dir_lib noop + + def distclean_dir_ext(rel) + return unless extdir?(curr_srcdir()) + make 'distclean' if File.file?('Makefile') + end + + alias distclean_dir_data noop + alias distclean_dir_conf noop + alias distclean_dir_man noop + + # + # Traversing + # + + def exec_task_traverse(task) + run_hook "pre-#{task}" + FILETYPES.each do |type| + if type == 'ext' and config('without-ext') == 'yes' + $stderr.puts 'skipping ext/* by user option' if verbose? + next + end + traverse task, type, "#{task}_dir_#{type}" + end + run_hook "post-#{task}" + end + + def traverse(task, rel, mid) + dive_into(rel) { + run_hook "pre-#{task}" + __send__ mid, rel.sub(%r[\A.*?(?:/|\z)], '') + directories_of(curr_srcdir()).each do |d| + traverse task, "#{rel}/#{d}", mid + end + run_hook "post-#{task}" + } + end + + def dive_into(rel) + return unless File.dir?("#{@srcdir}/#{rel}") + + dir = File.basename(rel) + Dir.mkdir dir unless File.dir?(dir) + prevdir = Dir.pwd + Dir.chdir dir + $stderr.puts '---> ' + rel if verbose? + @currdir = rel + yield + Dir.chdir prevdir + $stderr.puts '<--- ' + rel if verbose? + @currdir = File.dirname(rel) + end + + def run_hook(id) + path = [ "#{curr_srcdir()}/#{id}", + "#{curr_srcdir()}/#{id}.rb" ].detect {|cand| File.file?(cand) } + return unless path + begin + instance_eval File.read(path), path, 1 + rescue + raise if $DEBUG + setup_rb_error "hook #{path} failed:\n" + $!.message + end + end + +end # class Installer + + +class SetupError < StandardError; end + +def setup_rb_error(msg) + raise SetupError, msg +end + +if $0 == __FILE__ + begin + ToplevelInstaller.invoke + rescue SetupError + raise if $DEBUG + $stderr.puts $!.message + $stderr.puts "Try 'ruby #{$0} --help' for detailed usage." + exit 1 + end +end diff --git a/test/lib_read_write.rb b/test/lib_read_write.rb new file mode 100644 index 0000000..7fd24d5 --- /dev/null +++ b/test/lib_read_write.rb @@ -0,0 +1,152 @@ +require 'test/unit' +require 'io/nonblock' +$-w = true +require 'kgio' + +module LibReadWriteTest + def teardown + assert_nothing_raised do + @rd.close unless @rd.closed? + @wr.close unless @wr.closed? + end + assert_nothing_raised do + Kgio.wait_readable = Kgio.wait_writable = nil + end + end + + def test_read_eof + @wr.close + assert_raises(EOFError) { @rd.kgio_read 5 } + end + + def test_write_closed + @rd.close + assert_raises(Errno::EPIPE) { @wr.kgio_write "HI" } + end + + def test_write_conv + assert_equal nil, @wr.kgio_write(10) + assert_equal "10", @rd.kgio_read(2) + end + + def test_read_empty + assert_equal Kgio::WaitReadable, @rd.kgio_read(1) + end + + def test_read_too_much + assert_equal nil, @wr.kgio_write("hi") + assert_equal "hi", @rd.kgio_read(4) + end + + def test_read_short + assert_equal nil, @wr.kgio_write("hi") + assert_equal "h", @rd.kgio_read(1) + assert_equal "i", @rd.kgio_read(1) + end + + def test_read_extra_buf + tmp = "" + tmp_object_id = tmp.object_id + assert_equal nil, @wr.kgio_write("hi") + rv = @rd.kgio_read(2, tmp) + assert_equal "hi", rv + assert_equal rv.object_id, tmp.object_id + assert_equal tmp_object_id, rv.object_id + end + + def test_write_return_wait_writable + tmp = [] + tmp << @wr.kgio_write("HI") until tmp[-1] == Kgio::WaitWritable + assert_equal Kgio::WaitWritable, tmp.pop + assert tmp.size > 0 + penultimate = tmp.pop + assert(penultimate == "I" || penultimate == nil) + assert tmp.size > 0 + tmp.each { |count| assert_equal nil, count } + end + + def test_monster_write + buf = "." * 1024 * 1024 * 10 + rv = @wr.kgio_write(buf) + assert_kind_of String, rv + assert rv.size < buf.size + assert_equal(buf, (rv + @rd.read(buf.size - rv.size))) + end + + def test_wait_readable_ruby_default + def @rd.ruby + raise RuntimeError, "Hello" + end + assert_nothing_raised { Kgio.wait_readable = :ruby } + elapsed = 0 + foo = nil + t0 = Time.now + thr = Thread.new { sleep 1; @wr.write "HELLO" } + assert_nothing_raised do + foo = @rd.kgio_read(5) + elapsed = Time.now - t0 + end + assert elapsed >= 1.0 + assert_equal "HELLO", foo + thr.join + assert_equal 5, thr.value + end + + def test_wait_writable_ruby_default + def @wr.ruby + raise RuntimeError, "Hello" + end + buf = "." * 512 + nr = 0 + begin + nr += @wr.write_nonblock(buf) + rescue Errno::EAGAIN + break + end while true + assert_nothing_raised { Kgio.wait_writable = :ruby } + elapsed = 0 + foo = nil + t0 = Time.now + thr = Thread.new { sleep 1; @rd.readpartial(nr) } + assert_nothing_raised do + foo = @wr.kgio_write("HELLO") + elapsed = Time.now - t0 + end + assert_nil foo + assert elapsed >= 1.0 + assert(String === foo || foo == nil) + assert_kind_of String, thr.value + end + + def test_wait_readable_method + def @rd.moo + defined?(@z) ? raise(RuntimeError, "Hello") : @z = "HI" + end + assert_nothing_raised { Kgio.wait_readable = :moo } + foo = nil + begin + foo = @rd.kgio_read(5) + assert false + rescue RuntimeError => e + assert_equal("Hello", e.message) + end + assert_equal "HI", @rd.instance_variable_get(:@z) + assert_nil foo + end + + def test_wait_writable_method + def @wr.moo + defined?(@z) ? raise(RuntimeError, "Hello") : @z = "HI" + end + assert_nothing_raised { Kgio.wait_writable = :moo } + n = [] + begin + loop { n << @wr.kgio_write("HIHIHIHIHIHI") } + assert false + rescue RuntimeError => e + assert_equal("Hello", e.message) + end + assert n.size > 0 + assert_equal "HI", @wr.instance_variable_get(:@z) + end +end diff --git a/test/test_pipe_popen.rb b/test/test_pipe_popen.rb new file mode 100644 index 0000000..af72032 --- /dev/null +++ b/test/test_pipe_popen.rb @@ -0,0 +1,14 @@ +require 'test/unit' +require 'io/nonblock' +$-w = true +require 'kgio' + +class TestPipePopen < Test::Unit::TestCase + def test_popen + io = Kgio::Pipe.popen("sleep 1 && echo HI") + assert_equal Kgio::WaitReadable, io.kgio_read(2) + sleep 1.5 + assert_equal "HI\n", io.kgio_read(3) + assert_raises(EOFError) { io.kgio_read 5 } + end +end diff --git a/test/test_pipe_read_write.rb b/test/test_pipe_read_write.rb new file mode 100644 index 0000000..a200aeb --- /dev/null +++ b/test/test_pipe_read_write.rb @@ -0,0 +1,9 @@ +require './test/lib_read_write.rb' + +class TestKgioPipe < Test::Unit::TestCase + def setup + @rd, @wr = Kgio::Pipe.new + end + + include LibReadWriteTest +end diff --git a/test/test_socketpair_read_write.rb b/test/test_socketpair_read_write.rb new file mode 100644 index 0000000..611313a --- /dev/null +++ b/test/test_socketpair_read_write.rb @@ -0,0 +1,9 @@ +require './test/lib_read_write.rb' + +class TestKgioUNIXSocketPair < Test::Unit::TestCase + def setup + @rd, @wr = Kgio::UNIXSocket.pair + end + + include LibReadWriteTest +end diff --git a/test/test_tcp_connect.rb b/test/test_tcp_connect.rb new file mode 100644 index 0000000..028f852 --- /dev/null +++ b/test/test_tcp_connect.rb @@ -0,0 +1,56 @@ +require 'test/unit' +require 'io/nonblock' +$-w = true +require 'kgio' + +class SubSocket < Kgio::Socket + attr_accessor :foo + def wait_writable + @foo = "waited" + end +end + +class TestKgioTcpConnect < Test::Unit::TestCase + + def setup + @host = ENV["TEST_HOST"] || '127.0.0.1' + @srv = Kgio::TCPServer.new(@host, 0) + @port = @srv.addr[1] + @addr = Socket.pack_sockaddr_in(@port, @host) + end + + def teardown + @srv.close unless @srv.closed? + Kgio.accept_cloexec = true + Kgio.accept_nonblock = false + Kgio.wait_readable = Kgio.wait_writable = nil + end + + def test_new + sock = Kgio::Socket.new(@addr) + assert_kind_of Kgio::Socket, sock + ready = IO.select(nil, [ sock ]) + assert_equal sock, ready[1][0] + assert_equal nil, sock.kgio_write("HELLO") + end + + def test_tcp_socket_new_invalid + assert_raises(ArgumentError) { Kgio::TCPSocket.new('example.com', 80) } + assert_raises(ArgumentError) { Kgio::TCPSocket.new('999.999.999.999', 80) } + end + + def test_tcp_socket_new + sock = Kgio::TCPSocket.new(@host, @port) + assert_instance_of Kgio::TCPSocket, sock + ready = IO.select(nil, [ sock ]) + assert_equal sock, ready[1][0] + assert_equal nil, sock.kgio_write("HELLO") + end + + def test_wait_writable_set + Kgio::wait_writable = :wait_writable + sock = SubSocket.new(@addr) + assert_equal "waited", sock.foo + assert_equal nil, sock.kgio_write("HELLO") + end +end diff --git a/test/test_tcp_server.rb b/test/test_tcp_server.rb new file mode 100644 index 0000000..c2bb518 --- /dev/null +++ b/test/test_tcp_server.rb @@ -0,0 +1,31 @@ +require 'test/unit' +require 'io/nonblock' +$-w = true +require 'kgio' + +class TestKgioTCPServer < Test::Unit::TestCase + + def setup + @host = ENV["TEST_HOST"] || '127.0.0.1' + @srv = Kgio::TCPServer.new(@host, 0) + @port = @srv.addr[1] + end + + def teardown + @srv.close unless @srv.closed? + Kgio.accept_cloexec = true + Kgio.accept_nonblock = false + end + + def test_accept + a = TCPSocket.new(@host, @port) + b = @srv.kgio_accept + assert_kind_of Kgio::Socket, b + assert_equal @host, b.kgio_addr + end + + def test_accept_nonblock + @srv.nonblock = true + assert_equal nil, @srv.kgio_accept + end +end diff --git a/test/test_unix_connect.rb b/test/test_unix_connect.rb new file mode 100644 index 0000000..458149d --- /dev/null +++ b/test/test_unix_connect.rb @@ -0,0 +1,58 @@ +require 'test/unit' +require 'io/nonblock' +$-w = true +require 'kgio' +require 'tempfile' + +class SubSocket < Kgio::Socket + attr_accessor :foo + def wait_writable + @foo = "waited" + end +end + +class TestKgioUnixConnect < Test::Unit::TestCase + + def setup + tmp = Tempfile.new('kgio_unix') + @path = tmp.path + File.unlink(@path) + tmp.close rescue nil + @srv = Kgio::UNIXServer.new(@path) + @addr = Socket.pack_sockaddr_un(@path) + end + + def teardown + @srv.close unless @srv.closed? + File.unlink(@path) + Kgio.accept_cloexec = true + end + + def test_unix_socket_new_invalid + assert_raises(ArgumentError) { Kgio::UNIXSocket.new('*' * 1024 * 1024) } + end + + def test_unix_socket_new + sock = Kgio::UNIXSocket.new(@path) + assert_instance_of Kgio::UNIXSocket, sock + ready = IO.select(nil, [ sock ]) + assert_equal sock, ready[1][0] + assert_equal nil, sock.kgio_write("HELLO") + end + + def test_new + sock = Kgio::Socket.new(@addr) + assert_instance_of Kgio::Socket, sock + ready = IO.select(nil, [ sock ]) + assert_equal sock, ready[1][0] + assert_equal nil, sock.kgio_write("HELLO") + end + + def test_wait_writable_set + Kgio::wait_writable = :wait_writable + sock = SubSocket.new(@addr) + assert_kind_of Kgio::Socket, sock + assert_instance_of SubSocket, sock + assert_equal nil, sock.kgio_write("HELLO") + end +end diff --git a/test/test_unix_server.rb b/test/test_unix_server.rb new file mode 100644 index 0000000..91b91b8 --- /dev/null +++ b/test/test_unix_server.rb @@ -0,0 +1,34 @@ +require 'test/unit' +require 'io/nonblock' +$-w = true +require 'kgio' +require 'tempfile' + +class TestKgioUNIXServer < Test::Unit::TestCase + + def setup + tmp = Tempfile.new('kgio_unix') + @path = tmp.path + File.unlink(@path) + tmp.close rescue nil + @srv = Kgio::UNIXServer.new(@path) + end + + def teardown + @srv.close unless @srv.closed? + File.unlink(@path) + Kgio.accept_cloexec = true + end + + def test_accept + a = UNIXSocket.new(@path) + b = @srv.kgio_accept + assert_kind_of Kgio::Socket, b + assert_equal "127.0.0.1", b.kgio_addr + end + + def test_accept_nonblock + @srv.nonblock = true + assert_equal nil, @srv.kgio_accept + end +end |