From 3a9cc9b079158e694f66632f7392b09131d68b27 Mon Sep 17 00:00:00 2001
From: Benjamin Sergeant <bsergeant@mz.com>
Date: Fri, 15 Mar 2019 11:41:57 -0700
Subject: [PATCH] cleanup

---
 ixwebsocket/IXSelectInterrupt.cpp        |  2 +-
 ixwebsocket/IXSelectInterrupt.h          |  2 +-
 ixwebsocket/IXSelectInterruptEventFd.cpp |  7 ++++---
 ixwebsocket/IXSelectInterruptEventFd.h   |  2 +-
 ixwebsocket/IXSelectInterruptFactory.cpp |  8 ++++++--
 ixwebsocket/IXSelectInterruptPipe.cpp    | 10 ++++++----
 ixwebsocket/IXSelectInterruptPipe.h      |  2 +-
 7 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/ixwebsocket/IXSelectInterrupt.cpp b/ixwebsocket/IXSelectInterrupt.cpp
index 8f7fb2e5..3cddb6c7 100644
--- a/ixwebsocket/IXSelectInterrupt.cpp
+++ b/ixwebsocket/IXSelectInterrupt.cpp
@@ -38,7 +38,7 @@ namespace ix
         return true;
     }
 
-    int SelectInterrupt::getFd()
+    int SelectInterrupt::getFd() const
     {
         return -1;
     }
diff --git a/ixwebsocket/IXSelectInterrupt.h b/ixwebsocket/IXSelectInterrupt.h
index 7c484a8d..4a720c1e 100644
--- a/ixwebsocket/IXSelectInterrupt.h
+++ b/ixwebsocket/IXSelectInterrupt.h
@@ -21,7 +21,7 @@ namespace ix
         virtual bool notify(uint64_t value);
         virtual bool clear();
         virtual uint64_t read();
-        virtual int getFd();
+        virtual int getFd() const;
     };
 }
 
diff --git a/ixwebsocket/IXSelectInterruptEventFd.cpp b/ixwebsocket/IXSelectInterruptEventFd.cpp
index 45da4804..fbfffa63 100644
--- a/ixwebsocket/IXSelectInterruptEventFd.cpp
+++ b/ixwebsocket/IXSelectInterruptEventFd.cpp
@@ -38,7 +38,7 @@ namespace ix
 {
     SelectInterruptEventFd::SelectInterruptEventFd()
     {
-        ;
+        _eventfd = -1;
     }
 
     SelectInterruptEventFd::~SelectInterruptEventFd()
@@ -48,7 +48,8 @@ namespace ix
 
     bool SelectInterruptEventFd::init(std::string& errorMsg)
     {
-        _eventfd = -1;
+        // calling init twice is a programming error
+        assert(_eventfd == -1);
 
         _eventfd = eventfd(0, 0);
         if (_eventfd < 0)
@@ -107,7 +108,7 @@ namespace ix
         return write(_eventfd, &value, sizeof(value)) == 8;
     }
 
-    int SelectInterruptEventFd::getFd()
+    int SelectInterruptEventFd::getFd() const
     {
         return _eventfd;
     }
diff --git a/ixwebsocket/IXSelectInterruptEventFd.h b/ixwebsocket/IXSelectInterruptEventFd.h
index ba821dc7..415ec5bb 100644
--- a/ixwebsocket/IXSelectInterruptEventFd.h
+++ b/ixwebsocket/IXSelectInterruptEventFd.h
@@ -23,7 +23,7 @@ namespace ix
         bool notify(uint64_t value) final;
         bool clear() final;
         uint64_t read() final;
-        int getFd() final;
+        int getFd() const final;
 
     private:
         int _eventfd;
diff --git a/ixwebsocket/IXSelectInterruptFactory.cpp b/ixwebsocket/IXSelectInterruptFactory.cpp
index 6cf7bf44..1e666cbf 100644
--- a/ixwebsocket/IXSelectInterruptFactory.cpp
+++ b/ixwebsocket/IXSelectInterruptFactory.cpp
@@ -8,8 +8,10 @@
 
 #if defined(__linux__)
 # include <ixwebsocket/IXSelectInterruptEventFd.h>
-#else
+#elif defined(__APPLE__)
 # include <ixwebsocket/IXSelectInterruptPipe.h>
+#else
+# include <ixwebsocket/IXSelectInterrupt.h>
 #endif
 
 namespace ix
@@ -18,8 +20,10 @@ namespace ix
     {
 #if defined(__linux__)
         return std::make_shared<SelectInterruptEventFd>();
-#else
+#elif defined(__APPLE__)
         return std::make_shared<SelectInterruptPipe>();
+#else
+        return std::make_shared<SelectInterrupt>();
 #endif
     }
 }
diff --git a/ixwebsocket/IXSelectInterruptPipe.cpp b/ixwebsocket/IXSelectInterruptPipe.cpp
index c0c3b5bc..45df2d49 100644
--- a/ixwebsocket/IXSelectInterruptPipe.cpp
+++ b/ixwebsocket/IXSelectInterruptPipe.cpp
@@ -25,7 +25,8 @@ namespace ix
 
     SelectInterruptPipe::SelectInterruptPipe()
     {
-        ;
+        _fildes[kPipeReadIndex] = -1;
+        _fildes[kPipeWriteIndex] = -1;
     }
 
     SelectInterruptPipe::~SelectInterruptPipe()
@@ -38,8 +39,9 @@ namespace ix
 
     bool SelectInterruptPipe::init(std::string& errorMsg)
     {
-        _fildes[kPipeReadIndex] = -1;
-        _fildes[kPipeWriteIndex] = -1;
+        // calling init twice is a programming error
+        assert(_fildes[kPipeReadIndex] == -1);
+        assert(_fildes[kPipeWriteIndex] == -1);
 
         if (pipe(_fildes) < 0)
         {
@@ -101,7 +103,7 @@ namespace ix
         return true;
     }
 
-    int SelectInterruptPipe::getFd()
+    int SelectInterruptPipe::getFd() const
     {
         return _fildes[kPipeReadIndex];
     }
diff --git a/ixwebsocket/IXSelectInterruptPipe.h b/ixwebsocket/IXSelectInterruptPipe.h
index b874754d..8c0a4df4 100644
--- a/ixwebsocket/IXSelectInterruptPipe.h
+++ b/ixwebsocket/IXSelectInterruptPipe.h
@@ -23,7 +23,7 @@ namespace ix
         bool notify(uint64_t value) final;
         bool clear() final;
         uint64_t read() final;
-        int getFd() final;
+        int getFd() const final;
 
     private:
         // Store file descriptors used by the communication pipe. Communication