dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2024-12-26 04:28:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing send/recv and optimizing.

Browse Source
This commit is contained in:
Diego Nehab 2004-06-23 01:08:54 +00:00
parent 1ce47ebe39
commit a193c087a4
5 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
TODO
View File

@ -1,4 +1,11 @@
make sure all modules that can use socket.newtry
ajeitar o connect com a dica do mike
if ((err > 1 || !FD_ISSET(sock, &wfds)) &&
recv(sock, &dummy, 0, 0) < 0 && errno != EWOULDBLOCK) ...
sort out the wrap around of gettime...
optmize aux_getgroupudata
make sure all modules that can use it actually use socket.newtry
make select interrupt safe make select interrupt safe
adicionar exemplos de expansão: pipe, local, named pipe adicionar exemplos de expansão: pipe, local, named pipe
Add service name translation. Add service name translation.
@ -9,5 +16,7 @@ testar os options!
- proteger ou atomizar o conjunto (timedout, receive), (timedout, send) - proteger ou atomizar o conjunto (timedout, receive), (timedout, send)
- inet_ntoa também é uma merda. - inet_ntoa também é uma merda.
- SSL - SSL
- unix 92 bytes maximo no endereço, incluindo o zero
- unix 9216 maximo de datagram size these are done
* unix 92 bytes maximo no endereço, incluindo o zero
* unix 9216 maximo de datagram size

2
src/socket.h
View File

@ -60,6 +60,6 @@ const char *sock_listen(p_sock ps, int backlog);
const char *sock_accept(p_sock ps, p_sock pa, SA *addr, const char *sock_accept(p_sock ps, p_sock pa, SA *addr,
socklen_t *addr_len, p_tm tm); socklen_t *addr_len, p_tm tm);
const char *sock_hoststrerror(); const char *sock_hoststrerror(void);
#endif /* SOCK_H */ #endif /* SOCK_H */

45
src/usocket.c
View File

