From patchwork Fri Apr 5 16:41:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Opdenacker X-Patchwork-Id: 42043 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78409CD11C2 for ; Fri, 5 Apr 2024 16:41:48 +0000 (UTC) Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by mx.groups.io with SMTP id smtpd.web11.17400.1712335299781837837 for ; Fri, 05 Apr 2024 09:41:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=dTOvpO7s; spf=pass (domain: bootlin.com, ip: 217.70.183.201, mailfrom: michael.opdenacker@bootlin.com) Received: by mail.gandi.net (Postfix) with ESMTPSA id CFDF91BF207; Fri, 5 Apr 2024 16:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1712335298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D121oOMAnQx2s3DAmEE2+o9eIQCqENaK5db9wZMf7LU=; b=dTOvpO7sxd203pO9JTFo1tWWoA0VBNkkWe6At5k4wV24Wdjq7KxANOA9NcMljgZPuYFz1a sPsNU3CqWTqj63rnbVbBnSkHNVRrv6+fp2lAfDFYWiRMS0yZczqrhU96vxrozb39SQtgQQ u2wZnE9Xs0oPYbXpECGeU94KOJGF5oKvrAAuwAzf5q1eO92/Mc3KDqy+aQlZqhtxjhGJUQ oRrXog8IMDqY5uZD7U4/xnRVQyV2JQv5wwgpnl8LabiP8/EFlmUbVSU+Cj+Xs/wY4t2reP fgcrMOHNo2h0wtb0h0C+WmQApOhrG4pdEv74jIahFofCpiE4JPPvh63khRewpQ== From: michael.opdenacker@bootlin.com To: bitbake-devel@lists.openembedded.org Cc: Michael Opdenacker , Joshua Watt , Tim Orling , Thomas Petazzoni Subject: [PATCH v2 01/12] prserv: simplify the PRServerClient() interface Date: Fri, 5 Apr 2024 18:41:14 +0200 Message-Id: <20240405164125.1652579-2-michael.opdenacker@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240405164125.1652579-1-michael.opdenacker@bootlin.com> References: <20240405164125.1652579-1-michael.opdenacker@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: michael.opdenacker@bootlin.com List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Apr 2024 16:41:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/16049 From: Michael Opdenacker serv.py: simplify the PRServerClient() interface by passing the server object instead of multiple arguments, and then retrieving the data through this object. This replicates what is done for ServerClient() in hashserv/server.py Signed-off-by: Michael Opdenacker Cc: Joshua Watt Cc: Tim Orling Cc: Thomas Petazzoni --- lib/prserv/serv.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/prserv/serv.py b/lib/prserv/serv.py index 5fc8863f70..28af636966 100644 --- a/lib/prserv/serv.py +++ b/lib/prserv/serv.py @@ -20,16 +20,16 @@ PIDPREFIX = "/tmp/PRServer_%s_%s.pid" singleton = None class PRServerClient(bb.asyncrpc.AsyncServerConnection): - def __init__(self, socket, table, read_only): - super().__init__(socket, 'PRSERVICE', logger) + def __init__(self, socket, server): + super().__init__(socket, 'PRSERVICE', server.logger) + self.server = server + self.handlers.update({ 'get-pr': self.handle_get_pr, 'import-one': self.handle_import_one, 'export': self.handle_export, 'is-readonly': self.handle_is_readonly, }) - self.table = table - self.read_only = read_only def validate_proto_version(self): return (self.proto_version == (1, 0)) @@ -38,10 +38,10 @@ class PRServerClient(bb.asyncrpc.AsyncServerConnection): try: return await super().dispatch_message(msg) except: - self.table.sync() + self.server.table.sync() raise else: - self.table.sync_if_dirty() + self.server.table.sync_if_dirty() async def handle_get_pr(self, request): version = request['version'] @@ -50,7 +50,7 @@ class PRServerClient(bb.asyncrpc.AsyncServerConnection): response = None try: - value = self.table.getValue(version, pkgarch, checksum) + value = self.server.table.getValue(version, pkgarch, checksum) response = {'value': value} except prserv.NotFoundError: logger.error("can not find value for (%s, %s)",version, checksum) @@ -61,13 +61,13 @@ class PRServerClient(bb.asyncrpc.AsyncServerConnection): async def handle_import_one(self, request): response = None - if not self.read_only: + if not self.server.read_only: version = request['version'] pkgarch = request['pkgarch'] checksum = request['checksum'] value = request['value'] - value = self.table.importone(version, pkgarch, checksum, value) + value = self.server.table.importone(version, pkgarch, checksum, value) if value is not None: response = {'value': value} @@ -80,7 +80,7 @@ class PRServerClient(bb.asyncrpc.AsyncServerConnection): colinfo = request['colinfo'] try: - (metainfo, datainfo) = self.table.export(version, pkgarch, checksum, colinfo) + (metainfo, datainfo) = self.server.table.export(version, pkgarch, checksum, colinfo) except sqlite3.Error as exc: logger.error(str(exc)) metainfo = datainfo = None @@ -88,7 +88,7 @@ class PRServerClient(bb.asyncrpc.AsyncServerConnection): return {'metainfo': metainfo, 'datainfo': datainfo} async def handle_is_readonly(self, request): - return {'readonly': self.read_only} + return {'readonly': self.server.read_only} class PRServer(bb.asyncrpc.AsyncServer): def __init__(self, dbfile, read_only=False): @@ -98,7 +98,7 @@ class PRServer(bb.asyncrpc.AsyncServer): self.read_only = read_only def accept_client(self, socket): - return PRServerClient(socket, self.table, self.read_only) + return PRServerClient(socket, self) def start(self): tasks = super().start()