{"id":15800,"url":"https://patchwork.libcamera.org/api/patches/15800/?format=json","web_url":"https://patchwork.libcamera.org/patch/15800/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220505151851.2421-2-ecurtin@redhat.com>","date":"2022-05-05T15:18:49","name":"[libcamera-devel,v8,2/4] cam: event_loop: Rename addEvent to addFDEvent","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"862a1c0f8cab3f95f063c4a8a3db0b9a1bee64eb","submitter":{"id":101,"url":"https://patchwork.libcamera.org/api/people/101/?format=json","name":"Eric Curtin","email":"ecurtin@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15800/mbox/","series":[{"id":3095,"url":"https://patchwork.libcamera.org/api/series/3095/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3095","date":"2022-05-05T15:18:48","name":"[libcamera-devel,v8,1/4] cam: event_loop: Add timer events to event loop","version":8,"mbox":"https://patchwork.libcamera.org/series/3095/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15800/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15800/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 6E2EAC3256\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu,  5 May 2022 15:19:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2FC226563F;\n\tThu,  5 May 2022 17:19:17 +0200 (CEST)","from us-smtp-delivery-74.mimecast.com\n\t(us-smtp-delivery-74.mimecast.com [170.10.133.74])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CBB9760424\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu,  5 May 2022 17:19:15 +0200 (CEST)","from mail-wm1-f72.google.com (mail-wm1-f72.google.com\n\t[209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n\tus-mta-588-9baQjdThP5u1YwRxoPJUDA-1; Thu, 05 May 2022 11:19:13 -0400","by mail-wm1-f72.google.com with SMTP id\n\tt184-20020a1c46c1000000b00394209f54f1so1841630wma.4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 05 May 2022 08:19:13 -0700 (PDT)","from localhost.localdomain\n\t([2001:bb6:9634:7100:33b0:c1b1:8875:4adb])\n\tby smtp.gmail.com with ESMTPSA id\n\tz6-20020a056000110600b0020ad05214d5sm1434819wrw.2.2022.05.05.08.19.11\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 05 May 2022 08:19:11 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1651763957;\n\tbh=j12gqWSP+QeX2PBTiuHIllAFBnA20FVAmFnqRzibGSU=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=O1zNWcafurIIvErlbG5lDo8XysC5bCilZMCnqAxPhDD99Njdbqb0/+aH8hFAaLqxz\n\t+WVGuw3e9IbxmZvrUxREnCNfcV6cGMBwi2MQFXb5WYuKxyNFJK2PouiZJ+iE60KjKq\n\tuG9TjCl8zFkB05jh2hhFDUKsusajvVbZHUmHi9f1J3Xbylyp6imtJnqg9Luz9YuyUD\n\tk3MCTrOG0YWs5z+QVvFAlGNi83a4ilbtlY0fQh0WWEUTkdSNN9O5VoLbIRbYUB7r24\n\tNrTECR641fC+GidOEMlE9awgRWJfO7QmDgFsD+v1Z23yI8Qgu5zpOFB9JBxemg4/sN\n\tkDp6x8akpadug==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1651763954;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=Ju9IjSwBQXYcqiAXugQthBm4b9ZwKNEBO0Yd1CGdgfc=;\n\tb=RaItfkK4rCW0eCWJT7wwxmpjQCnFnWZOnYnNPfae5BmsfrpRdJa1sDGtKJvNkRz2Dj5wg0\n\tpOUsAXi7uYnC7j81keTKM5QT9chmiul/CTcJKzeNrXfkBpCCQU5fM4cszUY0rLykc7TLk/\n\tPh52ljLyF1vPXpN7yN55J1YlNpP/7Ig="],"Authentication-Results":["lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=redhat.com\n\theader.i=@redhat.com header.b=\"RaItfkK4\"; \n\tdkim-atps=neutral","relay.mimecast.com;\n\tauth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ecurtin@redhat.com"],"X-MC-Unique":"9baQjdThP5u1YwRxoPJUDA-1","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=Ju9IjSwBQXYcqiAXugQthBm4b9ZwKNEBO0Yd1CGdgfc=;\n\tb=ho00zK+vvozCRT6osqdgUj9zMwFeM8MLJ5rF8m1hM5VvGNZNEvYpzNApcccB28s9OS\n\toN2XkEptl0hslwpQAA6+AD0avbq1jg0lHJk6f2zEFNwQeEj6vZyuxUHH5I2TL9+2lnUv\n\tjC747ffZ1w6EAJMd6XExjDr0Jq+OvyADSqTdxudnXwBhJWD9h7pOV6AKFeVQOHwpQnNa\n\tvZBOMYEybPAWyvwVHyy5Gn621z89LCu2ruk8IxG29YisJg+RVzGRP/MGU1vVYXyvnzeh\n\twMxxnaiAUCPOzIY3I5PFUPnSi8IF7ghC67qSNveiRW92kb6oEEKCR86v2TKZsDmIDpdr\n\tf4DQ==","X-Gm-Message-State":"AOAM531TTBEjtBN0uWe4FBTWgsXLhAPRB9F3Pr2/uRYtX8+Rcv2Lahsy\n\tImnOoMWKiLANxak86AUZ9wO1w0nMFvIbRjyoCEFgt+0Ds3owaDfNGjCcw8Gs4UMpHhAB8VG/9Zb\n\tvMVI9Cr5yVReLexeEbHnfG2h3y44PsRCk3nQVObepGEu0oQcyyJ5wJMn3t1DJUNYY/xzhCFH6jc\n\tfHx2oxNanY","X-Received":["by 2002:a7b:c017:0:b0:394:5631:62bc with SMTP id\n\tc23-20020a7bc017000000b00394563162bcmr5546153wmb.190.1651763952160; \n\tThu, 05 May 2022 08:19:12 -0700 (PDT)","by 2002:a7b:c017:0:b0:394:5631:62bc with SMTP id\n\tc23-20020a7bc017000000b00394563162bcmr5546117wmb.190.1651763951878; \n\tThu, 05 May 2022 08:19:11 -0700 (PDT)"],"X-Google-Smtp-Source":"ABdhPJzL873gDGidlmw/mvn5ViRfENkhZ5JO8iXCPwxFGfWlgVSJVCtaWIwdcF/ot5yygvT5PanXUA==","To":"libcamera-devel@lists.libcamera.org","Date":"Thu,  5 May 2022 16:18:49 +0100","Message-Id":"<20220505151851.2421-2-ecurtin@redhat.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20220505151851.2421-1-ecurtin@redhat.com>","References":"<20220505151851.2421-1-ecurtin@redhat.com>","MIME-Version":"1.0","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain; charset=\"US-ASCII\"; x-default=true","Subject":"[libcamera-devel] [PATCH v8 2/4] cam: event_loop: Rename addEvent\n\tto addFDEvent","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","From":"Eric Curtin via libcamera-devel <libcamera-devel@lists.libcamera.org>","Reply-To":"Eric Curtin <ecurtin@redhat.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Since we now have two types of events addFDEvent and addTimerEvent.\n\nSigned-off-by: Eric Curtin <ecurtin@redhat.com>\n---\n src/cam/drm.cpp        | 4 ++--\n src/cam/event_loop.cpp | 4 ++--\n src/cam/event_loop.h   | 4 ++--\n 3 files changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/src/cam/drm.cpp b/src/cam/drm.cpp\nindex 46e34eb5..421cd61a 100644\n--- a/src/cam/drm.cpp\n+++ b/src/cam/drm.cpp\n@@ -432,8 +432,8 @@ int Device::init()\n \tif (ret < 0)\n \t\treturn ret;\n \n-\tEventLoop::instance()->addEvent(fd_, EventLoop::Read,\n-\t\t\t\t\tstd::bind(&Device::drmEvent, this));\n+\tEventLoop::instance()->addFDEvent(fd_, EventLoop::Read,\n+\t\t\t\t\t  std::bind(&Device::drmEvent, this));\n \n \treturn 0;\n }\ndiff --git a/src/cam/event_loop.cpp b/src/cam/event_loop.cpp\nindex 181c971c..0c2176c7 100644\n--- a/src/cam/event_loop.cpp\n+++ b/src/cam/event_loop.cpp\n@@ -64,8 +64,8 @@ void EventLoop::callLater(const std::function<void()> &func)\n \tevent_base_once(base_, -1, EV_TIMEOUT, dispatchCallback, this, nullptr);\n }\n \n-void EventLoop::addEvent(int fd, EventType type,\n-\t\t\t const std::function<void()> &callback)\n+void EventLoop::addFDEvent(int fd, EventType type,\n+\t\t\t   const std::function<void()> &callback)\n {\n \tstd::unique_ptr<Event> event = std::make_unique<Event>(callback);\n \tshort events = (type & Read ? EV_READ : 0)\ndiff --git a/src/cam/event_loop.h b/src/cam/event_loop.h\nindex 89215dce..d921cd8f 100644\n--- a/src/cam/event_loop.h\n+++ b/src/cam/event_loop.h\n@@ -36,8 +36,8 @@ public:\n \n \tvoid callLater(const std::function<void()> &func);\n \n-\tvoid addEvent(int fd, EventType type,\n-\t\t      const std::function<void()> &handler);\n+\tvoid addFDEvent(int fd, EventType type,\n+\t\t\tconst std::function<void()> &handler);\n \n \tvoid addTimerEvent(const std::chrono::milliseconds d,\n \t\t\t   const std::function<void()> &handler);\n","prefixes":["libcamera-devel","v8","2/4"]}