[Utils] Avoid emitting polling fstsl error message unless aborting.

xrootd · May 2, 2022 · 03b35da · 03b35da
1 parent ffce22d
commit 03b35da
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 20 deletions.
diff --git a/src/XrdSys/XrdSysIOEventsPollE.icc b/src/XrdSys/XrdSysIOEventsPollE.icc
@@ -216,16 +216,14 @@ void XrdSys::IOEvents::PollE::Begin(XrdSysSemaphore *syncsem,
        if (numpolled == 0) CbkTMO();
        else if (numpolled <  0)
                {int rc = errno;
-                cerr <<"EPoll: " <<XrdSysE2T(rc) <<" polling for events" <<endl;
                 //--------------------------------------------------------------
                 // If we are in a child process and the epoll file descriptor
                 // has been closed, there is an immense chance the fork will be
                 // followed by an exec, in which case we don't want to abort
                 //--------------------------------------------------------------
-                if( rc == EBADF && parentPID != getpid() )
-                  return;
-                else
-                  abort();
+                if( rc == EBADF && parentPID != getpid() ) return;
+                cerr <<"EPoll: "<<XrdSysE2T(rc)<<" polling for events "<<endl;
+                abort();
                }
        else for (int i = 0; i < numpolled; i++)
                 {if ((cP = (Channel *)pollTab[i].data.ptr))

diff --git a/src/XrdSys/XrdSysIOEventsPollKQ.icc b/src/XrdSys/XrdSysIOEventsPollKQ.icc
@@ -223,16 +223,14 @@ void XrdSys::IOEvents::PollKQ::Begin(XrdSysSemaphore *syncsem,
             if (numpolled == 0) CbkTMO();
        else if (numpolled <  0)
                {int rc = errno;
-                cerr <<"KQ: " <<XrdSysE2T(rc) <<" polling for events" <<endl;
                 //--------------------------------------------------------------
                 // If we are in a child process and the poll file descriptor
                 // has been closed, there is an immense chance the fork will be
                 // followed by an exec, in which case we don't want to abort
                 //--------------------------------------------------------------
-                if( rc == EBADF && parentPID != getpid() )
-                  return;
-                else
-                  abort();
+                if( rc == EBADF && parentPID != getpid() ) return;
+                cerr <<"KQ: " <<XrdSysE2T(rc) <<" polling for events" <<endl;
+                abort();
                }
        else for (int i = 0; i < numpolled; i++)
                 {if ((cP = (Channel *)pollTab[i].udata)) Dispatch(cP, i);

diff --git a/src/XrdSys/XrdSysIOEventsPollPoll.icc b/src/XrdSys/XrdSysIOEventsPollPoll.icc
@@ -198,16 +198,14 @@ void XrdSys::IOEvents::PollPoll::Begin(XrdSysSemaphore *syncsem,
             if (numpolled == 0) CbkTMO();
        else if (numpolled <  0)
                {int rc = errno;
-                cerr <<"EPoll: " <<XrdSysE2T(rc) <<" polling for events" <<endl;
                 //--------------------------------------------------------------
                 // If we are in a child process and the poll file descriptor
                 // has been closed, there is an immense chance the fork will be
                 // followed by an exec, in which case we don't want to abort
                 //--------------------------------------------------------------
-                if( rc == EBADF && parentPID != getpid() )
-                  return;
-                else
-                  abort();
+                if( rc == EBADF && parentPID != getpid() ) return;
+                cerr <<"PPoll: "<<XrdSysE2T(rc)<<" polling for events"<<endl;
+                abort();
                }
        else{if (pollTab[0].revents) numpolled--;
             for (i = 1; i < num2poll && numpolled; i++)

diff --git a/src/XrdSys/XrdSysIOEventsPollPort.icc b/src/XrdSys/XrdSysIOEventsPollPort.icc
@@ -196,16 +196,14 @@ void XrdSys::IOEvents::PollPort::Begin(XrdSysSemaphore *syncsem,
             if (rc)
                {if (errno == ETIME || !errno) CbkTMO();
                    else {int rc = errno;
-                         cerr <<"PollP: " <<XrdSysE2T(rc) <<" polling for events" <<endl;
                          //--------------------------------------------------------------
                          // If we are in a child process and the poll file descriptor
                          // has been closed, there is an immense chance the fork will be
                          // followed by an exec, in which case we don't want to abort
                          //--------------------------------------------------------------
-                         if( rc == EBADF && parentPID != getpid() )
-                            return;
-                         else
-                            abort();
+                         if( rc == EBADF && parentPID != getpid() ) return;
+                         cerr <<"PollP: " <<XrdSysE2T(rc) <<" polling for events" <<endl;
+                         abort();
                         }
                }
        for (int i = 0; i < (int)numpolled; i++)