Improve the torrent stop and btpd shutdown sequences.

Torrents are now considered stopped and may be restarted even if
the stop event haven't been sent the trackers yet. The same holds
for the del and add commands.

A btpd process in shutdown mode that only have stopped torrents,
but is still sending the stop event to trackers, will release
resources that would block a new btpd to start. It will the
silently exit when it's finished with the trackers.

This also makes the timeout parameter for shutdown unnecessary.

2 files changed, 3 insertions, 6 deletions

diff --git a/misc/btpd_if.c b/misc/btpd_if.c
index f01cab9..a62daba 100644
--- a/misc/btpd_if.c
+++ b/misc/btpd_if.c
@@ -155,13 +155,10 @@ ipc_buf_req_code(struct ipc *ipc, struct iobuf *iob)
 }
 
 enum ipc_err
-btpd_die(struct ipc *ipc, int seconds)
+btpd_die(struct ipc *ipc)
 {
     struct iobuf iob = iobuf_init(16);
-    if (seconds >= 0)
-        iobuf_print(&iob, "l3:diei%dee", seconds);
-    else
-        iobuf_swrite(&iob, "l3:diee");
+    iobuf_swrite(&iob, "l3:diee");
     return ipc_buf_req_code(ipc, &iob);
 }
 
diff --git a/misc/btpd_if.h b/misc/btpd_if.h
index 0879bd4..526e5c3 100644
--- a/misc/btpd_if.h
+++ b/misc/btpd_if.h
@@ -80,7 +80,7 @@ enum ipc_err btpd_del(struct ipc *ipc, struct ipc_torrent *tp);
 enum ipc_err btpd_start(struct ipc *ipc, struct ipc_torrent *tp);
 enum ipc_err btpd_stop(struct ipc *ipc, struct ipc_torrent *tp);
 enum ipc_err btpd_stop_all(struct ipc *ipc);
-enum ipc_err btpd_die(struct ipc *ipc, int seconds);
+enum ipc_err btpd_die(struct ipc *ipc);
 enum ipc_err btpd_get(struct ipc *ipc, enum ipc_dval *keys, size_t nkeys,
     tget_cb_t cb, void *arg);
 enum ipc_err btpd_tget(struct ipc *ipc, struct ipc_torrent *tps, size_t ntps,