Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
cmucl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Carl Shapiro
cmucl
Commits
92fd46ec
Commit
92fd46ec
authored
33 years ago
by
ram
Browse files
Options
Downloads
Patches
Plain Diff
Added :TIMEOUT argument to MAKE-FD-STREAM. The SYSTEM:IO-TIMEOUT condition is
signalled if a timeout is specified and exceeded.
parent
74181d56
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
code/fd-stream.lisp
+35
-14
35 additions, 14 deletions
code/fd-stream.lisp
with
35 additions
and
14 deletions
code/fd-stream.lisp
+
35
−
14
View file @
92fd46ec
...
@@ -7,13 +7,14 @@
...
@@ -7,13 +7,14 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;;
;;;
(
ext:file-comment
(
ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.1
4
1991/05/2
1 22:22:34
ram Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.1
5
1991/05/2
4 17:02:25
ram Exp $"
)
;;;
;;;
;;; **********************************************************************
;;; **********************************************************************
;;;
;;;
;;; Streams for UNIX file descriptors.
;;; Streams for UNIX file descriptors.
;;;
;;;
;;; Written by William Lott, July 1989 - January 1990.
;;; Written by William Lott, July 1989 - January 1990.
;;; Some tuning by Rob MacLachlan.
;;;
;;;
;;; **********************************************************************
;;; **********************************************************************
...
@@ -21,8 +22,7 @@
...
@@ -21,8 +22,7 @@
(
in-package
"SYSTEM"
)
(
in-package
"SYSTEM"
)
(
export
'
(
fd-stream
fd-stream-p
fd-stream-fd
make-fd-stream
(
export
'
(
fd-stream
fd-stream-p
fd-stream-fd
make-fd-stream
beep
*beep-function*
io-timeout
beep
*beep-function*
output-raw-bytes
output-raw-bytes
*tty*
*stdin*
*stdout*
*stderr*
))
*tty*
*stdin*
*stdout*
*stderr*
))
...
@@ -96,7 +96,10 @@
...
@@ -96,7 +96,10 @@
;; Output flushed, but not written due to non-blocking io.
;; Output flushed, but not written due to non-blocking io.
(
output-later
nil
)
(
output-later
nil
)
(
handler
nil
))
(
handler
nil
)
;;
;; Timeout specified for this stream, or NIL if none.
(
timeout
nil
:type
(
or
index
null
)))
(
defun
%print-fd-stream
(
fd-stream
stream
depth
)
(
defun
%print-fd-stream
(
fd-stream
stream
depth
)
(
declare
(
ignore
depth
)
(
stream
stream
))
(
declare
(
ignore
depth
)
(
stream
stream
))
...
@@ -104,6 +107,13 @@
...
@@ -104,6 +107,13 @@
(
fd-stream-name
fd-stream
)))
(
fd-stream-name
fd-stream
)))
(
define-condition
io-timeout
(
stream-error
)
(
direction
)
(
:report
(
lambda
(
condition
stream
)
(
format
stream
"Timeout ~(~A~)ing ~S."
(
io-timeout-direction
condition
)
(
stream-error-stream
condition
)))))
;;;; Output routines and related noise.
;;;; Output routines and related noise.
...
@@ -444,7 +454,9 @@
...
@@ -444,7 +454,9 @@
(
case
count
(
case
count
(
1
)
(
1
)
(
0
(
0
(
system:wait-until-fd-usable
fd
:input
))
(
unless
(
system:wait-until-fd-usable
fd
:input
(
fd-stream-timeout
stream
))
(
error
'io-timeout
:stream
stream
:direction
:read
)))
(
t
(
t
(
error
"Problem checking to see if ~S is readable: ~A"
(
error
"Problem checking to see if ~S is readable: ~A"
stream
stream
...
@@ -458,7 +470,9 @@
...
@@ -458,7 +470,9 @@
(
if
#+
serve-event
(
eql
errno
mach:ewouldblock
)
(
if
#+
serve-event
(
eql
errno
mach:ewouldblock
)
#-
serve-event
nil
#-
serve-event
nil
(
progn
(
progn
(
system:wait-until-fd-usable
fd
:input
)
(
unless
(
system:wait-until-fd-usable
fd
:input
(
fd-stream-timeout
stream
))
(
error
'io-timeout
:stream
stream
:direction
:read
))
(
do-input
stream
))
(
do-input
stream
))
(
error
"Error reading ~S: ~A"
(
error
"Error reading ~S: ~A"
stream
stream
...
@@ -1115,19 +1129,25 @@ non-server method is also significantly more efficient for large reads.
...
@@ -1115,19 +1129,25 @@ non-server method is also significantly more efficient for large reads.
(
output
nil
output-p
)
(
output
nil
output-p
)
(
element-type
'base-character
)
(
element-type
'base-character
)
(
buffering
:full
)
(
buffering
:full
)
timeout
file
file
original
original
delete-original
delete-original
(
name
(
if
file
(
name
(
if
file
(
format
nil
"file ~S"
file
)
(
format
nil
"file ~S"
file
)
(
format
nil
"descriptor ~D"
fd
))))
(
format
nil
"descriptor ~D"
fd
))))
"Create a stream for the given unix file descriptor. If input is non-nil,
(
declare
(
type
index
fd
)
(
type
(
or
index
null
)
timeout
)
allow input operations. If output is non-nil, allow output operations. If
(
type
(
member
:none
:line
:full
)
buffering
))
neither input nor output are specified, default to allowing input.
"Create a stream for the given unix file descriptor.
element-type indicates the element type to use (as for open). Buffering
If input is non-nil, allow input operations.
indicates the kind of buffering to use (one of :none, :line, or :full). If
If output is non-nil, allow output operations.
file is spesified, it should be the name of the file. Name is used to
If neither input nor output are specified, default to allowing input.
identify the stream when printed."
Element-type indicates the element type to use (as for open).
Buffering indicates the kind of buffering to use.
Timeout (if true) is the number of seconds to wait for input. If NIL (the
default), then wait forever. When we time out, we signal IO-TIMEOUT.
File is the name of the file (will be returned by PATHNAME).
Name is used to identify the stream when printed."
(
cond
((
not
(
or
input-p
output-p
))
(
cond
((
not
(
or
input-p
output-p
))
(
setf
input
t
))
(
setf
input
t
))
((
not
(
or
input
output
))
((
not
(
or
input
output
))
...
@@ -1137,7 +1157,8 @@ non-server method is also significantly more efficient for large reads.
...
@@ -1137,7 +1157,8 @@ non-server method is also significantly more efficient for large reads.
:file
file
:file
file
:original
original
:original
original
:delete-original
delete-original
:delete-original
delete-original
:buffering
buffering
)))
:buffering
buffering
:timeout
timeout
)))
(
set-routines
stream
element-type
input
output
)
(
set-routines
stream
element-type
input
output
)
stream
))
stream
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment