From 47bc8bb46687068d317d78adb40def75075c8bf1 Mon Sep 17 00:00:00 2001 From: ed Date: Sat, 16 May 2020 02:05:18 +0200 Subject: [PATCH] multiprocessing adds latency; default to off --- copyparty/__main__.py | 4 +++- copyparty/broker_mp.py | 2 +- copyparty/svchub.py | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/copyparty/__main__.py b/copyparty/__main__.py index 232be022..621e2f91 100644 --- a/copyparty/__main__.py +++ b/copyparty/__main__.py @@ -129,7 +129,9 @@ def main(): ap.add_argument("-i", metavar="IP", type=str, default="0.0.0.0", help="ip to bind") ap.add_argument("-p", metavar="PORT", type=int, default=1234, help="port to bind") ap.add_argument("-nc", metavar="NUM", type=int, default=16, help="max num clients") - ap.add_argument("-j", metavar="CORES", type=int, help="max num cpu cores") + ap.add_argument( + "-j", metavar="CORES", type=int, default=1, help="max num cpu cores" + ) ap.add_argument("-a", metavar="ACCT", type=str, action="append", help="add account") ap.add_argument("-v", metavar="VOL", type=str, action="append", help="add volume") ap.add_argument("-q", action="store_true", help="quiet") diff --git a/copyparty/broker_mp.py b/copyparty/broker_mp.py index fcdf9fbb..280df4bb 100644 --- a/copyparty/broker_mp.py +++ b/copyparty/broker_mp.py @@ -29,7 +29,7 @@ class BrokerMp(object): self.mutex = threading.Lock() cores = self.args.j - if cores is None: + if not cores: cores = mp.cpu_count() self.log("broker", "booting {} subprocesses".format(cores)) diff --git a/copyparty/svchub.py b/copyparty/svchub.py index dbf63fd7..bb9bbc2f 100644 --- a/copyparty/svchub.py +++ b/copyparty/svchub.py @@ -129,8 +129,8 @@ class SvcHub(object): return None def check_mp_enable(self): - if self.args.j == 0: - self.log("root", "multiprocessing disabled by argument -j 0;") + if self.args.j == 1: + self.log("root", "multiprocessing disabled by argument -j 1;") return False if mp.cpu_count() <= 1: