refact register_breakdown_handler

Signed-off-by: fufesou <shuanglongchen@yeah.net>

src/client.rs

@@ -101,7 +101,7 @@ pub fn get_key_state(key: enigo::Key) -> bool {
 cfg_if::cfg_if! {
     if #[cfg(target_os = "android")] {
 
-use libc::{c_float, c_int, c_void};
+use hbb_common::libc::{c_float, c_int, c_void};
 type Oboe = *mut c_void;
 extern "C" {
     fn create_oboe_player(channels: c_int, sample_rate: c_int) -> Oboe;

src/core_main.rs

@@ -1,4 +1,4 @@
-use hbb_common::log;
+use hbb_common::{log, platform::register_breakdown_handler};
 
 /// shared by flutter and sciter main function
 ///
@@ -38,10 +38,10 @@ pub fn core_main() -> Option<Vec<String>> {
         }
         i += 1;
     }
+    register_breakdown_handler();
     #[cfg(target_os = "linux")]
     #[cfg(feature = "flutter")]
     {
-        crate::platform::linux::register_breakdown_handler();
         let (k, v) = ("LIBGL_ALWAYS_SOFTWARE", "true");
         if !hbb_common::config::Config::get_option("allow-always-software-render").is_empty() {
             std::env::set_var(k, v);

src/platform/linux.rs

@@ -1,7 +1,7 @@
 use super::{CursorData, ResultType};
 pub use hbb_common::platform::linux::*;
 use hbb_common::{allow_err, bail, log};
-use libc::{c_char, c_int, c_void};
+use hbb_common::libc::{c_char, c_int, c_void};
 use std::{
     cell::RefCell,
     collections::HashMap,
@@ -642,86 +642,3 @@ pub fn get_double_click_time() -> u32 {
         double_click_time
     }
 }
-
-/// forever: may not work
-pub fn system_message(title: &str, msg: &str, forever: bool) -> ResultType<()> {
-    let cmds: HashMap<&str, Vec<&str>> = HashMap::from([
-        ("notify-send", [title, msg].to_vec()),
-        (
-            "zenity",
-            [
-                "--info",
-                "--timeout",
-                if forever { "0" } else { "3" },
-                "--title",
-                title,
-                "--text",
-                msg,
-            ]
-            .to_vec(),
-        ),
-        ("kdialog", ["--title", title, "--msgbox", msg].to_vec()),
-        (
-            "xmessage",
-            [
-                "-center",
-                "-timeout",
-                if forever { "0" } else { "3" },
-                title,
-                msg,
-            ]
-            .to_vec(),
-        ),
-    ]);
-    for (k, v) in cmds {
-        if std::process::Command::new(k).args(v).spawn().is_ok() {
-            return Ok(());
-        }
-    }
-    bail!("failed to post system message");
-}
-
-extern "C" fn breakdown_signal_handler(sig: i32) {
-    let mut stack = vec![];
-    backtrace::trace(|frame| {
-        backtrace::resolve_frame(frame, |symbol| {
-            if let Some(name) = symbol.name() {
-                stack.push(name.to_string());
-            }
-        });
-        true // keep going to the next frame
-    });
-    let mut info = String::default();
-    if stack.iter().any(|s| {
-        s.contains(&"nouveau_pushbuf_kick")
-            || s.to_lowercase().contains("nvidia")
-            || s.contains("gdk_window_end_draw_frame")
-    }) {
-        hbb_common::config::Config::set_option(
-            "allow-always-software-render".to_string(),
-            "Y".to_string(),
-        );
-        info = "Always use software rendering will be set.".to_string();
-        log::info!("{}", info);
-    }
-    log::error!(
-        "Got signal {} and exit. stack:\n{}",
-        sig,
-        stack.join("\n").to_string()
-    );
-    if !info.is_empty() {
-        system_message(
-            "RustDesk",
-            &format!("Got signal {} and exit.{}", sig, info),
-            true,
-        )
-        .ok();
-    }
-    std::process::exit(0);
-}
-
-pub fn register_breakdown_handler() {
-    unsafe {
-        libc::signal(libc::SIGSEGV, breakdown_signal_handler as _);
-    }
-}

src/server/portable_service.rs

@@ -492,7 +492,7 @@ pub mod client {
         let mut option = SHMEM.lock().unwrap();
         let shmem = option.as_mut().unwrap();
         unsafe {
-            libc::memset(shmem.as_ptr() as _, 0, shmem.len() as _);
+            hbb_common::libc::memset(shmem.as_ptr() as _, 0, shmem.len() as _);
         }
         drop(option);
         match para {