Use minus 1 instead of errno to indicate system poll error (#363)

medooze · Oct 21, 2024 · 9e114f7 · 9e114f7
1 parent b4e640b
commit 9e114f7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/SystemPoll.cpp b/src/SystemPoll.cpp
@@ -142,7 +142,8 @@ std::pair<uint16_t, int> SystemPoll::GetEvents(int fd) const
 
 	if ((revents & POLLHUP) || (revents & POLLERR))
 	{
-		return std::make_pair<>(0, errno);
+		Error("-SystemPoll::GetEvents() | Error events: 0x%x fd: %d errno: %d\n", revents, fd, errno);
+		return std::make_pair<>(0, -1);
 	}
 
 	if (revents & POLLIN)
@@ -182,7 +183,10 @@ int SystemPoll::Wait(uint32_t timeOutMs)
 
 	// Wait for events
 	if (poll(syspfds.data(), syspfds.size(),timeOutMs) < 0)
-		return errno;
+	{
+		Error("-SystemPoll::Wait() | poll() error. errno: %d\n", errno);
+		return -1;
+	}
 
 	// Copy back
 	for (size_t i = 0; i < syspfds.size(); i++)
@@ -193,7 +197,8 @@ int SystemPoll::Wait(uint32_t timeOutMs)
 			if ((revents & POLLHUP) || (revents & POLLERR))
 			{
 				signalling.ClearSignal();
-				return errno;
+				Error("-SystemPoll::Wait() | Error events: 0x%x fd: %d errno: %d\n", revents, syspfds[i].fd, errno);
+				return -1;
 			}
 			else if (revents & POLLIN)
 			{

diff --git a/src/rtmp/rtmpclientconnection.cpp b/src/rtmp/rtmpclientconnection.cpp
@@ -206,7 +206,7 @@ void RTMPClientConnection::OnPollIn(int fd)
 	int len = read(fd, buffer, BufferSize);
 	if (len == 0)
 	{
-		Error("-RTMPClientConnection::OnPollIn() Peer closed");
+		Error("-RTMPClientConnection::OnPollIn() Peer closed\n");
 		SetStopping(ToUType(RTMPClientConnection::ErrorCode::PeerClosed));
 	}
 

diff --git a/src/rtmp/rtmpserver.cpp b/src/rtmp/rtmpserver.cpp
@@ -128,7 +128,7 @@ int RTMPServer::Run()
 		if (poll(ufds,1,-1)<0)
 		{
 			//Error
-			Error("-RTMPServer::Run() pool error [fd:%d,errno:%d]\n",ufds[0].fd,errno);
+			Error("-RTMPServer::Run() poll error [fd:%d,errno:%d]\n",ufds[0].fd,errno);
 			//Check if already inited
 			if (!inited)
 				//Exit
@@ -145,7 +145,7 @@ int RTMPServer::Run()
 		if (ufds[0].revents!=POLLIN)
 		{
 			//Error
-			Error("-RTMPServer::Run() poolin error event [event:%d,fd:%d,errno:%d]\n",ufds[0].revents,ufds[0].fd,errno);
+			Error("-RTMPServer::Run() pollin error event [event:%d,fd:%d,errno:%d]\n",ufds[0].revents,ufds[0].fd,errno);
 			//Check if already inited
 			if (!inited)
 				//Exit