From ba7d690617d0757e131cd30ba9c21eedf04edd97 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Thu, 2 May 2019 00:00:54 +0200 Subject: [PATCH] cleanup pthreads --- examples/repl/main.rs | 2 -- src/types.rs | 5 +---- src/x.rs | 27 --------------------------- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/examples/repl/main.rs b/examples/repl/main.rs index fc709fc3b..3a59adbfb 100644 --- a/examples/repl/main.rs +++ b/examples/repl/main.rs @@ -281,7 +281,6 @@ unsafe fn start_threads( std::thread::JoinHandle<()>, std::thread::JoinHandle<()>, ) { - println!("staring thread"); run_threads = 1; let context = c.clone(); let h1 = std::thread::spawn(move || { @@ -519,7 +518,6 @@ unsafe fn main_0(mut argc: libc::c_int, mut argv: *mut *mut libc::c_char) -> lib break; } if !(*cmd.offset(0isize) as libc::c_int == 0i32) { - let ctx = ctx.clone(); let mut execute_result: *mut libc::c_char = dc_cmdline(ctx, &cmdline); if !execute_result.is_null() { printf( diff --git a/src/types.rs b/src/types.rs index 5bf577c84..a4b8b08f2 100644 --- a/src/types.rs +++ b/src/types.rs @@ -5,10 +5,7 @@ use crate::constants::Event; use crate::dc_context::dc_context_t; use crate::x::*; -pub use libc::{ - dirent, pthread_attr_t, pthread_cond_t, pthread_condattr_t, pthread_mutex_t, - pthread_mutexattr_t, pthread_t, tm, DIR, FILE, -}; +pub use libc::{dirent, tm, DIR, FILE}; pub use libsqlite3_sys::*; extern "C" { diff --git a/src/x.rs b/src/x.rs index bf4918069..db0a9981f 100644 --- a/src/x.rs +++ b/src/x.rs @@ -505,33 +505,6 @@ extern "C" { pub fn dc_strbuilder_catf(_: *mut dc_strbuilder_t, format: *const libc::c_char, _: ...); pub fn dc_mprintf(format: *const libc::c_char, _: ...) -> *mut libc::c_char; - - // -- Pthread - - pub fn pthread_create( - _: *mut pthread_t, - _: *const pthread_attr_t, - _: Option *mut libc::c_void>, - _: *mut libc::c_void, - ) -> libc::c_int; - pub fn pthread_join(_: pthread_t, _: *mut *mut libc::c_void) -> libc::c_int; - pub fn pthread_cond_signal(_: *mut pthread_cond_t) -> libc::c_int; - pub fn pthread_cond_timedwait( - _: *mut pthread_cond_t, - _: *mut pthread_mutex_t, - _: *const timespec, - ) -> libc::c_int; - pub fn pthread_mutex_lock(_: *mut pthread_mutex_t) -> libc::c_int; - pub fn pthread_mutex_unlock(_: *mut pthread_mutex_t) -> libc::c_int; - pub fn pthread_cond_destroy(_: *mut pthread_cond_t) -> libc::c_int; - pub fn pthread_cond_init(_: *mut pthread_cond_t, _: *const pthread_condattr_t) -> libc::c_int; - pub fn pthread_cond_wait(_: *mut pthread_cond_t, _: *mut pthread_mutex_t) -> libc::c_int; - pub fn pthread_mutex_destroy(_: *mut pthread_mutex_t) -> libc::c_int; - pub fn pthread_mutex_init( - _: *mut pthread_mutex_t, - _: *const pthread_mutexattr_t, - ) -> libc::c_int; - pub fn pthread_self() -> pthread_t; } #[cfg(not(target_os = "macos"))]