EventSocket: Add new event type pipe support

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
ceph · Aug 5, 2015 · a19a61e · a19a61e
1 parent 4b41cc5
commit a19a61e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/common/event_socket.h b/src/common/event_socket.h
@@ -25,17 +25,27 @@ class EventSocket {
   EventSocket(): socket(-1), type(EVENT_SOCKET_TYPE_NONE) {}
   bool is_valid() const { return socket != -1; }
   int init(int fd, int t) {
+    switch (t) {
+      case EVENT_SOCKET_TYPE_PIPE:
 #ifdef HAVE_EVENTFD
-    if (t == EVENT_SOCKET_TYPE_EVENTFD) {
-      socket = fd;
-      type = t;
-      return 0;
-    }
+      case EVENT_SOCKET_TYPE_EVENTFD:
 #endif
+      {
+        socket = fd;
+        type = t;
+        return 0;
+      }
+    }
     return -1;
   }
   int notify() {
     switch (type) {
+      case EVENT_SOCKET_TYPE_PIPE:
+      {
+        char buf[1];
+        buf[0] = 'i';
+        return write(socket, buf, 1);
+      }
       case EVENT_SOCKET_TYPE_EVENTFD:
       {
         uint64_t value = 1;

diff --git a/src/include/event_type.h b/src/include/event_type.h
@@ -16,6 +16,7 @@
 #define CEPH_COMMON_EVENT_TYPE_H
 
 #define EVENT_SOCKET_TYPE_NONE 0
-#define EVENT_SOCKET_TYPE_EVENTFD 1
+#define EVENT_SOCKET_TYPE_PIPE 1
+#define EVENT_SOCKET_TYPE_EVENTFD 2
 
 #endif