From cb3c1883007dbbde7adc03fe4735d2fa2d4afc58 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Thu, 17 Apr 2014 14:43:16 -0400
Subject: [PATCH] move eventfd stuff out to own file

---
 fd-eventfd.c      | 42 ++++++++++++++++++++++++++++++++++++++++++
 fds.c             | 24 +-----------------------
 include/eventfd.h |  4 ++++
 3 files changed, 47 insertions(+), 23 deletions(-)
 create mode 100644 fd-eventfd.c
 create mode 100644 include/eventfd.h

diff --git a/fd-eventfd.c b/fd-eventfd.c
new file mode 100644
index 0000000..ba08921
--- /dev/null
+++ b/fd-eventfd.c
@@ -0,0 +1,42 @@
+/* eventfd FDs */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/epoll.h>
+#include <sys/eventfd.h>
+
+#include "eventfd.h"
+#include "files.h"
+#include "log.h"
+#include "net.h"
+#include "params.h"
+#include "pids.h"
+#include "random.h"
+#include "sanitise.h"
+#include "shm.h"
+#include "trinity.h"
+
+void open_eventfd_fds(void)
+{
+	unsigned int i;
+
+	shm->eventfd_fds[0] = eventfd(rand32(), 0);
+	shm->eventfd_fds[1] = eventfd(rand32(), EFD_CLOEXEC);
+	shm->eventfd_fds[2] = eventfd(rand32(), EFD_NONBLOCK);
+	shm->eventfd_fds[3] = eventfd(rand32(), EFD_SEMAPHORE);
+	shm->eventfd_fds[4] = eventfd(rand32(), EFD_CLOEXEC | EFD_NONBLOCK);
+	shm->eventfd_fds[5] = eventfd(rand32(), EFD_CLOEXEC | EFD_SEMAPHORE);
+	shm->eventfd_fds[6] = eventfd(rand32(), EFD_NONBLOCK | EFD_SEMAPHORE);
+	shm->eventfd_fds[7] = eventfd(rand32(), EFD_CLOEXEC | EFD_NONBLOCK | EFD_SEMAPHORE);
+
+	for (i = 0; i < MAX_EVENTFD_FDS; i++)
+		output(2, "fd[%d] = eventfd\n", shm->eventfd_fds[i]);
+}
+
+int rand_eventfd_fd(void)
+{
+	return shm->eventfd_fds[rand() % MAX_EVENTFD_FDS];
+}
diff --git a/fds.c b/fds.c
index 45cad4b..fb1a3c6 100644
--- a/fds.c
+++ b/fds.c
@@ -7,6 +7,7 @@
 #include <sys/eventfd.h>
 
 #include "epoll.h"
+#include "eventfd.h"
 #include "files.h"
 #include "log.h"
 #include "net.h"
@@ -19,29 +20,6 @@
 #include "shm.h"
 #include "trinity.h"
 
-/* eventfd FDs */
-static void open_eventfd_fds(void)
-{
-	unsigned int i;
-
-	shm->eventfd_fds[0] = eventfd(rand32(), 0);
-	shm->eventfd_fds[1] = eventfd(rand32(), EFD_CLOEXEC);
-	shm->eventfd_fds[2] = eventfd(rand32(), EFD_NONBLOCK);
-	shm->eventfd_fds[3] = eventfd(rand32(), EFD_SEMAPHORE);
-	shm->eventfd_fds[4] = eventfd(rand32(), EFD_CLOEXEC | EFD_NONBLOCK);
-	shm->eventfd_fds[5] = eventfd(rand32(), EFD_CLOEXEC | EFD_SEMAPHORE);
-	shm->eventfd_fds[6] = eventfd(rand32(), EFD_NONBLOCK | EFD_SEMAPHORE);
-	shm->eventfd_fds[7] = eventfd(rand32(), EFD_CLOEXEC | EFD_NONBLOCK | EFD_SEMAPHORE);
-
-	for (i = 0; i < MAX_EVENTFD_FDS; i++)
-		output(2, "fd[%d] = eventfd\n", shm->eventfd_fds[i]);
-}
-
-static int rand_eventfd_fd(void)
-{
-	return shm->eventfd_fds[rand() % MAX_EVENTFD_FDS];
-}
-
 static int get_new_random_fd(void)
 {
 	unsigned int i;
diff --git a/include/eventfd.h b/include/eventfd.h
new file mode 100644
index 0000000..e4bf108
--- /dev/null
+++ b/include/eventfd.h
@@ -0,0 +1,4 @@
+#pragma once
+
+void open_eventfd_fds(void);
+int rand_eventfd_fd(void);
-- 
2.11.4.GIT