OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #13457 : alexcrichton/rust/issue-13420, r=thestinger

Browse Source 
On some OSes (such as freebsd), pthread_attr_init allocates memory, so this is
necessary to deallocate that memory.

Closes #13420
This commit is contained in:
bors 2014-04-11 02:21:36 -07:00
commit 1b37afe8a2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libstd/rt/thread.rs
View File

@ -245,6 +245,7 @@ mod imp {
let arg: *libc::c_void = cast::transmute(p); let arg: *libc::c_void = cast::transmute(p);
assert_eq!(pthread_create(&mut native, &attr, assert_eq!(pthread_create(&mut native, &attr,
super::thread_start, arg), 0); super::thread_start, arg), 0);
assert_eq!(pthread_attr_destroy(&mut attr), 0);
native native
} }
@ -303,6 +304,7 @@ mod imp {
fn pthread_join(native: libc::pthread_t, fn pthread_join(native: libc::pthread_t,
value: **libc::c_void) -> libc::c_int; value: **libc::c_void) -> libc::c_int;
fn pthread_attr_init(attr: *mut libc::pthread_attr_t) -> libc::c_int; fn pthread_attr_init(attr: *mut libc::pthread_attr_t) -> libc::c_int;
fn pthread_attr_destroy(attr: *mut libc::pthread_attr_t) -> libc::c_int;
fn pthread_attr_setstacksize(attr: *mut libc::pthread_attr_t, fn pthread_attr_setstacksize(attr: *mut libc::pthread_attr_t,
stack_size: libc::size_t) -> libc::c_int; stack_size: libc::size_t) -> libc::c_int;
fn pthread_attr_setdetachstate(attr: *mut libc::pthread_attr_t, fn pthread_attr_setdetachstate(attr: *mut libc::pthread_attr_t,