replace signal-hook with ctrlc in hopes of better Windows support

Author: davepacheco

Cargo.lock

@@ -7,13 +7,13 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1.24"
+ctrlc = "3.1"
 futures = "0.3.1"
 http = "0.2.0"
 hyper = "0.14"
 libc = "0.2.71"
 ring = "0.16"
 serde_json = "1.0"
-signal-hook = "0.3"
 smf = "0.1"
 structopt = "0.3"
 tar = "0.4"
@@ -45,10 +45,6 @@ features = [ "chrono", "uuid" ]
 version = "1.0"
 features = [ "derive" ]
 
-[dependencies.signal-hook-tokio]
-version = "0.3"
-features = [ "futures-v0_3" ]
-
 [dependencies.slog]
 version = "2.5"
 features = [ "max_level_trace", "release_max_level_debug" ]

Cargo.toml

@@ -4,12 +4,9 @@
 
 use anyhow::bail;
 use anyhow::Context;
-use futures::stream::StreamExt;
 use omicron::cmd::fatal;
 use omicron::cmd::CmdError;
 use omicron::dev_db;
-use signal_hook::consts::signal::SIGINT;
-use signal_hook_tokio::Signals;
 use std::path::PathBuf;
 use structopt::StructOpt;
 
@@ -45,8 +42,11 @@ async fn cmd_db_run(args: &DbRunArgs) -> Result<(), anyhow::Error> {
      * before we've created resources that we want to have cleaned up on SIGINT
      * (e.g., the temporary directory created by the database starter).
      */
-    let signals = Signals::new(&[SIGINT]).expect("failed to wait for SIGINT");
-    let mut signal_stream = signals.fuse();
+    let (tx, mut rx) = tokio::sync::watch::channel(());
+    ctrlc::set_handler(move || {
+        tx.send(()).expect("internal error: failed to send CTRL-C message");
+    })
+    .expect("failed to wait for SIGINT");
 
     /*
      * Now start CockroachDB.  This process looks bureaucratic (create arg
@@ -102,9 +102,7 @@ async fn cmd_db_run(args: &DbRunArgs) -> Result<(), anyhow::Error> {
                 (see error output above)"
             );
         }
-        caught_signal = signal_stream.next() => {
-            assert_eq!(caught_signal.unwrap(), SIGINT);
-
+        _ = rx.changed() => {
             /*
              * We don't have to do anything to trigger shutdown because the
              * shell will have delivered the same SIGINT that we got to the