@ -113,7 +113,7 @@ const char *sock_connect(p_sock ps, SA *addr, socklen_t addr_len, p_tm tm)
if (err > 0) { if (err > 0) {
char dummy; char dummy;
/* recv will set errno to the value a blocking connect would set */ /* recv will set errno to the value a blocking connect would set */
if (recv(sock, &dummy, 0, 0) < 0 && errno != EWOULDBLOCK) if (recv(sock, &dummy, 0, 0) < 0 && errno != EAGAIN)
return sock_connectstrerror(errno); return sock_connectstrerror(errno);
else else
return NULL; return NULL;
@ -179,7 +179,7 @@ const char *sock_accept(p_sock ps, p_sock pa, SA *addr,
/* if result is valid, we are done */ /* if result is valid, we are done */
if (*pa != SOCK_INVALID) return NULL; if (*pa != SOCK_INVALID) return NULL;
/* find out if we failed for a fatal reason */ /* find out if we failed for a fatal reason */
if (errno != EWOULDBLOCK && errno != ECONNABORTED) if (errno != EAGAIN && errno != ECONNABORTED)
return sock_acceptstrerror(errno); return sock_acceptstrerror(errno);
/* call select to avoid busy-wait. */ /* call select to avoid busy-wait. */
FD_ZERO(&fds); FD_ZERO(&fds);
@ -206,21 +206,23 @@ int sock_send(p_sock ps, const char *data, size_t count, size_t *sent,
while (put < 0 && errno == EINTR); while (put < 0 && errno == EINTR);
/* deal with failure */ /* deal with failure */
if (put <= 0) { if (put <= 0) {
int ret;
fd_set fds; fd_set fds;
/* in any case, nothing has been sent */ /* in any case, nothing has been sent */
*sent = 0; *sent = 0;
/* only proceed to select if no error happened */
if (errno != EAGAIN) return IO_ERROR;
/* optimize for the timeout = 0 case */
if (timeout == 0) return IO_TIMEOUT;
/* here we know the connection has been closed */ /* here we know the connection has been closed */
if (errno == EPIPE) return IO_CLOSED; if (errno == EPIPE) return IO_CLOSED;
/* run select to avoid busy wait */ /* run select to avoid busy wait */
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(sock, &fds); FD_SET(sock, &fds);
if (sock_select(sock+1, NULL, &fds, NULL, timeout) <= 0) { ret = sock_select(sock+1, NULL, &fds, NULL, timeout);
/* here the call was interrupted. calling again might work */ if (ret == 0) return IO_TIMEOUT;
if (errno == EINTR) return IO_RETRY; else if (ret > 0 || errno == EINTR) return IO_RETRY;
/* here there was no data before timeout */ else return IO_ERROR;
else return IO_TIMEOUT;
/* here we didn't send anything, but now we can */
} else return IO_RETRY;
/* here we successfully sent something */ /* here we successfully sent something */
} else { } else {
*sent = put; *sent = put;
@ -240,15 +242,18 @@ int sock_sendto(p_sock ps, const char *data, size_t count, size_t *sent,
do put = sendto(sock, data, count, 0, addr, addr_len); do put = sendto(sock, data, count, 0, addr, addr_len);
while (put < 0 && errno == EINTR); while (put < 0 && errno == EINTR);
if (put <= 0) { if (put <= 0) {
int ret;
fd_set fds; fd_set fds;
*sent = 0; *sent = 0;
if (errno != EAGAIN) return IO_ERROR;
if (timeout == 0) return IO_TIMEOUT;
if (errno == EPIPE) return IO_CLOSED; if (errno == EPIPE) return IO_CLOSED;
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(sock, &fds); FD_SET(sock, &fds);
if (sock_select(sock+1, NULL, &fds, NULL, timeout) <= 0) { ret = sock_select(sock+1, NULL, &fds, NULL, timeout);
if (errno == EINTR) return IO_RETRY; if (ret == 0) return IO_TIMEOUT;
else return IO_TIMEOUT; else if (ret > 0 || errno == EINTR) return IO_RETRY;
} else return IO_RETRY; else return IO_ERROR;
} else { } else {
*sent = put; *sent = put;
return IO_DONE; return IO_DONE;
@ -270,12 +275,14 @@ int sock_recv(p_sock ps, char *data, size_t count, size_t *got, int timeout)
int ret; int ret;
*got = 0; *got = 0;
if (taken == 0) return IO_CLOSED; if (taken == 0) return IO_CLOSED;
if (errno != EAGAIN) return IO_ERROR;
if (timeout == 0) return IO_TIMEOUT;
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(sock, &fds); FD_SET(sock, &fds);
ret = sock_select(sock+1, &fds, NULL, NULL, timeout); ret = sock_select(sock+1, &fds, NULL, NULL, timeout);
if (ret < 0 && errno == EINTR) return IO_RETRY;
if (ret == 0) return IO_TIMEOUT; if (ret == 0) return IO_TIMEOUT;
return IO_RETRY; else if (ret > 0 || errno == EINTR) return IO_RETRY;
else return IO_ERROR;
} else { } else {
*got = taken; *got = taken;
return IO_DONE; return IO_DONE;
@ -298,12 +305,14 @@ int sock_recvfrom(p_sock ps, char *data, size_t count, size_t *got,
int ret; int ret;
*got = 0; *got = 0;
if (taken == 0) return IO_CLOSED; if (taken == 0) return IO_CLOSED;
if (errno != EAGAIN) return IO_ERROR;
if (timeout == 0) return IO_TIMEOUT;
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(sock, &fds); FD_SET(sock, &fds);
ret = sock_select(sock+1, &fds, NULL, NULL, timeout); ret = sock_select(sock+1, &fds, NULL, NULL, timeout);
if (ret < 0 && errno == EINTR) return IO_RETRY;
if (ret == 0) return IO_TIMEOUT; if (ret == 0) return IO_TIMEOUT;
return IO_RETRY; else if (ret > 0 || errno == EINTR) return IO_RETRY;
else return IO_ERROR;
} else { } else {
*got = taken; *got = taken;
return IO_DONE; return IO_DONE;
@ -363,7 +372,7 @@ static const char *sock_createstrerror(int err)
static const char *sock_acceptstrerror(int err) static const char *sock_acceptstrerror(int err)
{ {
switch (err) { switch (err) {
case EWOULDBLOCK: return io_strerror(IO_RETRY); case EAGAIN: return io_strerror(IO_RETRY);
case EBADF: return "invalid descriptor"; case EBADF: return "invalid descriptor";
case ENOBUFS: case ENOMEM: return "insuffucient buffer space"; case ENOBUFS: case ENOMEM: return "insuffucient buffer space";
case ENOTSOCK: return "descriptor not a socket"; case ENOTSOCK: return "descriptor not a socket";

9
src/wsocket.c
View File

@ -200,7 +200,6 @@ int sock_send(p_sock ps, const char *data, size_t count, size_t *sent,
{ {
t_sock sock = *ps; t_sock sock = *ps;
int put; int put;
int ret;
/* avoid making system calls on closed sockets */ /* avoid making system calls on closed sockets */
if (sock == SOCK_INVALID) return IO_CLOSED; if (sock == SOCK_INVALID) return IO_CLOSED;
/* try to send something */ /* try to send something */
@ -212,6 +211,9 @@ int sock_send(p_sock ps, const char *data, size_t count, size_t *sent,
/* run select to avoid busy wait */ /* run select to avoid busy wait */
if (WSAGetLastError() == WSAEWOULDBLOCK) { if (WSAGetLastError() == WSAEWOULDBLOCK) {
fd_set fds; fd_set fds;
int ret;
/* optimize for the timeout = 0 case */
if (timeout == 0) return IO_TIMEOUT;
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(sock, &fds); FD_SET(sock, &fds);
ret = sock_select(0, NULL, &fds, NULL, timeout); ret = sock_select(0, NULL, &fds, NULL, timeout);
@ -236,13 +238,14 @@ int sock_sendto(p_sock ps, const char *data, size_t count, size_t *sent,
{ {
t_sock sock = *ps; t_sock sock = *ps;
int put; int put;
int ret;
if (sock == SOCK_INVALID) return IO_CLOSED; if (sock == SOCK_INVALID) return IO_CLOSED;
put = sendto(sock, data, (int) count, 0, addr, addr_len); put = sendto(sock, data, (int) count, 0, addr, addr_len);
if (put <= 0) { if (put <= 0) {
*sent = 0; *sent = 0;
if (WSAGetLastError() == WSAEWOULDBLOCK) { if (WSAGetLastError() == WSAEWOULDBLOCK) {
fd_set fds; fd_set fds;
int ret;
if (timeout == 0) return IO_TIMEOUT;
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(sock, &fds); FD_SET(sock, &fds);
ret = sock_select(0, NULL, &fds, NULL, timeout); ret = sock_select(0, NULL, &fds, NULL, timeout);
@ -269,6 +272,7 @@ int sock_recv(p_sock ps, char *data, size_t count, size_t *got, int timeout)
int ret; int ret;
*got = 0; *got = 0;
if (taken == 0 || WSAGetLastError() != WSAEWOULDBLOCK) return IO_CLOSED; if (taken == 0 || WSAGetLastError() != WSAEWOULDBLOCK) return IO_CLOSED;
if (timeout == 0) return IO_TIMEOUT;
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(sock, &fds); FD_SET(sock, &fds);
ret = sock_select(0, &fds, NULL, NULL, timeout); ret = sock_select(0, &fds, NULL, NULL, timeout);
@ -295,6 +299,7 @@ int sock_recvfrom(p_sock ps, char *data, size_t count, size_t *got,
int ret; int ret;
*got = 0; *got = 0;
if (taken == 0 || WSAGetLastError() != WSAEWOULDBLOCK) return IO_CLOSED; if (taken == 0 || WSAGetLastError() != WSAEWOULDBLOCK) return IO_CLOSED;
if (timeout == 0) return IO_TIMEOUT;
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(sock, &fds); FD_SET(sock, &fds);
ret = sock_select(0, &fds, NULL, NULL, timeout); ret = sock_select(0, &fds, NULL, NULL, timeout);

2
test/testsrvr.lua
View File

@ -1,4 +1,4 @@
local socket = require"socket" socket = require"socket"
host = host or "localhost" host = host or "localhost"
port = port or "8080" port = port or "8080"