Added ::select to Windows sockets. #510
Conversation
This fixes the high CPU load issue on Windows with non-blocking sockets (after PR Haivision#483). Fixed type casting warnings in channel.cpp.
| @@ -162,10 +162,10 @@ void CChannel::open(const sockaddr* addr) | |||
| if (0 != ::getaddrinfo(NULL, "0", &hints, &res)) | |||
| throw CUDTException(MJ_SETUP, MN_NORES, NET_ERROR); | |||
|
|
|||
| if (0 != ::bind(m_iSocket, res->ai_addr, res->ai_addrlen)) | |||
| if (0 != ::bind(m_iSocket, res->ai_addr, (int) res->ai_addrlen)) | |||
There was a problem hiding this comment.
Here socklen_t, too... probably.
There was a problem hiding this comment.
The last argument of the ::bind has type int. I think casting to socklen_t is not correct, although it is a typedef of int.
There was a problem hiding this comment.
Depends. The version that I found in my manpage has the 3rd argument of ::bind set as socklen_t. Might be that there's some difference on Windows, but still the type of this argument should be the same as the type of addrinfo::ai_addrlen. This cast is then at least nonportable.
There was a problem hiding this comment.
@ethouris, you are right on this. socklen_t is better.
| @@ -433,7 +433,7 @@ int CChannel::sendto(const sockaddr* addr, CPacket& packet) const | |||
|
|
|||
| if (packet.isControl()) | |||
| { | |||
| for (int l = 0, n = packet.getLength() / 4; l < n; ++ l) | |||
| for (ptrdiff_t l = 0, n = packet.getLength() / 4; l < n; ++ l) | |||
There was a problem hiding this comment.
Why is cast to (ptrdiff_t) not required, while it's required in the loop above?
There was a problem hiding this comment.
Because in the loop above 'k' is not used to offset a pointer.
There was a problem hiding this comment.
The "above loop" I meant this in line 393 with 'i' control variable.
There was a problem hiding this comment.
@ethouris, do you mean this lines:
n = (ptrdiff_t) packet.getLength() / 4
and
n = packet.getLength() / 4
They should be the same, I missed this. I will remove this casting.
This fixes the high CPU load issue on Windows with non-blocking sockets (after PR #483).
Fixed type casting warnings in channel.cpp.