github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-02-04 15:43:04 +00:00
Code Issues Projects Releases Wiki Activity

Rework handling of I/O via select() to use correct fd_set type instead of int for fd sets.

Browse Source 
Some code that was maintaining an fd_set with only a single fd was replaced
       with just the fd as int, which can be added to the global fd_set as needed.
       More testing is required for less usual configurations such as host TCP/UDP/IP
       and direct ethernet (packet filter or NIT) I/O.

	modified:   src/common.c
	modified:   src/ether.c
	modified:   src/inet.c
	modified:   src/initkbd.c
	modified:   src/kbdsubrs.c
	modified:   src/keyevent.c
	modified:   src/main.c
	modified:   src/osmsg.c
	modified:   src/rawrs232c.c
	modified:   src/rpc.c
	modified:   src/rs232c.c
	modified:   src/tty.c
	modified:   src/uraid.c
	modified:   src/xinit.c
This commit is contained in:
Nick Briggs
2020-12-08 19:26:56 -08:00
parent ba0a42f663
commit b234064d91
14 changed files with 117 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/inet.c
View File

@@ -17,6 +17,7 @@ static char *id = "$Id: inet.c,v 1.3 2001/12/24 01:09:03 sybalsky Exp $ Copyrigh
#include <sys/types.h>
#include <sys/file.h>
#include <signal.h>
#include <sys/select.h> /* for FD_ fns */
#ifdef ISC
#include <sys/fcntl.h>
#include <sys/bsdtypes.h>
@@ -88,8 +89,9 @@ static char *id = "$Id: inet.c,v 1.3 2001/12/24 01:09:03 sybalsky Exp $ Copyrigh
#define UDPSendto 130
#define UDPRecvfrom 131
extern u_int LispIOFds, LispReadFds;
extern int *Lisp_errno;
extern fd_set LispReadFds;
fd_set LispIOFds;
LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, LispPTR bufaddr, LispPTR maxlen)
{
@@ -233,8 +235,8 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li
case TCPclose:
sock = LispNumToCInt(nameConn);
LispIOFds &= ~(1 << sock);
LispReadFds &= ~(1 << sock);
FD_CLR(sock, &LispIOFds);
FD_CLR(sock, &LispReadFds);
shutdown(sock, 2);
close(sock);
return (ATOM_T);
@@ -290,8 +292,8 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li
sigsetmask(oldmask);
#endif /* SYSVSIGNALS */
}
LispIOFds |= (1 << result); /* so we get interrupts */
LispReadFds |= LispIOFds;
FD_SET(result, &LispIOFds); /* so we get interrupts */
FD_SET(result, &LispReadFds);
DBPRINT(("LispIOFds = 0x%x.\n", LispIOFds));
return (GetSmallp(result));
break;
@@ -370,8 +372,8 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li
#endif /* RS6000 */
LispIOFds |= (1 << result); /* so we get interrupts */
LispReadFds |= LispIOFds;
FD_SET(result, &LispIOFds); /* so we get interrupts */
FD_SET(result, &LispReadFds);
DBPRINT(("LispIOFds = 0x%x.\n", LispIOFds));
return (GetSmallp(result));
break;