Skip to content

Commit

Permalink
libs: add std::os::windows module
Browse files Browse the repository at this point in the history
The new `std::os::windows` module exposes several extension traits
for extracting file descriptors, sockets, and handles from `std::io`
types.
  • Loading branch information
aturon committed Nov 21, 2014
1 parent af0c446 commit 1e66164
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 1 deletion.
5 changes: 5 additions & 0 deletions src/libstd/os.rs
Expand Up @@ -62,6 +62,11 @@ use vec::Vec;
#[cfg(unix)] use c_str::ToCStr;
#[cfg(unix)] use libc::c_char;

#[cfg(unix)]
pub use sys::ext as unix;
#[cfg(windows)]
pub use sys::ext as windows;

/// Get the number of cores available
pub fn num_cpus() -> uint {
unsafe {
Expand Down
100 changes: 100 additions & 0 deletions src/libstd/sys/windows/ext.rs
@@ -0,0 +1,100 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

//! Experimental extensions to `std` for Windows.
//!
//! For now, this module is limited to extracting handles, file
//! descriptors, and sockets, but its functionality will grow over
//! time.

#![experimental]

use sys_common::AsInner;
use libc;

use io;

/// Raw HANDLEs.
pub type Handle = libc::HANDLE;

/// Raw SOCKETs.
pub type Socket = libc::SOCKET;

/// Extract raw handles.
pub trait AsRawHandle {
/// Extract the raw handle, without taking any ownership.
fn as_raw_handle(&self) -> Handle;
}

impl AsRawHandle for io::fs::File {
fn as_raw_handle(&self) -> Handle {
self.as_inner().handle()
}
}

impl AsRawHandle for io::pipe::PipeStream {
fn as_raw_handle(&self) -> Handle {
self.as_inner().handle()
}
}

impl AsRawHandle for io::net::pipe::UnixStream {
fn as_raw_handle(&self) -> Handle {
self.as_inner().handle()
}
}

impl AsRawHandle for io::net::pipe::UnixListener {
fn as_raw_handle(&self) -> Handle {
self.as_inner().handle()
}
}

impl AsRawHandle for io::net::pipe::UnixAcceptor {
fn as_raw_handle(&self) -> Handle {
self.as_inner().handle()
}
}

/// Extract raw sockets.
pub trait AsRawSocket {
fn as_raw_socket(&self) -> Socket;
}

impl AsRawSocket for io::net::tcp::TcpStream {
fn as_raw_socket(&self) -> Socket {
self.as_inner().fd()
}
}

impl AsRawSocket for io::net::tcp::TcpListener {
fn as_raw_socket(&self) -> Socket {
self.as_inner().fd()
}
}

impl AsRawSocket for io::net::tcp::TcpAcceptor {
fn as_raw_socket(&self) -> Socket {
self.as_inner().fd()
}
}

impl AsRawSocket for io::net::udp::UdpSocket {
fn as_raw_socket(&self) -> Socket {
self.as_inner().fd()
}
}

/// A prelude for conveniently writing platform-specific code.
///
/// Includes all extension traits, and some important type definitions.
pub mod prelude {
pub use super::{Socket, Handle, AsRawSocket, AsRawHandle};
}
1 change: 1 addition & 0 deletions src/libstd/sys/windows/mod.rs
Expand Up @@ -34,6 +34,7 @@ macro_rules! helper_init( (static $name:ident: Helper<$m:ty>) => (
) )

pub mod c;
pub mod ext;
pub mod fs;
pub mod os;
pub mod tcp;
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/sys/windows/pipe.rs
Expand Up @@ -735,7 +735,7 @@ impl UnixAcceptor {
}

pub fn handle(&self) -> libc::HANDLE {
self.event.ref0
self.listener.handle()
}
}

Expand Down

9 comments on commit 1e66164

@bors
Copy link
Contributor

@bors bors commented on 1e66164 Nov 26, 2014

Choose a reason for hiding this comment

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

saw approval from alexcrichton
at aturon@1e66164

@bors
Copy link
Contributor

@bors bors commented on 1e66164 Nov 26, 2014

Choose a reason for hiding this comment

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

merging aturon/rust/fds = 1e66164 into auto

@bors
Copy link
Contributor

@bors bors commented on 1e66164 Nov 26, 2014

Choose a reason for hiding this comment

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

aturon/rust/fds = 1e66164 merged ok, testing candidate = d55e2e63

@bors
Copy link
Contributor

@bors bors commented on 1e66164 Nov 26, 2014

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on 1e66164 Nov 26, 2014

Choose a reason for hiding this comment

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

saw approval from alexcrichton
at aturon@1e66164

@bors
Copy link
Contributor

@bors bors commented on 1e66164 Nov 26, 2014

Choose a reason for hiding this comment

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

merging aturon/rust/fds = 1e66164 into auto

@bors
Copy link
Contributor

@bors bors commented on 1e66164 Nov 26, 2014

Choose a reason for hiding this comment

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

aturon/rust/fds = 1e66164 merged ok, testing candidate = 61af402

@bors
Copy link
Contributor

@bors bors commented on 1e66164 Nov 26, 2014

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on 1e66164 Nov 26, 2014

Choose a reason for hiding this comment

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

fast-forwarding master to auto = 61af402

Please sign in to comment.