X-Git-Url: https://git.llucax.com/software/eventxx.git/blobdiff_plain/3de7450f04f8d9cd241eb600da57cbe0539aa62c..2c722f14fdce3f1a32bf26eb26d316cced826ba4:/test/bench.cpp

diff --git a/test/bench.cpp b/test/bench.cpp
index a098012..0236559 100644
--- a/test/bench.cpp
+++ b/test/bench.cpp
@@ -30,7 +30,7 @@
  *     Added chain event propagation to improve the sensitivity of
  *     the measure respect to the event loop efficency.
  *
- * Wed 2006-12-27 - Modified by Leandro Lucarella <llucarella@integratech.com.ar>
+ * Wed 2006-12-27 - Modified by Leandro Lucarella <llucax+eventxx@gmail.com>
  *
  *     Adapted to test the C++ inteface.
  *
@@ -55,20 +55,20 @@
 #include <cerrno>
 #include <vector>
 
-#include <event>
+#include <eventxx>
 
 
 static int count, writes, fired;
 static int *pipes;
-static int num_pipes, num_active, num_writes;
-static std::vector< event::cevent* > events;
-static event::dispatcher d;
+static unsigned num_pipes, num_active, num_writes;
+static std::vector< eventxx::cevent* > events;
+static eventxx::dispatcher d;
 
 
 void
 read_cb(int fd, short which, void *arg)
 {
-	int idx = (int) arg, widx = idx + 1;
+	size_t idx = (size_t) arg, widx = idx + 1;
 	u_char ch;
 
 	count += read(fd, &ch, sizeof(ch));
@@ -81,19 +81,20 @@ read_cb(int fd, short which, void *arg)
 	}
 }
 
-event::time *
+eventxx::time *
 run_once(void)
 {
-	int *cp, i, space;
-	static event::time ts, te;
+	size_t i;
+	int *cp, space;
+	static eventxx::time ts, te;
 
 	for (cp = pipes, i = 0; i < num_pipes; i++, cp += 2) {
-		events.push_back(new event::cevent(cp[0], EV_READ | EV_PERSIST,
-			read_cb, (void *) i));
+		events.push_back(new eventxx::cevent(cp[0],
+			eventxx::READ | eventxx::PERSIST, read_cb, (void *) i));
 		d.add(*events[i]);
 	}
 
-	d.dispatch(EVLOOP_ONCE | EVLOOP_NONBLOCK);
+	d.dispatch(eventxx::ONCE | eventxx::NONBLOCK);
 
 	fired = 0;
 	space = num_pipes / num_active;
@@ -130,9 +131,9 @@ int
 main (int argc, char **argv)
 {
 	struct rlimit rl;
-	int i, c;
-	event::time* tv;
-	int *cp;
+	size_t i;
+	eventxx::time* tv;
+	int c, *cp;
 	extern char *optarg;
 
 	num_pipes = 100;