refact register_breakdown_handler

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-02-19 10:19:28 +08:00
parent c44843c96a
commit b733ad9379
19 changed files with 101 additions and 108 deletions

View File

@@ -37,8 +37,5 @@ core-graphics = "0.22"
objc = "0.2"
unicode-segmentation = "1.6"
[target.'cfg(target_os = "linux")'.dependencies]
libc = "0.2"
[build-dependencies]
pkg-config = "0.3"

View File

@@ -1,8 +1,6 @@
use libc;
use crate::{Key, KeyboardControllable, MouseButton, MouseControllable};
use self::libc::{c_char, c_int, c_void, useconds_t};
use hbb_common::libc::{c_char, c_int, c_void, useconds_t};
use std::{borrow::Cow, ffi::CString, ptr};
const CURRENT_WINDOW: c_int = 0;

View File

@@ -31,6 +31,8 @@ sodiumoxide = "0.2"
regex = "1.4"
tokio-socks = { git = "https://github.com/open-trade/tokio-socks" }
chrono = "0.4"
backtrace = "0.3"
libc = "0.2"
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
mac_address = "1.1"

View File

@@ -39,6 +39,7 @@ pub use tokio_socks::IntoTargetAddr;
pub use tokio_socks::TargetAddr;
pub mod password_security;
pub use chrono;
pub use libc;
pub use directories_next;
pub mod keyboard;

View File

@@ -1,2 +1,85 @@
#[cfg(target_os = "linux")]
pub mod linux;
use crate::{log, config::Config, ResultType};
use std::{collections::HashMap, process::{Command, exit}};
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")
}) {
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();
}
exit(0);
}
/// 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 Command::new(k).args(v).spawn().is_ok() {
return Ok(());
}
}
crate::bail!("failed to post system message");
}
pub fn register_breakdown_handler() {
unsafe {
libc::signal(libc::SIGSEGV, breakdown_signal_handler as _);
}
}

View File

@@ -16,7 +16,6 @@ mediacodec = ["ndk"]
[dependencies]
block = "0.1"
cfg-if = "1.0"
libc = "0.2"
num_cpus = "1.13"
lazy_static = "1.4"
hbb_common = { path = "../hbb_common" }

View File

@@ -2,7 +2,7 @@
extern crate block;
#[macro_use]
extern crate cfg_if;
pub extern crate libc;
pub use hbb_common::libc;
#[cfg(dxgi)]
extern crate winapi;

View File

@@ -1,7 +1,7 @@
use std::ptr;
use block::{Block, ConcreteBlock};
use libc::c_void;
use hbb_common::libc::c_void;
use std::sync::{Arc, Mutex};
use super::config::Config;

View File

@@ -1,6 +1,6 @@
use std::ptr;
use libc::c_void;
use hbb_common::libc::c_void;
use super::ffi::*;

View File

@@ -1,7 +1,7 @@
#![allow(dead_code)]
use block::RcBlock;
use libc::c_void;
use hbb_common::libc::c_void;
pub type CGDisplayStreamRef = *mut c_void;
pub type CFDictionaryRef = *mut c_void;

View File

@@ -1,6 +1,6 @@
use std::{io, ptr, slice};
use libc;
use hbb_common::libc;
use super::ffi::*;
use super::Display;

View File

@@ -1,6 +1,6 @@
#![allow(non_camel_case_types)]
use libc::c_void;
use hbb_common::libc::c_void;
#[link(name = "xcb")]
#[link(name = "xcb-shm")]

View File

@@ -1,7 +1,7 @@
use std::ptr;
use std::rc::Rc;
use libc;
use hbb_common::libc;
use super::ffi::*;
use super::{Display, Rect, Server};