From: Haomai Wang <haomaiwang@gmail.com>
Date: Thu, 20 Aug 2015 15:17:56 +0000 (+0800)
Subject: Fix compile warning unused-result
X-Git-Tag: v9.1.0~320^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5623%2Fhead;p=ceph.git

Fix compile warning unused-result

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/msg/async/Event.cc b/src/msg/async/Event.cc
index ec3db8774022..79bff33673d0 100644
--- a/src/msg/async/Event.cc
+++ b/src/msg/async/Event.cc
@@ -32,27 +32,36 @@
 #define dout_subsys ceph_subsys_ms
 
 #undef dout_prefix
-#define dout_prefix _event_prefix(_dout)
-ostream& EventCenter::_event_prefix(std::ostream *_dout)
-{
-  return *_dout << "Event(" << this << " owner=" << get_owner() << " nevent=" << nevent
-                << " time_id=" << time_event_next_id << ").";
-}
-
+#define dout_prefix *_dout << "EventCallback "
 class C_handle_notify : public EventCallback {
   EventCenter *center;
+  CephContext *cct;
 
  public:
-  C_handle_notify(EventCenter *c): center(c) {}
+  C_handle_notify(EventCenter *c, CephContext *cc): center(c), cct(cc) {}
   void do_request(int fd_or_id) {
     char c[256];
+    int r;
     do {
       center->already_wakeup.set(0);
-      read(fd_or_id, c, sizeof(c));
+      r = read(fd_or_id, c, sizeof(c));
+      if (r < 0) {
+        ldout(cct, 1) << __func__ << " read notify pipe failed: " << cpp_strerror(errno) << dendl;
+        break;
+      }
     } while (center->already_wakeup.read());
   }
 };
 
+#undef dout_prefix
+#define dout_prefix _event_prefix(_dout)
+
+ostream& EventCenter::_event_prefix(std::ostream *_dout)
+{
+  return *_dout << "Event(" << this << " owner=" << get_owner() << " nevent=" << nevent
+                << " time_id=" << time_event_next_id << ").";
+}
+
 int EventCenter::init(int n)
 {
   // can't init multi times
@@ -99,7 +108,7 @@ int EventCenter::init(int n)
   memset(file_events, 0, sizeof(FileEvent)*n);
 
   nevent = n;
-  create_file_event(notify_receive_fd, EVENT_READABLE, EventCallbackRef(new C_handle_notify(this)));
+  create_file_event(notify_receive_fd, EVENT_READABLE, EventCallbackRef(new C_handle_notify(this, cct)));
   return 0;
 }