Upgrade dependencies for occlum_exec

.gitmodules

@@ -17,7 +17,7 @@
 [submodule "deps/grpc-rust"]
 	path = deps/grpc-rust
 	url = https://github.com/stepancheg/grpc-rust.git
-	branch = v0.7
+	branch = v0.8
 [submodule "deps/ringbuf"]
 	path = deps/ringbuf
 	url = https://github.com/agerasev/ringbuf.git

deps/grpc-rust

@@ -1 +1 @@
-Subproject commit 18acae5ed98afca2b971779eb851a45bb55f2fdc
+Subproject commit c0a95e7c658ba6a30624c0bb9df0546bef5d2e73

src/exec/Cargo.toml

@@ -13,17 +13,17 @@ path = "../../deps/grpc-rust/grpc"
 path = "../../deps/grpc-rust/grpc-protobuf"
 
 [dependencies]
-protobuf        = "2.14"
+protobuf        = "2.18"
 futures         = "0.3"
-env_logger      = "0.7"
+env_logger      = "0.9"
 tempdir         = "0.3"
-clap            = "2.33"
+clap            = "3.2.17"
 timer           = "0.2"
 chrono          = "0.4"
 libc            = "0.2"
-sendfd          = "0.3"
+sendfd          = "0.4.3"
-signal-hook     = "0.1"
+signal-hook     = "0.3.14"
-nix             = "0.17"
+nix             = "0.25.0"
 log             = "0.4.8"
 
 [build-dependencies]

src/exec/src/bin/occlum_exec_client.rs

@@ -21,8 +21,8 @@ use occlum_exec::occlum_exec_grpc::OcclumExecClient;
 use occlum_exec::{DEFAULT_SERVER_FILE, DEFAULT_SERVER_TIMER, DEFAULT_SOCK_FILE};
 use protobuf::RepeatedField;
 use sendfd::SendWithFd;
+use signal_hook::consts::{SIGINT, SIGKILL, SIGQUIT, SIGTERM, SIGUSR1};
 use signal_hook::iterator::Signals;
-use signal_hook::{SIGINT, SIGKILL, SIGQUIT, SIGTERM, SIGUSR1};
 use std::cmp;
 use std::env;
 use std::os::unix::net::UnixListener;
@@ -242,7 +242,7 @@ fn main() -> Result<(), i32> {
         .version("0.1.0")
         .arg(
             Arg::with_name("instance_dir")
-                .short("d")
+                .short('d')
                 .long("instance_dir")
                 .takes_value(true)
                 .default_value("./")
@@ -260,7 +260,7 @@ fn main() -> Result<(), i32> {
                 )
                 .arg(
                     Arg::with_name("time")
-                        .short("t")
+                        .short('t')
                         .long("time")
                         .takes_value(true)
                         .help("Seconds to wait before killing the applications running on the Occlum server.")
@@ -322,7 +322,7 @@ fn main() -> Result<(), i32> {
         // Create the signal handler
         let process_killed = Arc::new(Mutex::new(false));
         let process_killed_clone = Arc::clone(&process_killed);
-        let signals = Signals::new(&[SIGUSR1, SIGINT, SIGQUIT, SIGTERM]).unwrap();
+        let mut signals = Signals::new(&[SIGUSR1, SIGINT, SIGQUIT, SIGTERM]).unwrap();
         let signal_thread = thread::spawn(move || {
             for signal in signals.forever() {
                 debug!("Received signal {:?}", signal);

src/exec/src/bin/occlum_exec_server.rs

@@ -58,7 +58,7 @@ fn main() -> Result<(), i32> {
         .version("0.1.0")
         .arg(
             Arg::with_name("instance_dir")
-                .short("d")
+                .short('d')
                 .long("instance_dir")
                 .takes_value(true)
                 .default_value("./")