You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dr...@locus.apache.org on 2000/04/22 19:28:38 UTC
cvs commit: apache-2.0/src/lib/apr/network_io/beos sendrecv.c sockets.c
dreid 00/04/22 10:28:38
Modified: src/lib/apr/network_io/beos sendrecv.c sockets.c
Log:
More code tidy up for BeOS.
Revision Changes Path
1.9 +53 -53 apache-2.0/src/lib/apr/network_io/beos/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sendrecv.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sendrecv.c 2000/04/16 16:59:38 1.8
+++ sendrecv.c 2000/04/22 17:28:38 1.9
@@ -54,6 +54,40 @@
#include "networkio.h"
+static ap_status_t wait_for_io_or_timeout(ap_socket_t *sock, int for_read)
+{
+ struct timeval tv, *tvptr;
+ fd_set fdset;
+ int srv;
+
+ do {
+ FD_ZERO(&fdset);
+ FD_SET(sock->socketdes, &fdset);
+ if (sock->timeout < 0) {
+ tvptr = NULL;
+ }
+ else {
+ tv.tv_sec = sock->timeout / AP_USEC_PER_SEC;
+ tv.tv_usec = sock->timeout % AP_USEC_PER_SEC;
+ tvptr = &tv;
+ }
+ srv = select(sock->socketdes + 1,
+ for_read ? &fdset : NULL,
+ for_read ? NULL : &fdset,
+ NULL,
+ tvptr);
+ /* TODO - timeout should be smaller on repeats of this loop */
+ } while (srv == -1 && errno == EINTR);
+
+ if (srv == 0) {
+ return APR_TIMEUP;
+ }
+ else if (srv < 0) {
+ return errno;
+ }
+ return APR_SUCCESS;
+}
+
ap_status_t ap_send(ap_socket_t *sock, const char *buf, ap_ssize_t *len)
{
ssize_t rv;
@@ -62,39 +96,22 @@
rv = send(sock->socketdes, buf, (*len), 0);
} while (rv == -1 && errno == EINTR);
- if (rv == -1 && errno == EAGAIN && sock->timeout > 0) {
- struct timeval tv, *tvptr;
- fd_set fdset;
- int srv;
-
- do {
- FD_ZERO(&fdset);
- FD_SET(sock->socketdes, &fdset);
- if (sock->timeout == -1)
- tvptr = NULL;
- else {
- tv.tv_sec = sock->timeout / AP_USEC_PER_SEC;
- tv.tv_usec = sock->timeout % AP_USEC_PER_SEC;
- tvptr = &tv;
- }
-
- srv = select(FD_SETSIZE, NULL, &fdset, NULL, tvptr);
- } while (srv == -1 && errno == EINTR);
-
- if (srv == 0) {
- (*len) = -1;
- return APR_TIMEUP;
- }
- if (srv < 1) {
- (*len) = -1;
- return errno;
+ if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) {
+ ap_status_t arv = wait_for_io_or_timeout(sock, 0);
+ if (arv != APR_SUCCESS) {
+ *len = 0;
+ return arv;
}
else {
do {
- rv = send(sock->socketdes, buf, (*len),0);
+ rv = send(sock->socketdes, buf, (*len), 0);
} while (rv == -1 && errno == EINTR);
}
}
+ if (rv == -1) {
+ *len = 0;
+ return errno;
+ }
(*len) = rv;
return APR_SUCCESS;
}
@@ -107,38 +124,21 @@
rv = recv(sock->socketdes, buf, (*len), 0);
} while (rv == -1 && errno == EINTR);
- if (rv == -1 && errno == EAGAIN && sock->timeout > 0) {
- struct timeval tv, *tvptr;
- fd_set fdset;
- int srv;
-
- do {
- FD_ZERO(&fdset);
- FD_SET(sock->socketdes, &fdset);
- if (sock->timeout == -1)
- tvptr = NULL;
- else {
- tv.tv_sec = sock->timeout / AP_USEC_PER_SEC;
- tv.tv_usec = sock->timeout % AP_USEC_PER_SEC;
- tvptr = &tv;
- }
-
- srv = select(FD_SETSIZE, &fdset, NULL, NULL, tvptr);
- } while (srv == -1 && errno == EINTR);
-
- if (srv == 0) {
- (*len) = -1;
- return APR_TIMEUP;
- }
- if (srv < 1) {
- (*len) = -1;
- return errno;
+ if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) {
+ ap_status_t arv = wait_for_io_or_timeout(sock, 1);
+ if (arv != APR_SUCCESS) {
+ *len = 0;
+ return arv;
}
else {
do {
rv = recv(sock->socketdes, buf, (*len), 0);
} while (rv == -1 && errno == EINTR);
}
+ }
+ if (rv == -1) {
+ (*len) = 0;
+ return errno;
}
(*len) = rv;
return APR_SUCCESS;
1.24 +1 -1 apache-2.0/src/lib/apr/network_io/beos/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sockets.c 2000/04/19 21:17:36 1.23
+++ sockets.c 2000/04/22 17:28:38 1.24
@@ -102,7 +102,7 @@
ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how)
{
- return APR_SUCCESS;
+ return shutdown(thesocket->socketdes, how);
}
ap_status_t ap_close_socket(ap_socket_t *thesocket)