Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pollfd fix, round 2 #12237

Merged
merged 8 commits into from
Jul 27, 2015
Merged

pollfd fix, round 2 #12237

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f27d75
revised poll_fd tests
amitmurthy Sep 30, 2013
4555d49
standardized event property testing
amitmurthy Oct 1, 2013
94de95e
fix poll_fd implementation (close #4401)
vtjnash Jul 21, 2015
9b789b8
Qualify Libc._getosfhandle
tkelman Jul 21, 2015
c9d9351
fix the windows tests for pollfd
vtjnash Jul 21, 2015
84e969a
update pollfd docs based on reviewer comments
vtjnash Jul 22, 2015
64c184b
provide GetLastError/FormatMessage as official functions of the [Wind…
vtjnash Jul 24, 2015
99b56cd
fix poll_file variable name in doc
vtjnash Jul 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions base/libc.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ dup(src::RawFD,target::RawFD) = systemerror("dup",-1==
ccall((@windows? :_dup2 : :dup2),Int32,
(Int32,Int32),src.fd,target.fd))

#Wrapper for an OS file descriptor (for Windows)
@windows_only immutable WindowsRawSocket
handle::Ptr{Void} # On Windows file descriptors are HANDLE's and 64-bit on 64-bit Windows...
end

@unix_only _get_osfhandle(fd::RawFD) = fd
@windows_only _get_osfhandle(fd::RawFD) = WindowsRawSocket(ccall(:_get_osfhandle,Ptr{Void},(Cint,),fd.fd))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this'll need to be qualified with Libc. now anywhere it's used, like base/stream.jl and base/mmap.jl

@windows_only _get_osfhandle(fd::WindowsRawSocket) = fd

## FILE ##

immutable FILE
Expand Down
Loading