mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "core: Transparently handle non-blocking sockets on Windows"

Browse source 
This reverts commit c327850d9e as
the workaround in that commit is no longer needed after the real
bug has been fixed.

Conflicts:
	src/pulsecore/core-util.c
This commit is contained in:
Pierre Ossman 2013-09-20 10:13:41 +02:00 • committed by Tanu Kaskinen
parent 0138a51a2c
commit e7df7bcd76
1 changed files with 4 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/pulsecore/core-util.c
View file

@ -154,8 +154,6 @@ static fd_set nonblocking_fds;
#ifdef OS_IS_WIN32 #ifdef OS_IS_WIN32
#include "poll.h"
/* Returns the directory of the current DLL, with '/bin/' removed if it is the last component */ /* Returns the directory of the current DLL, with '/bin/' removed if it is the last component */
char *pa_win32_get_toplevel(HANDLE handle) { char *pa_win32_get_toplevel(HANDLE handle) {
static char *toplevel = NULL; static char *toplevel = NULL;
@ -420,26 +418,13 @@ ssize_t pa_read(int fd, void *buf, size_t count, int *type) {
#ifdef OS_IS_WIN32 #ifdef OS_IS_WIN32
if (!type || *type == 0) { if (!type || *type == 0) {
int err;
ssize_t r; ssize_t r;
retry:
if ((r = recv(fd, buf, count, 0)) >= 0) if ((r = recv(fd, buf, count, 0)) >= 0)
return r; return r;
err = WSAGetLastError(); if (WSAGetLastError() != WSAENOTSOCK) {
if (err != WSAENOTSOCK) { errno = WSAGetLastError();
/* transparently handle non-blocking sockets, by waiting
* for readiness */
if (err == WSAEWOULDBLOCK) {
struct pollfd pfd;
pfd.fd = fd;
pfd.events = POLLIN;
if (pa_poll(&pfd, 1, -1) >= 0) {
goto retry;
}
}
errno = err;
return r; return r;
} }
@ -465,11 +450,7 @@ ssize_t pa_write(int fd, const void *buf, size_t count, int *type) {
if (!type || *type == 0) { if (!type || *type == 0) {
ssize_t r; ssize_t r;
#ifdef OS_IS_WIN32
int err;
retry:
#endif
for (;;) { for (;;) {
if ((r = send(fd, buf, count, MSG_NOSIGNAL)) < 0) { if ((r = send(fd, buf, count, MSG_NOSIGNAL)) < 0) {
@ -483,19 +464,8 @@ retry:
} }
#ifdef OS_IS_WIN32 #ifdef OS_IS_WIN32
err = WSAGetLastError(); if (WSAGetLastError() != WSAENOTSOCK) {
if (err != WSAENOTSOCK) { errno = WSAGetLastError();
/* transparently handle non-blocking sockets, by waiting
* for readiness */
if (err == WSAEWOULDBLOCK) {
struct pollfd pfd;
pfd.fd = fd;
pfd.events = POLLOUT;
if (pa_poll(&pfd, 1, -1) >= 0) {
goto retry;
}
}
errno = err;
return r; return r;
} }
#else #else