cool.io 1.0.0 → 1.1.0

data/cool.io.gemspec

@@ -1,138 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "cool.io/version"
 
-Gem::Specification.new do |s|
-  s.name = %q{cool.io}
-  s.version = "1.0.0"
+module Cool
+  # Allow Coolio module to be referenced as Cool.io
+  def self.io; Coolio; end
+end
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tony Arcieri"]
-  s.date = %q{2010-12-13}
-  s.description = %q{A Ruby wrapper around the libev high performance event library}
-  s.email = %q{tony@medioh.com}
+Gem::Specification.new do |s|
+  s.name        = "cool.io"
+  s.version     = Coolio::VERSION
+  s.authors     = ["Tony Arcieri"]
+  s.email       = ["tony.arcieri@gmail.com"]
+  s.homepage    = "http://coolio.github.com"
+  s.summary     = "A cool framework for doing high performance I/O in Ruby"
+  s.description = "Cool.io provides a high performance event framework for Ruby which uses the libev C library"
   s.extensions = ["ext/cool.io/extconf.rb", "ext/http11_client/extconf.rb"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.markdown"
-  ]
-  s.files = [
-    "CHANGES",
-    "LICENSE",
-    "README.markdown",
-    "Rakefile",
-    "VERSION",
-    "cool.io.gemspec",
-    "examples/dslified_echo_client.rb",
-    "examples/dslified_echo_server.rb",
-    "examples/echo_client.rb",
-    "examples/echo_server.rb",
-    "examples/google.rb",
-    "examples/httpclient.rb",
-    "ext/cool.io/.gitignore",
-    "ext/cool.io/cool.io.h",
-    "ext/cool.io/cool.io_ext.c",
-    "ext/cool.io/ev_wrap.h",
-    "ext/cool.io/extconf.rb",
-    "ext/cool.io/iowatcher.c",
-    "ext/cool.io/libev.c",
-    "ext/cool.io/loop.c",
-    "ext/cool.io/stat_watcher.c",
-    "ext/cool.io/timer_watcher.c",
-    "ext/cool.io/utils.c",
-    "ext/cool.io/watcher.c",
-    "ext/cool.io/watcher.h",
-    "ext/http11_client/.gitignore",
-    "ext/http11_client/LICENSE",
-    "ext/http11_client/ext_help.h",
-    "ext/http11_client/extconf.rb",
-    "ext/http11_client/http11_client.c",
-    "ext/http11_client/http11_parser.c",
-    "ext/http11_client/http11_parser.h",
-    "ext/http11_client/http11_parser.rl",
-    "ext/libev/Changes",
-    "ext/libev/LICENSE",
-    "ext/libev/README",
-    "ext/libev/README.embed",
-    "ext/libev/ev.c",
-    "ext/libev/ev.h",
-    "ext/libev/ev_epoll.c",
-    "ext/libev/ev_kqueue.c",
-    "ext/libev/ev_poll.c",
-    "ext/libev/ev_port.c",
-    "ext/libev/ev_select.c",
-    "ext/libev/ev_vars.h",
-    "ext/libev/ev_win32.c",
-    "ext/libev/ev_wrap.h",
-    "ext/libev/test_libev_win32.c",
-    "lib/.gitignore",
-    "lib/cool.io.rb",
-    "lib/cool.io/async_watcher.rb",
-    "lib/cool.io/dns_resolver.rb",
-    "lib/cool.io/dsl.rb",
-    "lib/cool.io/eventmachine.rb",
-    "lib/cool.io/http_client.rb",
-    "lib/cool.io/io.rb",
-    "lib/cool.io/iowatcher.rb",
-    "lib/cool.io/listener.rb",
-    "lib/cool.io/loop.rb",
-    "lib/cool.io/meta.rb",
-    "lib/cool.io/server.rb",
-    "lib/cool.io/socket.rb",
-    "lib/cool.io/timer_watcher.rb",
-    "lib/coolio.rb",
-    "lib/rev.rb",
-    "spec/async_watcher_spec.rb",
-    "spec/dns_spec.rb",
-    "spec/possible_tests/schedules_other_threads.rb",
-    "spec/possible_tests/test_on_resolve_failed.rb",
-    "spec/possible_tests/test_resolves.rb",
-    "spec/possible_tests/test_write_during_resolve.rb",
-    "spec/possible_tests/works_straight.rb",
-    "spec/spec_helper.rb",
-    "spec/timer_watcher_spec.rb",
-    "spec/unix_listener_spec.rb",
-    "spec/unix_server_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/tarcieri/cool.io}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{The cool event framework for Ruby}
-  s.test_files = [
-    "examples/dslified_echo_client.rb",
-    "examples/dslified_echo_server.rb",
-    "examples/echo_client.rb",
-    "examples/echo_server.rb",
-    "examples/google.rb",
-    "examples/httpclient.rb",
-    "spec/async_watcher_spec.rb",
-    "spec/dns_spec.rb",
-    "spec/possible_tests/schedules_other_threads.rb",
-    "spec/possible_tests/test_on_resolve_failed.rb",
-    "spec/possible_tests/test_resolves.rb",
-    "spec/possible_tests/test_write_during_resolve.rb",
-    "spec/possible_tests/works_straight.rb",
-    "spec/spec_helper.rb",
-    "spec/timer_watcher_spec.rb",
-    "spec/unix_listener_spec.rb",
-    "spec/unix_server_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<iobuffer>, [">= 0.1.3"])
-      s.add_development_dependency(%q<rspec>, [">= 2.1.0"])
-    else
-      s.add_dependency(%q<iobuffer>, [">= 0.1.3"])
-      s.add_dependency(%q<rspec>, [">= 2.1.0"])
-    end
-  else
-    s.add_dependency(%q<iobuffer>, [">= 0.1.3"])
-    s.add_dependency(%q<rspec>, [">= 2.1.0"])
-  end
-end
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  s.add_dependency "iobuffer", ">= 1.0.0"
+  
+  s.add_development_dependency "rake-compiler", "~> 0.7.9"
+  s.add_development_dependency "rspec", ">= 2.6.0"
+  s.add_development_dependency "rdoc", ">= 3.6.0"
+end

data/ext/cool.io/extconf.rb

@@ -63,6 +63,9 @@ create_makefile('cool.io_ext')
 if RUBY_PLATFORM =~ /mingw|win32/
   makefile_contents = File.read 'Makefile'
 
+  # "Init_cool could not be found" when loading cool.io.so.
+  makefile_contents.gsub! 'DLDFLAGS = ', 'DLDFLAGS = -export-all '
+
   makefile_contents.gsub! 'LIBS = $(LIBRUBYARG_SHARED)', 'LIBS = -lws2_32 $(LIBRUBYARG_SHARED)'
   File.open('Makefile', 'w') { |f| f.write makefile_contents }
 end

data/ext/cool.io/stat_watcher.c

@@ -13,6 +13,7 @@
 static VALUE mCoolio = Qnil;
 static VALUE cCoolio_Watcher = Qnil;
 static VALUE cCoolio_StatWatcher = Qnil;
+static VALUE cCoolio_StatInfo = Qnil;
 static VALUE cCoolio_Loop = Qnil;
 
 static VALUE Coolio_StatWatcher_initialize(int argc, VALUE *argv, VALUE self);
@@ -20,9 +21,11 @@ static VALUE Coolio_StatWatcher_attach(VALUE self, VALUE loop);
 static VALUE Coolio_StatWatcher_detach(VALUE self);
 static VALUE Coolio_StatWatcher_enable(VALUE self);
 static VALUE Coolio_StatWatcher_disable(VALUE self);
-static VALUE Coolio_StatWatcher_on_change(VALUE self);
+static VALUE Coolio_StatWatcher_on_change(VALUE self, VALUE previous, VALUE current);
 static VALUE Coolio_StatWatcher_path(VALUE self);
 
+static VALUE Coolio_StatInfo_build(ev_statdata *statdata_struct);
+
 static void Coolio_StatWatcher_libev_callback(struct ev_loop *ev_loop, struct ev_stat *stat, int revents);
 static void Coolio_StatWatcher_dispatch_callback(VALUE self, int revents);
 
@@ -30,12 +33,27 @@ static void Coolio_StatWatcher_dispatch_callback(VALUE self, int revents);
  * Coolio::StatWatcher lets you create either one-shot or periodic stats which
  * run within Coolio's event loop.  It's useful for creating timeouts or
  * events which fire periodically.
- */
+ **/
 void Init_coolio_stat_watcher()
-{ 
+{
   mCoolio = rb_define_module("Coolio");
   cCoolio_Watcher = rb_define_class_under(mCoolio, "Watcher", rb_cObject);
   cCoolio_StatWatcher = rb_define_class_under(mCoolio, "StatWatcher", cCoolio_Watcher);
+  cCoolio_StatInfo = rb_struct_define("StatInfo",
+      "mtime",
+      "ctime",
+      "atime",
+      "dev",
+      "ino",
+      "mode",
+      "nlink",
+      "uid",
+      "guid",
+      "rdev",
+      "size",
+      "blksize",
+      "blocks",
+      NULL);
   cCoolio_Loop = rb_define_class_under(mCoolio, "Loop", rb_cObject);
 
   rb_define_method(cCoolio_StatWatcher, "initialize", Coolio_StatWatcher_initialize, -1);
@@ -43,14 +61,14 @@ void Init_coolio_stat_watcher()
   rb_define_method(cCoolio_StatWatcher, "detach", Coolio_StatWatcher_detach, 0);
   rb_define_method(cCoolio_StatWatcher, "enable", Coolio_StatWatcher_enable, 0);
   rb_define_method(cCoolio_StatWatcher, "disable", Coolio_StatWatcher_disable, 0);
-  rb_define_method(cCoolio_StatWatcher, "on_change", Coolio_StatWatcher_on_change, 0);
+  rb_define_method(cCoolio_StatWatcher, "on_change", Coolio_StatWatcher_on_change, 2);
   rb_define_method(cCoolio_StatWatcher, "path", Coolio_StatWatcher_path, 0);
 }
 
 /**
  *  call-seq:
  *    Coolio::StatWatcher.initialize(path, interval = 0) -> Coolio::StatWatcher
- * 
+ *
  * Create a new Coolio::StatWatcher for the given path.  This will monitor the
  * given path for changes at the filesystem level.  The interval argument
  * specified how often in seconds the path should be polled for changes.
@@ -75,11 +93,11 @@ static VALUE Coolio_StatWatcher_initialize(int argc, VALUE *argv, VALUE self)
 
   watcher_data->dispatch_callback = Coolio_StatWatcher_dispatch_callback;
   ev_stat_init(
-      &watcher_data->event_types.ev_stat, 
-      Coolio_StatWatcher_libev_callback, 
-      RSTRING_PTR(path), 
+      &watcher_data->event_types.ev_stat,
+      Coolio_StatWatcher_libev_callback,
+      RSTRING_PTR(path),
       interval == Qnil ? 0 : NUM2DBL(interval)
-  );  
+  );
   watcher_data->event_types.ev_stat.data = (void *)self;
 
   return Qnil;
@@ -88,7 +106,7 @@ static VALUE Coolio_StatWatcher_initialize(int argc, VALUE *argv, VALUE self)
 /**
  *  call-seq:
  *    Coolio::StatWatcher.attach(loop) -> Coolio::StatWatcher
- * 
+ *
  * Attach the stat watcher to the given Coolio::Loop.  If the watcher is already
  * attached to a loop, detach it from the old one and attach it to the new one.
  */
@@ -97,7 +115,7 @@ static VALUE Coolio_StatWatcher_attach(VALUE self, VALUE loop)
   ev_tstamp interval, timeout;
   struct Coolio_Loop *loop_data;
   struct Coolio_Watcher *watcher_data;
-    
+
 	if(!rb_obj_is_kind_of(loop, cCoolio_Loop))
 		rb_raise(rb_eArgError, "expected loop to be an instance of Coolio::Loop");
 
@@ -112,13 +130,13 @@ static VALUE Coolio_StatWatcher_attach(VALUE self, VALUE loop)
   ev_stat_start(loop_data->ev_loop, &watcher_data->event_types.ev_stat);
 	rb_call_super(1, &loop);
 
-  return self;  
+  return self;
 }
 
 /**
  *  call-seq:
  *    Coolio::StatWatcher.detach -> Coolio::StatWatcher
- * 
+ *
  * Detach the stat watcher from its current Coolio::Loop.
  */
 static VALUE Coolio_StatWatcher_detach(VALUE self)
@@ -131,7 +149,7 @@ static VALUE Coolio_StatWatcher_detach(VALUE self)
 /**
  *  call-seq:
  *    Coolio::StatWatcher.enable -> Coolio::StatWatcher
- * 
+ *
  * Re-enable a stat watcher which has been temporarily disabled.  See the
  * disable method for a more thorough explanation.
  */
@@ -139,15 +157,15 @@ static VALUE Coolio_StatWatcher_enable(VALUE self)
 {
   Watcher_Enable(stat, self);
 
-  return self;  
+  return self;
 }
 
 /**
  *  call-seq:
  *    Coolio::StatWatcher.disable -> Coolio::StatWatcher
- * 
- * Temporarily disable a stat watcher which is attached to a loop.  
- * This is useful if you wish to toggle event monitoring on and off.  
+ *
+ * Temporarily disable a stat watcher which is attached to a loop.
+ * This is useful if you wish to toggle event monitoring on and off.
  */
 static VALUE Coolio_StatWatcher_disable(VALUE self)
 {
@@ -159,10 +177,10 @@ static VALUE Coolio_StatWatcher_disable(VALUE self)
 /**
  *  call-seq:
  *    Coolio::StatWatcher#on_change -> nil
- * 
+ *
  * Called whenever the status of the given path changes
  */
-static VALUE Coolio_StatWatcher_on_change(VALUE self)
+static VALUE Coolio_StatWatcher_on_change(VALUE self, VALUE previous, VALUE current)
 {
   return Qnil;
 }
@@ -170,7 +188,7 @@ static VALUE Coolio_StatWatcher_on_change(VALUE self)
 /**
  *  call-seq:
  *    Coolio::StatWatcher#path -> String
- * 
+ *
  * Retrieve the path associated with this StatWatcher
  */
 static VALUE Coolio_StatWatcher_path(VALUE self)
@@ -186,6 +204,64 @@ static void Coolio_StatWatcher_libev_callback(struct ev_loop *ev_loop, struct ev
 
 /* Coolio::Loop dispatch callback */
 static void Coolio_StatWatcher_dispatch_callback(VALUE self, int revents)
-{ 
-  rb_funcall(self, rb_intern("on_change"), 0, 0);
+{
+  struct Coolio_Watcher *watcher_data;
+  Data_Get_Struct(self, struct Coolio_Watcher, watcher_data);
+
+  VALUE previous_statdata = Coolio_StatInfo_build(&watcher_data->event_types.ev_stat.prev);
+  VALUE current_statdata = Coolio_StatInfo_build(&watcher_data->event_types.ev_stat.attr);
+  rb_funcall(self, rb_intern("on_change"), 2, previous_statdata, current_statdata);
+}
+
+/**
+ * Convience method to build StatInfo structs given an ev_statdata
+ * */
+static VALUE Coolio_StatInfo_build(ev_statdata *statdata_struct)
+{
+  VALUE at_method = rb_intern("at");
+  VALUE cTime     = rb_const_get(rb_cObject, rb_intern("Time"));
+
+  VALUE mtime     = Qnil;
+  VALUE ctime     = Qnil;
+  VALUE atime     = Qnil;
+  VALUE dev       = Qnil;
+  VALUE ino       = Qnil;
+  VALUE mode      = Qnil;
+  VALUE nlink     = Qnil;
+  VALUE uid       = Qnil;
+  VALUE gid       = Qnil;
+  VALUE rdev      = Qnil;
+  VALUE size      = Qnil;
+  VALUE blksize   = Qnil;
+  VALUE blocks    = Qnil;
+
+  mtime   = rb_funcall(cTime, at_method, 1, INT2NUM(statdata_struct->st_mtime));
+  ctime   = rb_funcall(cTime, at_method, 1, INT2NUM(statdata_struct->st_ctime));
+  atime   = rb_funcall(cTime, at_method, 1, INT2NUM(statdata_struct->st_atime));
+  dev     = INT2NUM(statdata_struct->st_dev);
+  ino     = INT2NUM(statdata_struct->st_ino);
+  mode    = INT2NUM(statdata_struct->st_mode);
+  nlink   = INT2NUM(statdata_struct->st_nlink);
+  uid     = INT2NUM(statdata_struct->st_uid);
+  gid     = INT2NUM(statdata_struct->st_gid);
+  rdev    = INT2NUM(statdata_struct->st_rdev);
+  size    = INT2NUM(statdata_struct->st_size);
+  blksize = INT2NUM(statdata_struct->st_blksize);
+  blocks  = INT2NUM(statdata_struct->st_blocks);
+
+  return rb_struct_new(cCoolio_StatInfo,
+      mtime,
+      ctime,
+      atime,
+      dev,
+      ino,
+      mode,
+      nlink,
+      uid,
+      gid,
+      rdev,
+      size,
+      blksize,
+      blocks,
+      NULL);
 }

data/ext/libev/Changes

@@ -1,5 +1,29 @@
 Revision history for libev, a high-performance and full-featured event loop.
 
+4.04 Wed Feb 16 09:01:51 CET 2011
+	- fix two problems in the native win32 backend, where reuse of fd's
+          with different underlying handles caused handles not to be removed
+          or added to the select set (analyzed and tested by Bert Belder).
+	- do no rely on ceil() in ev_e?poll.c.
+        - backport libev to HP-UX versions before 11 v3.
+        - configure did not detect nanosleep and clock_gettime properly when
+          they are available in the libc (as opposed to -lrt).
+
+4.03 Tue Jan 11 14:37:25 CET 2011
+	- officially support polling files with all backends.
+	- support files, /dev/zero etc. the same way as select in the epoll
+          backend, by generating events on our own.
+        - ports backend: work around solaris bug 6874410 and many related ones
+          (EINTR, maybe more), with no performance loss (note that the solaris
+          bug report is actually wrong, reality is far more bizarre and broken
+          than that).
+	- define EV_READ/EV_WRITE as macros in event.h, as some programs use
+          #ifdef to test for them.
+        - new (experimental) function: ev_feed_signal.
+        - new (to become default) EVFLAG_NOSIGMASK flag.
+        - new EVBACKEND_MASK symbol.
+        - updated COMMON IDIOMS SECTION.
+
 4.01 Fri Nov  5 21:51:29 CET 2010
         - automake fucked it up, apparently, --add-missing -f is not quite enough
           to make it update its files, so 4.00 didn't install ev++.h and

data/ext/libev/ev.c

@@ -1,19 +1,19 @@
 /*
  * libev event processing core, watcher management
  *
- * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
  * tion, are permitted provided that the following conditions are met:
- * 
+ *
  *   1.  Redistributions of source code must retain the above copyright notice,
  *       this list of conditions and the following disclaimer.
- * 
+ *
  *   2.  Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
  * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
@@ -378,7 +378,8 @@ EV_CPP(extern "C" {)
 #endif
 
 #if !EV_USE_NANOSLEEP
-# ifndef _WIN32
+/* hp-ux has it in sys/time.h, which we unconditionally include above */
+# if !defined(_WIN32) && !defined(__hpux)
 #  include <sys/select.h>
 # endif
 #endif
@@ -817,6 +818,14 @@ ev_sleep (ev_tstamp delay)
     }
 }
 
+inline_speed int
+ev_timeout_to_ms (ev_tstamp timeout)
+{
+  int ms = timeout * 1000. + .999999;
+
+  return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
+}
+
 /*****************************************************************************/
 
 #define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
@@ -967,6 +976,31 @@ fd_reify (EV_P)
 {
   int i;
 
+#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
+  for (i = 0; i < fdchangecnt; ++i)
+    {
+      int fd = fdchanges [i];
+      ANFD *anfd = anfds + fd;
+
+      if (anfd->reify & EV__IOFDSET)
+        {
+          SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
+
+          if (handle != anfd->handle)
+            {
+              unsigned long arg;
+
+              assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
+
+              /* handle changed, but fd didn't - we need to do it in two steps */
+              backend_modify (EV_A_ fd, anfd->events, 0);
+              anfd->events = 0;
+              anfd->handle = handle;
+            }
+        }
+    }
+#endif
+
   for (i = 0; i < fdchangecnt; ++i)
     {
       int fd = fdchanges [i];
@@ -978,16 +1012,6 @@ fd_reify (EV_P)
 
       anfd->reify  = 0;
 
-#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
-      if (o_reify & EV__IOFDSET)
-        {
-          unsigned long arg;
-          anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
-          assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
-          printf ("oi %d %x\n", fd, anfd->handle);//D
-        }
-#endif
-
       /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
         {
           anfd->events = 0;
@@ -1345,14 +1369,16 @@ pipecb (EV_P_ ev_io *iow, int revents)
       read (evpipe [0], &dummy, 1);
     }
 
+#if EV_SIGNAL_ENABLE
   if (sig_pending)
-    {    
+    {
       sig_pending = 0;
 
       for (i = EV_NSIG - 1; i--; )
         if (expect_false (signals [i].pending))
           ev_feed_signal_event (EV_A_ i + 1);
     }
+#endif
 
 #if EV_ASYNC_ENABLE
   if (async_pending)
@@ -1371,19 +1397,28 @@ pipecb (EV_P_ ev_io *iow, int revents)
 
 /*****************************************************************************/
 
-static void
-ev_sighandler (int signum)
+void
+ev_feed_signal (int signum)
 {
 #if EV_MULTIPLICITY
   EV_P = signals [signum - 1].loop;
+
+  if (!EV_A)
+    return;
 #endif
 
+  signals [signum - 1].pending = 1;
+  evpipe_write (EV_A_ &sig_pending);
+}
+
+static void
+ev_sighandler (int signum)
+{
 #ifdef _WIN32
   signal (signum, ev_sighandler);
 #endif
 
-  signals [signum - 1].pending = 1;
-  evpipe_write (EV_A_ &sig_pending);
+  ev_feed_signal (signum);
 }
 
 void noinline
@@ -1645,6 +1680,8 @@ loop_init (EV_P_ unsigned int flags)
 {
   if (!backend)
     {
+      origflags = flags;
+
 #if EV_USE_REALTIME
       if (!have_realtime)
         {
@@ -1699,7 +1736,7 @@ loop_init (EV_P_ unsigned int flags)
       sigfd             = flags & EVFLAG_SIGNALFD  ? -2 : -1;
 #endif
 
-      if (!(flags & 0x0000ffffU))
+      if (!(flags & EVBACKEND_MASK))
         flags |= ev_recommended_backends ();
 
 #if EV_USE_IOCP
@@ -2102,9 +2139,6 @@ ev_invoke_pending (EV_P)
       {
         ANPENDING *p = pendings [pri] + --pendingcnt [pri];
 
-        /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
-        /* ^ this is no longer true, as pending_w could be here */
-
         p->w->pending = 0;
         EV_CB_INVOKE (p->w, p->events);
         EV_FREQUENT_CHECK;
@@ -2175,6 +2209,15 @@ timers_reify (EV_P)
 }
 
 #if EV_PERIODIC_ENABLE
+
+inline_speed void
+periodic_recalc (EV_P_ ev_periodic *w)
+{
+  /* TODO: use slow but potentially more correct incremental algo, */
+  /* also do not rely on ceil */
+  ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
+}
+
 /* make periodics pending */
 inline_size void
 periodics_reify (EV_P)
@@ -2203,7 +2246,8 @@ periodics_reify (EV_P)
             }
           else if (w->interval)
             {
-              ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
+              periodic_recalc (EV_A_ w);
+
               /* if next trigger time is not sufficiently in the future, put it there */
               /* this might happen because of floating point inexactness */
               if (ev_at (w) - ev_rt_now < TIME_EPSILON)
@@ -2247,7 +2291,7 @@ periodics_reschedule (EV_P)
       if (w->reschedule_cb)
         ev_at (w) = w->reschedule_cb (w, ev_rt_now);
       else if (w->interval)
-        ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
+        periodic_recalc (EV_A_ w);
 
       ANHE_at_cache (periodics [i]);
     }
@@ -2749,8 +2793,7 @@ ev_periodic_start (EV_P_ ev_periodic *w)
   else if (w->interval)
     {
       assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
-      /* this formula differs from the one in periodic_reify because we do not always round up */
-      ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
+      periodic_recalc (EV_A_ w);
     }
   else
     ev_at (w) = w->offset;
@@ -2881,9 +2924,12 @@ ev_signal_start (EV_P_ ev_signal *w)
         sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
         sigaction (w->signum, &sa, 0);
 
-        sigemptyset (&sa.sa_mask);
-        sigaddset (&sa.sa_mask, w->signum);
-        sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
+        if (origflags & EVFLAG_NOSIGMASK)
+          {
+            sigemptyset (&sa.sa_mask);
+            sigaddset (&sa.sa_mask, w->signum);
+            sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
+          }
 #endif
       }
 
@@ -3034,7 +3080,7 @@ infy_add (EV_P_ ev_stat *w)
 
               *pend = 0;
               w->wd = inotify_add_watch (fs_fd, path, mask);
-            } 
+            }
           while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
         }
     }