More cleaning

[invirt/third/libt4.git] / rpc / pollmgr.cc

diff --git a/rpc/pollmgr.cc b/rpc/pollmgr.cc
index 33aeae2..023a7aa 100644 (file)
--- a/rpc/pollmgr.cc
+++ b/rpc/pollmgr.cc
@@ -1,16 +1,15 @@
+#include "types.h"

 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include "jsl_log.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include "jsl_log.h"

-#include "lang/verify.h"

 #include "pollmgr.h"
 #include "pollmgr.h"

-#include "lock.h"

 
 PollMgr *PollMgr::instance = NULL;
 static std::once_flag pollmgr_is_initialized;
 
 
 PollMgr *PollMgr::instance = NULL;
 static std::once_flag pollmgr_is_initialized;
 

-void
+static void

 PollMgrInit()
 {
        PollMgr::instance = new PollMgr();
 PollMgrInit()
 {
        PollMgr::instance = new PollMgr();

@@ -32,7 +31,7 @@ PollMgr::PollMgr() : pending_change_(false)
     th_ = std::thread(&PollMgr::wait_loop, this);
 }
 
     th_ = std::thread(&PollMgr::wait_loop, this);
 }
 

-PollMgr::~PollMgr()
+PollMgr::~PollMgr() [[noreturn]]

 {
        //never kill me!!!
        VERIFY(0);
 {
        //never kill me!!!
        VERIFY(0);

@@ -83,7 +82,7 @@ PollMgr::has_callback(int fd, poll_flag flag, aio_callback *c)
 }
 
 void
 }
 
 void

-PollMgr::wait_loop()
+PollMgr::wait_loop() [[noreturn]]

 {
 
        std::vector<int> readable;
 {
 
        std::vector<int> readable;