From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CD6A467782 for ; Tue, 12 Jan 2021 14:59:10 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C536826F28 for ; Tue, 12 Jan 2021 14:58:40 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id EC02626EFC for ; Tue, 12 Jan 2021 14:58:39 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B828145F58 for ; Tue, 12 Jan 2021 14:58:39 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 12 Jan 2021 14:58:19 +0100 Message-Id: <20210112135830.2798301-10-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210112135830.2798301-1-f.gruenbichler@proxmox.com> References: <20210112135830.2798301-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [runtime.rs] Subject: [pbs-devel] [PATCH proxmox-backup 05/12] tokio: adapt to 1.0 runtime changes X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2021 13:59:10 -0000 enter() now returns a guard, and the builder got revamped to make the choice between MT and current thread explicit. Signed-off-by: Fabian Grünbichler --- src/tools/runtime.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/runtime.rs b/src/tools/runtime.rs index 1953e202..46564e76 100644 --- a/src/tools/runtime.rs +++ b/src/tools/runtime.rs @@ -84,8 +84,7 @@ pub fn get_runtime_with_builder runtime::Builder>(get_builder: F) -> pub fn get_runtime() -> Arc { get_runtime_with_builder(|| { - let mut builder = runtime::Builder::new(); - builder.threaded_scheduler(); + let mut builder = runtime::Builder::new_multi_thread(); builder.enable_all(); builder }) @@ -122,7 +121,8 @@ pub fn block_on(fut: F) -> F::Output { // not a worker thread, not associated with a runtime, make sure we have a runtime (spawn // it on demand if necessary), then enter it let _guard = BlockingGuard::set(); - get_runtime().enter(move || block_on_local_future(fut)) + let _enter_guard = get_runtime().enter(); + get_runtime().block_on(fut) } } -- 2.20.1