clogger 0.8.0 → 0.9.0

data/.wrongdoc.yml

@@ -1,5 +1,5 @@
 ---
 rdoc_url: http://clogger.rubyforge.org/
-cgit_url: http://git.bogomips.org/cgit/clogger.git
-git_url: git://git.bogomips.org/clogger.git
+cgit_url: http://bogomips.org/clogger.git
+git_url: git://bogomips.org/clogger.git
 changelog_since: 0.4.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.8.0.GIT
+DEF_VER=v0.9.0.GIT
 
 LF='
 '

data/README

@@ -96,12 +96,12 @@ that receives a "<<" method:
 
 The latest development happens in git and is published to the following:
 
-   git://git.bogomips.org/clogger.git
+   git://bogomips.org/clogger.git
    git://repo.or.cz/clogger.git
 
 You may also browse and download snapshot tarballs:
 
-* http://git.bogomips.org/cgit/clogger.git (cgit)
+* http://bogomips.org/clogger.git (cgit)
 * http://repo.or.cz/w/clogger.git (gitweb)
 
 The mailing list (see below) is central for coordination and

data/Rakefile

@@ -5,8 +5,8 @@ rescue LoadError
   warn "rake-compiler not available, cross compiling disabled"
 end
 
-cgit_url = "http://git.bogomips.org/cgit/clogger.git"
-git_url = 'git://git.bogomips.org/clogger.git'
+cgit_url = "http://bogomips.org/clogger.git"
+git_url = 'git://bogomips.org/clogger.git'
 
 desc "post news article to rubyforge"
 task :publish_news do

data/ext/clogger_ext/blocking_helpers.h

@@ -0,0 +1,58 @@
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+struct stat_args { const char *path; struct stat *buf; };
+static VALUE ng_stat(void *ptr)
+{
+	struct stat_args *a = ptr;
+	return (VALUE)stat(a->path, a->buf);
+}
+static int my_stat(const char *path, struct stat *buf)
+{
+	struct stat_args a;
+
+	a.path = path;
+	a.buf = buf;
+	return (int)rb_thread_blocking_region(ng_stat, &a, RUBY_UBF_IO, 0);
+}
+#ifndef HAVE_RB_THREAD_IO_BLOCKING_REGION
+#  define rb_thread_io_blocking_region(fn,data,fd) \
+           rb_thread_blocking_region((fn),(data), RUBY_UBF_IO, 0)
+#endif
+
+struct fstat_args { int fd; struct stat *buf; };
+static VALUE ng_fstat(void *ptr)
+{
+	struct fstat_args *a = ptr;
+	return (VALUE)fstat(a->fd, a->buf);
+}
+
+static int my_fstat(int fd, struct stat *buf)
+{
+	struct fstat_args a;
+
+	a.fd = fd;
+	a.buf = buf;
+	return (int)rb_thread_io_blocking_region(ng_fstat, &a, fd);
+}
+
+struct write_args { int fd; const void *buf; size_t count; };
+static VALUE ng_write(void *ptr)
+{
+	struct write_args *a = ptr;
+	return (VALUE)write(a->fd, a->buf, a->count);
+}
+static ssize_t my_write(int fd, const void *buf, size_t count)
+{
+	struct write_args a;
+	ssize_t r;
+
+	a.fd = fd;
+	a.buf = buf;
+	a.count = count;
+	r = (ssize_t)rb_thread_io_blocking_region(ng_write, &a, fd);
+
+	return r;
+}
+#  define stat(fd,buf) my_stat((fd),(buf))
+#  define fstat(fd,buf) my_fstat((fd),(buf))
+#  define write(fd,buf,count) my_write((fd),(buf),(count))
+#endif

data/ext/clogger_ext/clogger.c

@@ -19,6 +19,7 @@
 #include <time.h>
 #include "ruby_1_9_compat.h"
 #include "broken_system_compat.h"
