summaryrefslogtreecommitdiff
path: root/lib/select.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-04-16 16:34:08 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-04-16 16:34:08 +0000
commit76627b322e369c209c60863b9e1f05e3ce02953d (patch)
tree74658f06175743e0518963b8e5ed9e37eae3f1c5 /lib/select.c
parent827228bd69f8dd17824ae878d6211809b193eaff (diff)
downloadcurl-76627b322e369c209c60863b9e1f05e3ce02953d.tar.gz
- Robert Iakobashvil added curl_multi_socket_action() to libcurl, which is a
function that deprecates the curl_multi_socket() function. Using the new function the application tell libcurl what action that was found in the socket that it passes in. This gives a significant performance boost as it allows libcurl to avoid a call to poll()/select() for every call to curl_multi_socket*().
Diffstat (limited to 'lib/select.c')
-rw-r--r--lib/select.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/select.c b/lib/select.c
index 2af14eb36..1cc819a2a 100644
--- a/lib/select.c
+++ b/lib/select.c
@@ -161,7 +161,7 @@ static int wait_ms(int timeout_ms)
* Return values:
* -1 = system call error or fd >= FD_SETSIZE
* 0 = timeout
- * CSELECT_IN | CSELECT_OUT | CSELECT_ERR
+ * CURL_CSELECT_IN | CURL_CSELECT_OUT | CURL_CSELECT_ERR
*/
int Curl_socket_ready(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms)
{
@@ -223,16 +223,16 @@ int Curl_socket_ready(curl_socket_t readfd, curl_socket_t writefd, int timeout_m
num = 0;
if (readfd != CURL_SOCKET_BAD) {
if (pfd[num].revents & (POLLRDNORM|POLLIN|POLLERR|POLLHUP))
- ret |= CSELECT_IN;
+ ret |= CURL_CSELECT_IN;
if (pfd[num].revents & (POLLRDBAND|POLLPRI|POLLNVAL))
- ret |= CSELECT_ERR;
+ ret |= CURL_CSELECT_ERR;
num++;
}
if (writefd != CURL_SOCKET_BAD) {
if (pfd[num].revents & (POLLWRNORM|POLLOUT))
- ret |= CSELECT_OUT;
+ ret |= CURL_CSELECT_OUT;
if (pfd[num].revents & (POLLERR|POLLHUP|POLLNVAL))
- ret |= CSELECT_ERR;
+ ret |= CURL_CSELECT_ERR;
}
return ret;
@@ -279,15 +279,15 @@ int Curl_socket_ready(curl_socket_t readfd, curl_socket_t writefd, int timeout_m
ret = 0;
if (readfd != CURL_SOCKET_BAD) {
if (FD_ISSET(readfd, &fds_read))
- ret |= CSELECT_IN;
+ ret |= CURL_CSELECT_IN;
if (FD_ISSET(readfd, &fds_err))
- ret |= CSELECT_ERR;
+ ret |= CURL_CSELECT_ERR;
}
if (writefd != CURL_SOCKET_BAD) {
if (FD_ISSET(writefd, &fds_write))
- ret |= CSELECT_OUT;
+ ret |= CURL_CSELECT_OUT;
if (FD_ISSET(writefd, &fds_err))
- ret |= CSELECT_ERR;
+ ret |= CURL_CSELECT_ERR;
}
return ret;