Revert "Extend Pause/Resume to all platforms and remove CPU burner wh…

…en paused." This reverts commit c52bc62.
xrootd · Oct 31, 2013 · dc56cad · dc56cad
1 parent 096a125
commit dc56cad
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 33 deletions.
diff --git a/src/XrdSys/XrdSysIOEvents.cc b/src/XrdSys/XrdSysIOEvents.cc
@@ -816,7 +816,7 @@ void XrdSys::IOEvents::Poller::Detach(XrdSys::IOEvents::Channel *cP,
 // Warning: This method runs unlocked. The caller must have exclusive use of
 //          the reqBuff otherwise unpredictable results will occur.
 
-int XrdSys::IOEvents::Poller::GetRequest(int tmo)
+int XrdSys::IOEvents::Poller::GetRequest()
 {
    ssize_t rlen;
    int rc;
@@ -829,7 +829,7 @@ int XrdSys::IOEvents::Poller::GetRequest(int tmo)
 // Wait for the next request. Some OS's (like Linux) don't support non-blocking
 // pipes. So, we must front the read with a poll.
 //
-   do {rc = poll(&pipePoll, 1, tmo);}
+   do {rc = poll(&pipePoll, 1, 0);}
       while(rc < 0 && (errno == EAGAIN || errno == EINTR));
    if (rc < 1) return 0;
 

diff --git a/src/XrdSys/XrdSysIOEvents.hh b/src/XrdSys/XrdSysIOEvents.hh
@@ -427,7 +427,7 @@ struct  PipeData;
         bool  CbkXeq(Channel *cP, int events, int eNum, const char *eTxt);
 inline  int   GetFault(Channel *cP)   {return cP->chFault;}
 inline  int   GetPollEnt(Channel *cP) {return cP->pollEnt;}
-        int   GetRequest(int tmo=0);
+        int   GetRequest();
         bool  Init(Channel *cP, int &eNum, const char **eTxt, bool &isLockd);
 inline  void  LockChannel(Channel *cP) {cP->chMutex.Lock();}
         int   Poll2Enum(short events);

diff --git a/src/XrdSys/XrdSysIOEventsPollE.icc b/src/XrdSys/XrdSysIOEventsPollE.icc
@@ -354,22 +354,22 @@ bool XrdSys::IOEvents::PollE::Modify(XrdSys::IOEvents::Channel *cP,
 
 bool XrdSys::IOEvents::PollE::Process()
 {
-   int tmo = 0;
+   bool paused = false;
 
 // Get the pipe request and check out actions of interest.
 //
 
 do{if (GetRequest())
       {     if (reqBuff.req == PipeData::Post) reqBuff.theSem->Post();
        else if (reqBuff.req == PipeData::Wait){reqBuff.theSem->Post();
-                                               tmo = -1;
+                                               paused = true;
                                               }
        else if (reqBuff.req == PipeData::Cont) break;
        else if (reqBuff.req == PipeData::Stop){reqBuff.theSem->Post();
                                                return false;
                                               }
       }
-  } while(tmo);
+  } while(paused);
 
 // Return true
 //

diff --git a/src/XrdSys/XrdSysIOEventsPollPoll.icc b/src/XrdSys/XrdSysIOEventsPollPoll.icc
@@ -474,11 +474,9 @@ bool XrdSys::IOEvents::PollPoll::Modify(XrdSys::IOEvents::Channel *cP,
 
 bool XrdSys::IOEvents::PollPoll::Process()
 {
-   int tmo = 0;
-
 // Get the pipe request and check out actions of interest.
 //
-  while(GetRequest(tmo))
+  while(GetRequest())
        {switch(reqBuff.req)
               {case PipeData::MdFD: FDMod(reqBuff.ent, reqBuff.fd, reqBuff.evt);
                                     break;
@@ -491,11 +489,6 @@ bool XrdSys::IOEvents::PollPoll::Process()
                case PipeData::NoOp: break;
                case PipeData::Post: reqBuff.theSem->Post();
                                     break;
-               case PipeData::Wait: reqBuff.theSem->Post();
-                                    tmo = -1;
-                                    break;
-               case PipeData::Cont: tmo = 0;
-                                    break;
                case PipeData::Stop: reqBuff.theSem->Post();
                                     return false;
                                     break;

diff --git a/src/XrdSys/XrdSysIOEventsPollPort.icc b/src/XrdSys/XrdSysIOEventsPollPort.icc
@@ -173,7 +173,6 @@ void XrdSys::IOEvents::PollPort::Begin(XrdSysSemaphore *syncsem,
    int i, rc;
    timespec_t toVal;
    Channel *cP;
-   bool doProcess;
 
 // Indicate to the starting thread that all went well
 //
@@ -196,14 +195,12 @@ void XrdSys::IOEvents::PollPort::Begin(XrdSysSemaphore *syncsem,
                          abort();
                         }
                }
-       doProcess = false;
        for (i = 0; i < (int)numpolled; i++)
            if (pollTab[i].portev_source == PORT_SOURCE_FD)
               {if ((cP = (Channel *)pollTab[i].portev_user))
                   Dispatch(cP, pollTab[i].portev_events);
-                  else doProcess = true;
-              }
-       if (doProcess && !Process()) return;
+                  else if (!Process()) return;
+           }
       } while(1);
 }
 
@@ -331,22 +328,14 @@ bool XrdSys::IOEvents::PollPort::Modify(XrdSys::IOEvents::Channel *cP,
 
 bool XrdSys::IOEvents::PollPort::Process()
 {
-   int tmo = 0;
-
 // Get the pipe request and check out actions of interest.
 //
-
-do{if (GetRequest())
-      {     if (reqBuff.req == PipeData::Post) reqBuff.theSem->Post();
-       else if (reqBuff.req == PipeData::Wait){reqBuff.theSem->Post();
-                                               tmo = -1;
-                                              }
-       else if (reqBuff.req == PipeData::Cont) break;
-       else if (reqBuff.req == PipeData::Stop){reqBuff.theSem->Post();
-                                               return false;
-                                              }
-      }
-  } while(tmo);
+  if (GetRequest())
+      if (reqBuff.req == PipeData::Post) reqBuff.theSem->Post();
+     {if (reqBuff.req == PipeData::Stop){reqBuff.theSem->Post();
+                                         return false;
+                                        }
+     }
 
 // Associate the pipe again and return true
 //