+#include "blocking_helpers.h"
 
 /*
  * Availability of a monotonic clock needs to be detected at runtime
@@ -607,6 +608,11 @@ static VALUE cwrite(struct clogger *c)
 	return Qnil;
 }
 
+static VALUE clogger_write(VALUE self)
+{
+	return cwrite(clogger_get(self));
+}
+
 static void init_logger(struct clogger *c, VALUE path)
 {
 	ID id;
@@ -686,18 +692,20 @@ static VALUE clogger_init(int argc, VALUE *argv, VALUE self)
 	return self;
 }
 
-static VALUE body_iter_i(VALUE str, VALUE memop)
+static VALUE body_iter_i(VALUE str, VALUE self)
 {
-	off_t *len = (off_t *)memop;
+	struct clogger *c = clogger_get(self);
 
 	str = rb_obj_as_string(str);
-	*len += RSTRING_LEN(str);
+	c->body_bytes_sent += RSTRING_LEN(str);
 
 	return rb_yield(str);
 }
 
-static VALUE body_close(struct clogger *c)
+static VALUE body_close(VALUE self)
 {
+	struct clogger *c = clogger_get(self);
+
 	if (rb_respond_to(c->body, close_id))
 		return rb_funcall(c->body, close_id, 0);
 	return Qnil;
@@ -717,7 +725,7 @@ static VALUE clogger_each(VALUE self)
 
 	rb_need_block();
 	c->body_bytes_sent = 0;
-	rb_iterate(rb_each, c->body, body_iter_i, (VALUE)&c->body_bytes_sent);
+	rb_iterate(rb_each, c->body, body_iter_i, self);
 
 	return self;
 }
@@ -732,9 +740,8 @@ static VALUE clogger_each(VALUE self)
  */
 static VALUE clogger_close(VALUE self)
 {
-	struct clogger *c = clogger_get(self);
 
-	return rb_ensure(body_close, (VALUE)c, cwrite, (VALUE)c);
+	return rb_ensure(body_close, self, clogger_write, self);
 }
 
 /* :nodoc: */
