conservatory
/
ikarus
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactored nonblocking code in ikarus-io.c and ikarus.io.ss

This commit is contained in:
Abdulaziz Ghuloum 2008-03-23 00:41:49 -04:00
parent ec69dc4a7c
commit 6e599c4c72
5 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lab/tcp-connect-nonblocking-example.ss
View File

@ -15,6 +15,7 @@
(with-exception-handler (with-exception-handler
(lambda (c) (lambda (c)
;;; just return and let it retry until it succeeds ;;; just return and let it retry until it succeeds
(print-condition c)
(unless (i/o-would-block-condition? c) (unless (i/o-would-block-condition? c)
(raise c))) (raise c)))
(lambda () (lambda ()

BIN
scheme/ikarus.boot.prebuilt
View File

Binary file not shown.

19
scheme/ikarus.io.ss
View File

@ -2054,7 +2054,7 @@
cmd input-file-buffer-size #f #t cmd input-file-buffer-size #f #t
'process))))) 'process)))))
(define (socket->ports socket who id) (define (socket->ports socket who id block?)
(if (< socket 0) (if (< socket 0)
(io-error who id socket) (io-error who id socket)
(let ([close (let ([close
@ -2063,6 +2063,10 @@
(if closed-once? (if closed-once?
((file-close-proc id socket)) ((file-close-proc id socket))
(set! closed-once? #t))))]) (set! closed-once? #t))))])
(unless block?
(let ([rv (foreign-call "ikrt_make_fd_nonblocking" socket)])
(unless (eq? rv 0)
(io-error who id socket))))
(values (values
(fh->output-port socket (fh->output-port socket
id output-file-buffer-size #f close who) id output-file-buffer-size #f close who)
@ -2071,7 +2075,7 @@
(define-syntax define-connector (define-syntax define-connector
(syntax-rules () (syntax-rules ()
[(_ who foreign-name) [(_ who foreign-name block?)
(define (who host srvc) (define (who host srvc)
(unless (and (string? host) (string? srvc)) (unless (and (string? host) (string? srvc))
(die 'who "host and service must both be strings" host srvc)) (die 'who "host and service must both be strings" host srvc))
@ -2079,12 +2083,13 @@
(foreign-call foreign-name (foreign-call foreign-name
(string->utf8 host) (string->utf8 srvc)) (string->utf8 host) (string->utf8 srvc))
'who 'who
(string-append host ":" srvc)))])) (string-append host ":" srvc)
block?))]))
(define-connector tcp-connect "ikrt_tcp_connect") (define-connector tcp-connect "ikrt_tcp_connect" #t)
(define-connector udp-connect "ikrt_udp_connect") (define-connector udp-connect "ikrt_udp_connect" #t)
(define-connector tcp-connect-nonblocking "ikrt_tcp_connect_nonblocking") (define-connector tcp-connect-nonblocking "ikrt_tcp_connect" #f)
(define-connector udp-connect-nonblocking "ikrt_udp_connect_nonblocking") (define-connector udp-connect-nonblocking "ikrt_udp_connect" #f)
) )

2
scheme/last-revision
View File

@ -1 +1 @@
1418 1420

31
src/ikarus-io.c
View File

@ -32,9 +32,9 @@
ikptr ikptr
ikrt_io_error(){ ikrt_io_error(){
int err = errno; int err = errno;
//#if 0 #if 0
fprintf(stderr, "errno=%d %s\n", err, strerror(err)); fprintf(stderr, "errno=%d %s\n", err, strerror(err));
//#endif #endif
switch(err){ switch(err){
case EBADF : return fix(-2); case EBADF : return fix(-2);
case EINTR : return fix(-3); case EINTR : return fix(-3);
@ -191,31 +191,16 @@ ikrt_udp_connect(ikptr host, ikptr srvc, ikpcb* pcb){
return do_connect(host, srvc, SOCK_DGRAM); return do_connect(host, srvc, SOCK_DGRAM);
} }
static ikptr ikptr
do_unblock(ikptr fdptr){ ikrt_make_fd_nonblocking(ikptr fdptr, ikpcb* pcb){
int fd = unfix(fdptr); int fd = unfix(fdptr);
if(fd >= 0){ int err = fcntl(fd, F_SETFL, O_NONBLOCK);
/* connected alright */ if(err == -1){
int err = fcntl(fd, F_SETFL, O_NONBLOCK); return ikrt_io_error();
if(err == -1){
ikptr errptr = ikrt_io_error();
close(fd);
return errptr;
}
} }
return fdptr; return 0;
} }
ikptr
ikrt_tcp_connect_nonblocking(ikptr host, ikptr srvc, ikpcb* pcb){
return do_unblock(ikrt_tcp_connect(host, srvc, pcb));
}
ikptr
ikrt_udp_connect_nonblocking(ikptr host, ikptr srvc, ikpcb* pcb){
return do_unblock(ikrt_udp_connect(host, srvc, pcb));
}
ikptr ikptr
ikrt_file_ctime(ikptr filename, ikptr res){ ikrt_file_ctime(ikptr filename, ikptr res){