Skip to content

Commit

Permalink
AsRawHandle and IntoRawHandle for JoinHandle
Browse files Browse the repository at this point in the history
This allows users to get the HANDLE of a spawned thread on Windows

Signed-off-by: Peter Atashian <retep998@gmail.com>
  • Loading branch information
retep998 committed Dec 5, 2015
1 parent f5150dd commit 95cdada
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/libstd/sys/windows/ext/mod.rs
Expand Up @@ -21,6 +21,7 @@ pub mod fs;
pub mod io;
pub mod raw;
pub mod process;
pub mod thread;

/// A prelude for conveniently writing platform-specific code.
///
Expand Down
29 changes: 29 additions & 0 deletions src/libstd/sys/windows/ext/thread.rs
@@ -0,0 +1,29 @@
// Copyright 2015 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.

//! Extensions to `std::thread` for Windows.

#![unstable(feature = "thread_extensions", issue = "29791")]

use os::windows::io::{RawHandle, AsRawHandle, IntoRawHandle};
use thread;
use sys_common::{AsInner, IntoInner};

impl<T> AsRawHandle for thread::JoinHandle<T> {
fn as_raw_handle(&self) -> RawHandle {
self.as_inner().handle().raw() as *mut _
}
}

impl<T> IntoRawHandle for thread::JoinHandle<T> {
fn into_raw_handle(self) -> RawHandle {
self.into_inner().into_handle().into_raw() as *mut _
}
}
4 changes: 4 additions & 0 deletions src/libstd/sys/windows/thread.rs
Expand Up @@ -77,6 +77,10 @@ impl Thread {
c::Sleep(super::dur2timeout(dur))
}
}

pub fn handle(&self) -> &Handle { &self.handle }

pub fn into_handle(self) -> Handle { self.handle }
}

pub mod guard {
Expand Down
9 changes: 9 additions & 0 deletions src/libstd/thread/mod.rs
Expand Up @@ -171,6 +171,7 @@ use sys::thread as imp;
use sys_common::thread_info;
use sys_common::unwind;
use sys_common::util;
use sys_common::{AsInner, IntoInner};
use time::Duration;

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -621,6 +622,14 @@ impl<T> JoinHandle<T> {
}
}

impl<T> AsInner<imp::Thread> for JoinHandle<T> {
fn as_inner(&self) -> &imp::Thread { self.0.native.as_ref().unwrap() }
}

impl<T> IntoInner<imp::Thread> for JoinHandle<T> {
fn into_inner(self) -> imp::Thread { self.0.native.unwrap() }
}

fn _assert_sync_and_send() {
fn _assert_both<T: Send + Sync>() {}
_assert_both::<JoinHandle<()>>();
Expand Down

0 comments on commit 95cdada

Please sign in to comment.