@@ -881,23 +888,25 @@ static VALUE respond_to(VALUE self, VALUE method)
 static VALUE to_path(VALUE self)
 {
 	struct clogger *c = clogger_get(self);
-	VALUE path = rb_funcall(c->body, to_path_id, 0);
 	struct stat sb;
 	int rv;
-	unsigned devfd;
-	const char *cpath = StringValuePtr(path);
+	VALUE path = rb_funcall(c->body, to_path_id, 0);
 
 	/* try to avoid an extra path lookup  */
-	if (rb_respond_to(c->body, to_io_id))
+	if (rb_respond_to(c->body, to_io_id)) {
 		rv = fstat(my_fileno(c->body), &sb);
-	/*
-	 * Rainbows! can use "/dev/fd/%u" in to_path output to avoid
-	 * extra open() syscalls, too.
-	 */
-	else if (sscanf(cpath, "/dev/fd/%u", &devfd) == 1)
-		rv = fstat((int)devfd, &sb);
-	else
-		rv = stat(cpath, &sb);
+	} else {
+		const char *cpath = StringValueCStr(path);
+		unsigned devfd;
+		/*
+		 * Rainbows! can use "/dev/fd/%u" in to_path output to avoid
+		 * extra open() syscalls, too.
+		 */
+		if (sscanf(cpath, "/dev/fd/%u", &devfd) == 1)
+			rv = fstat((int)devfd, &sb);
+		else
+			rv = stat(cpath, &sb);
+	}
 
 	/*
 	 * calling this method implies the web server will bypass

data/ext/clogger_ext/extconf.rb

@@ -22,6 +22,8 @@ begin
   have_func('localtime_r', 'time.h') or raise "localtime_r needed"
   have_func('gmtime_r', 'time.h') or raise "gmtime_r needed"
   have_func('rb_str_set_len', 'ruby.h')
+  have_func('rb_thread_blocking_region', 'ruby.h')
+  have_func('rb_thread_io_blocking_region', 'ruby.h')
   dir_config('clogger_ext')
   create_makefile('clogger_ext')
 rescue Object => err

data/lib/clogger.rb

@@ -4,9 +4,6 @@ require 'rack'
 # See the README for usage instructions
 class Clogger
 
-  # the version of Clogger, currently 0.8.0
-  VERSION = '0.8.0'
-
   # :stopdoc:
   OP_LITERAL = 0
   OP_REQUEST = 1

data/pkg.mk

@@ -1,12 +1,13 @@
 RUBY = ruby
 RAKE = rake
 RSYNC = rsync
+WRONGDOC = wrongdoc
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN
 -include GIT-VERSION-FILE
 -include local.mk
-DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
+DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts RbConfig::CONFIG["DLEXT"]')
 RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
 RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
 lib := lib
@@ -43,26 +44,30 @@ $(ext_dl): $(ext_src) $(ext_pfx_src) $(ext_pfx)/$(ext)/Makefile
 	$(MAKE) -C $(@D)
 lib := $(lib):$(ext_pfx)/$(ext)
 build: $(ext_dl)
+else
+build:
 endif
 
-pkg_extra := GIT-VERSION-FILE NEWS ChangeLog LATEST
+pkg_extra += GIT-VERSION-FILE NEWS ChangeLog LATEST
 ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
-	wrongdoc prepare
+	$(WRONGDOC) prepare
+NEWS LATEST: ChangeLog
 
 manifest:
 	$(RM) .manifest
 	$(MAKE) .manifest
 
-.manifest: ChangeLog
+.manifest: $(pkg_extra)
 	(git ls-files && for i in $@ $(pkg_extra); do echo $$i; done) | \
 		LC_ALL=C sort > $@+
 	cmp $@+ $@ || mv $@+ $@
 	$(RM) $@+
 
-doc: .document .wrongdoc.yml
-	find lib ext -type f -name '*.rbc' -exec rm -f '{}' ';'
+doc:: .document .wrongdoc.yml $(pkg_extra)
+	-find lib -type f -name '*.rbc' -exec rm -f '{}' ';'
+	-find ext -type f -name '*.rbc' -exec rm -f '{}' ';'
 	$(RM) -r doc
-	wrongdoc all
+	$(WRONGDOC) all
 	install -m644 COPYING doc/COPYING
 	install -m644 $(shell grep '^[A-Z]' .document) doc/
 
@@ -75,10 +80,10 @@ release_changes := release_changes-$(VERSION)
 release-notes: $(release_notes)
 release-changes: $(release_changes)
 $(release_changes):
-	wrongdoc release_changes > $@+
+	$(WRONGDOC) release_changes > $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 $(release_notes):
-	wrongdoc release_notes > $@+
+	$(WRONGDOC) release_notes > $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 
 # ensures we're actually on the tagged $(VERSION), only used for release
@@ -142,7 +147,7 @@ test_units := $(wildcard test/test_*.rb)
 test: test-unit
 test-unit: $(test_units)
 $(test_units): build
-	$(RUBY) -I $(lib) $@
+	$(RUBY) -I $(lib) $@ $(RUBY_TEST_OPTS)
 
 # this requires GNU coreutils variants
 ifneq ($(RSYNC_DEST),)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clogger
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: false
+  hash: 59
+  prerelease: 
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - cloggers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +00:00
+date: 2011-03-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ files:
 - README
 - Rakefile
 - clogger.gemspec
+- ext/clogger_ext/blocking_helpers.h
 - ext/clogger_ext/broken_system_compat.h
 - ext/clogger_ext/clogger.c
 - ext/clogger_ext/extconf.rb
@@ -102,7 +103,7 @@ rdoc_options:
 - -t
 - \Clogger - configurable request logging for Rack
 - -W
-- http://git.bogomips.org/cgit/clogger.git/tree/%s
+- http://bogomips.org/clogger.git/tree/%s
 require_paths: 
 - lib
 - ext
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: clogger
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: configurable request logging for Rack