Merge branch 'old-linux-timer-fix' of https://github.com/tatsuhiko-in…

…oue/jubatus-mpio into tatsuhiko-inoue-old-linux-timer-fix

mpsrc/wavy_kernel_epoll.h

@@ -176,18 +176,22 @@ class kernel {
 #else // DISABLE_TIMERFD
 	class timer {
 	public:
-		timer() : fd(-1) { }
+		timer() : fd(-1), fd_writer(-1) { }
 		~timer() {
 			if(fd >= 0) {
 				timer_delete(timer_id);
 				::close(fd);
 			}
+			if(fd_writer >= 0) {
+				::close(fd_writer);
+			}
 		}
 
 		int ident() const { return fd; }
 
 	private:
 		int fd;
+		int fd_writer;
 		timer_t timer_id;
 		friend class kernel;
 		timer(const timer&);
@@ -259,6 +263,7 @@ class kernel {
 		}
 
 		tm->fd = pipefd[0];
+		tm->fd_writer = pipefd[1];
 		tm->timer_id = timer_id;
 
 		return pipefd[0];

test/Makefile.am

@@ -9,6 +9,7 @@ check_PROGRAMS = \
 		handler \
 		signal \
 		timer \
+		many_timer \
 		sync
 
 TESTS = $(check_PROGRAMS)
@@ -21,5 +22,7 @@ signal_SOURCES = signal.cc
 
 timer_SOURCES = timer.cc
 
+many_timer_SOURCES = many_timer.cc
+
 sync_SOURCES = sync.cc
 

test/many_timer.cc

@@ -0,0 +1,38 @@
+// Copyright (C) 2013 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
+
+#include <jubatus/mp/wavy.h>
+#include <jubatus/mp/functional.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <cstdlib>
+#include <iostream>
+
+using namespace mp::placeholders;
+
+bool timer_handler(int* count, mp::wavy::loop* lo)
+{
+	try {
+		std::cout << "*" << std::flush;
+		if(--(*count) < 0) {
+			lo->end();
+		}
+		else {
+		    lo->add_timer(0.001, 0, mp::bind(&timer_handler, count, lo));
+		}
+		return false;
+	}
+	catch (std::exception& e) {
+		std::cerr <<  e.what() << std::endl;
+		std::exit(1);
+	}
+}
+
+int main(void)
+{
+	mp::wavy::loop lo;
+	int count = 2000;
+	lo.add_timer(0.01, 0, mp::bind(
+				&timer_handler, &count, &lo));
+	lo.run(4);
+	std::cout << std::endl;
+}