From db447440ff8973961e1936a6a64ca4971eeeea57 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 7 Aug 2013 10:53:22 +0200
Subject: event/Event{Pipe,FD}: auto-create in constructor

Errors are fatal now.  This makes the class a lot easier to use.
---
 src/event/EventFD.cxx | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'src/event/EventFD.cxx')

diff --git a/src/event/EventFD.cxx b/src/event/EventFD.cxx
index dba80d9be..716ff80ae 100644
--- a/src/event/EventFD.cxx
+++ b/src/event/EventFD.cxx
@@ -21,33 +21,26 @@
 #ifdef USE_EVENTFD
 #include "EventFD.hxx"
 #include "system/fd_util.h"
+#include "system/FatalError.hxx"
 #include "gcc.h"
 
+#include <assert.h>
 #include <unistd.h>
 
 #include <sys/eventfd.h>
 
-#ifdef WIN32
-static bool PoorSocketPair(int fd[2]);
-#endif
-
-bool
-EventFD::Create()
+EventFD::EventFD()
+	:fd(eventfd_cloexec_nonblock(0, 0))
 {
-	assert(fd == -1);
-
-	fd = eventfd_cloexec_nonblock(0, 0);
-	return fd >= 0;
+	if (fd < 0)
+		FatalSystemError("eventfd() failed");
 }
 
-void
-EventFD::Destroy()
+EventFD::~EventFD()
 {
-	close(fd);
+	assert(fd >= 0);
 
-#ifndef NDEBUG
-	fd = -1;
-#endif
+	close(fd);
 }
 
 bool
-- 
cgit v1.2.3