ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ws2_32: Cache the memory used for poll() calls. 

Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Bruno Jesus 2016-11-30 04:48:28 -02:00 committed by Alexandre Julliard
parent e33527b2a7
commit 2251aeb6d2
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/ws2_32/socket.c
View File

@ -586,6 +586,8 @@ struct per_thread_data
struct WS_hostent *he_buffer; struct WS_hostent *he_buffer;
struct WS_servent *se_buffer; struct WS_servent *se_buffer;
struct WS_protoent *pe_buffer; struct WS_protoent *pe_buffer;
struct pollfd *fd_cache;
unsigned int fd_count;
int he_len; int he_len;
int se_len; int se_len;
int pe_len; int pe_len;
@ -1170,9 +1172,7 @@ static void free_per_thread_data(void)
HeapFree( GetProcessHeap(), 0, ptb->he_buffer ); HeapFree( GetProcessHeap(), 0, ptb->he_buffer );
HeapFree( GetProcessHeap(), 0, ptb->se_buffer ); HeapFree( GetProcessHeap(), 0, ptb->se_buffer );
HeapFree( GetProcessHeap(), 0, ptb->pe_buffer ); HeapFree( GetProcessHeap(), 0, ptb->pe_buffer );
ptb->he_buffer = NULL; HeapFree( GetProcessHeap(), 0, ptb->fd_cache );
ptb->se_buffer = NULL;
ptb->pe_buffer = NULL;
HeapFree( GetProcessHeap(), 0, ptb ); HeapFree( GetProcessHeap(), 0, ptb );
NtCurrentTeb()->WinSockData = NULL; NtCurrentTeb()->WinSockData = NULL;
@ -5109,6 +5109,7 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set
{ {
unsigned int i, j = 0, count = 0; unsigned int i, j = 0, count = 0;
struct pollfd *fds; struct pollfd *fds;
struct per_thread_data *ptb = get_per_thread_data();
if (readfds) count += readfds->fd_count; if (readfds) count += readfds->fd_count;
if (writefds) count += writefds->fd_count; if (writefds) count += writefds->fd_count;
@ -5119,11 +5120,22 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set
SetLastError(WSAEINVAL); SetLastError(WSAEINVAL);
return NULL; return NULL;
} }
if (!(fds = HeapAlloc( GetProcessHeap(), 0, count * sizeof(fds[0]))))
/* check if the cache can hold all descriptors, if not do the resizing */
if (ptb->fd_count < count)
{ {
SetLastError( ERROR_NOT_ENOUGH_MEMORY ); if (!(fds = HeapAlloc(GetProcessHeap(), 0, count * sizeof(fds[0]))))
return NULL; {
SetLastError( ERROR_NOT_ENOUGH_MEMORY );
return NULL;
}
HeapFree(GetProcessHeap(), 0, ptb->fd_cache);
ptb->fd_cache = fds;
ptb->fd_count = count;
} }
else
fds = ptb->fd_cache;
if (readfds) if (readfds)
for (i = 0; i < readfds->fd_count; i++, j++) for (i = 0; i < readfds->fd_count; i++, j++)
{ {
@ -5198,7 +5210,6 @@ failed:
if (exceptfds) if (exceptfds)
for (i = 0; i < exceptfds->fd_count && j < count; i++, j++) for (i = 0; i < exceptfds->fd_count && j < count; i++, j++)
if (fds[j].fd != -1) release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); if (fds[j].fd != -1) release_sock_fd( exceptfds->fd_array[i], fds[j].fd );
HeapFree( GetProcessHeap(), 0, fds );
return NULL; return NULL;
} }
@ -5331,7 +5342,6 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds,
if (ret == -1) SetLastError(wsaErrno()); if (ret == -1) SetLastError(wsaErrno());
else ret = get_poll_results( ws_readfds, ws_writefds, ws_exceptfds, pollfds ); else ret = get_poll_results( ws_readfds, ws_writefds, ws_exceptfds, pollfds );
HeapFree( GetProcessHeap(), 0, pollfds );
return ret; return ret;
} }