From 50f8d02fcc2ebf1b84f16c0fdfd91f4bb3f5e8f1 Mon Sep 17 00:00:00 2001
From: Zhou Kang <zhoukang7@huawei.com>
Date: Mon, 25 Sep 2023 12:18:52 +0000
Subject: [PATCH] fix compile warning

---
 bin/aot.rs       |  1 -
 bin/daemon.rs    | 18 +++++++++---------
 bin/kmod_util.rs | 10 ++++------
 bin/main.rs      |  9 ++++++---
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bin/aot.rs b/bin/aot.rs
index a8fa24b..712f3a7 100644
--- a/bin/aot.rs
+++ b/bin/aot.rs
@@ -15,7 +15,6 @@ use crate::lib::fs_ext;
 use crate::lib::process_ext::run_child;
 
 use goblin::elf::Elf;
-use std::path::Path;
 use std::{env, fs};
 
 // Obtain the full path from real path, environment variable PATH, current dir
diff --git a/bin/daemon.rs b/bin/daemon.rs
index 79ce9d0..d5a5254 100644
--- a/bin/daemon.rs
+++ b/bin/daemon.rs
@@ -31,8 +31,8 @@ use std::thread;
 use std::time::Duration;
 
 const SYSBOOST_DB_PATH: &str = "/var/lib/sysboost/";
-const LDSO: &str = "ld-";
-const LIBCSO: &str = "libc.so";
+//const LDSO: &str = "ld-";
+//const LIBCSO: &str = "libc.so";
 
 // sleep some time wait for next event
 const MIN_SLEEP_TIME: u64 = 10000;
@@ -110,17 +110,17 @@ fn process_config(path: PathBuf) -> Option<RtoConfig> {
 		None => return None,
 	};
 
-	//let elf = match parse_elf_file(&conf.elf_path) {
-	//	Some(elf) => elf,
-	//	None => return None,
-	//};
+	let elf = match parse_elf_file(&conf.elf_path) {
+		Some(elf) => elf,
+		None => return None,
+	};
 
 	// auto get lib path
 	// In static-nolibc mode, ld and libc need to be deleted after detection.
 	// In share mode, no detection is performed based on libs.
 	if conf.mode == "static" {
-		//let libs = find_libs(&conf, &elf);
-		//conf.libs = libs;
+		let libs = find_libs(&conf, &elf);
+		conf.libs = libs;
 	} else if conf.mode == "static-nolibc" {
 		//let mut libs = find_libs(&conf, &elf);
 		//libs.retain(|s| !s.contains(LDSO));
@@ -275,6 +275,7 @@ fn start_service() {
 	refresh_all_config(&mut rto_configs);
 	let mut inotify = Inotify::init().unwrap();
 	let mut try_again = true;
+	// TODO: 为什么写死路径? 这些代码都要重写;
 	match inotify.add_watch("/etc/sysboost.d/bash.toml", WatchMask::MODIFY) {
 		Ok(_) => {
 			try_again = false;
@@ -293,7 +294,6 @@ fn start_service() {
 		if try_again {
 			match inotify.add_watch("/etc/sysboost.d/bash.toml", WatchMask::MODIFY) {
 				Ok(_) => {
-					try_again = false;
 					return;
 				}
 				Err(e) => {
diff --git a/bin/kmod_util.rs b/bin/kmod_util.rs
index b794da2..088a98e 100644
--- a/bin/kmod_util.rs
+++ b/bin/kmod_util.rs
@@ -18,7 +18,7 @@ const KO_PATH: &str = "/lib/modules/sysboost/sysboost_loader.ko";
 
 // echo 1 > /sys/module/sysboost_loader/parameters/use_rto
 pub fn set_ko_rto_flag(is_set: bool) -> i32 {
-	let mut args;
+	let args;
 	if is_set {
 		args = "1".to_string();
 	} else {
@@ -28,17 +28,16 @@ pub fn set_ko_rto_flag(is_set: bool) -> i32 {
 		Ok(_) => {
 			return 0;
 		}
-		Err(e) => {
+		Err(_) => {
 			log::error!("Error writing use_rto");
 			return -1;
 		}
 	}
-	0
 }
 
 // echo 1 > /sys/module/sysboost_loader/parameters/use_hpage
 pub fn set_hpage_rto_flag(is_set: bool) -> i32 {
-	let mut args;
+	let args;
 	if is_set {
 		args = "1".to_string();
 	} else {
@@ -48,12 +47,11 @@ pub fn set_hpage_rto_flag(is_set: bool) -> i32 {
 		Ok(_) => {
 			return 0;
 		}
-		Err(e) => {
+		Err(_) => {
 			log::error!("Error writing use_hpage");
 			return -1;
 		}
 	}
-	0
 }
 
 fn insmod_ko(path: &String) {
diff --git a/bin/main.rs b/bin/main.rs
index df2bb3b..8f4ead7 100644
--- a/bin/main.rs
+++ b/bin/main.rs
@@ -73,9 +73,12 @@ fn main() {
 	}
 
 	// start up coredump monitor
-	// let _coredump_monitor_handle = thread::spawn(||{
-	//         coredump_monitor_loop();
-	// });
+	// TODO: 监控性能有问题, 需要重新设计; 先用debug判断包住,避免编译告警
+	if is_debug {
+		let _coredump_monitor_handle = thread::spawn(||{
+			coredump_monitor_loop();
+		});
+	}
 
 	// daemon service gen rto ELF with config
 	daemon_loop();
-- 
Gitee