{"id":11109,"url":"https://patchwork.libcamera.org/api/1.1/patches/11109/?format=json","web_url":"https://patchwork.libcamera.org/patch/11109/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210202221051.1740237-2-niklas.soderlund@ragnatech.se>","date":"2021-02-02T22:10:49","name":"[libcamera-devel,v4,1/3] cam: event_loop: Rename event_ to base_","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7bdd0485f043fee9b569e6fa27ba2596e0ae6951","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11109/mbox/","series":[{"id":1641,"url":"https://patchwork.libcamera.org/api/1.1/series/1641/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1641","date":"2021-02-02T22:10:48","name":"cam: Fix races in event loop and long request processing times","version":4,"mbox":"https://patchwork.libcamera.org/series/1641/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11109/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11109/checks/","tags":{},"headers":{"Return-Path":"","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 82AF3BD161\n\tfor ;\n\tTue, 2 Feb 2021 22:11:26 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6070668439;\n\tTue, 2 Feb 2021 23:11:26 +0100 (CET)","from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 156CB60307\n\tfor ;\n\tTue, 2 Feb 2021 23:11:25 +0100 (CET)","from bismarck.berto.se (p4fca2458.dip0.t-ipconnect.de\n\t[79.202.36.88])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 93f4b597-65a3-11eb-b73f-0050569116f7;\n\tTue, 02 Feb 2021 23:11:20 +0100 (CET)"],"X-Halon-ID":"93f4b597-65a3-11eb-b73f-0050569116f7","Authorized-sender":"niklas.soderlund@fsdn.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 2 Feb 2021 23:10:49 +0100","Message-Id":"<20210202221051.1740237-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.30.0","In-Reply-To":"<20210202221051.1740237-1-niklas.soderlund@ragnatech.se>","References":"<20210202221051.1740237-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 1/3] cam: event_loop: Rename event_ to\n\tbase_","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The 'event' variable name is usually used for events added to the base\nevent loop, not the loop itself. Rename the struct event_base member to\nbase_ as a preparation for future work adding events to the loop.\n\nThere is no functional change.\n\nSigned-off-by: Niklas Söderlund \n---\n src/cam/event_loop.cpp | 8 ++++----\n src/cam/event_loop.h | 2 +-\n 2 files changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/src/cam/event_loop.cpp b/src/cam/event_loop.cpp\nindex 94c5d1d362455f33..3a2b665abdc063de 100644\n--- a/src/cam/event_loop.cpp\n+++ b/src/cam/event_loop.cpp\n@@ -18,7 +18,7 @@ EventLoop::EventLoop()\n \tassert(!instance_);\n \n \tevthread_use_pthreads();\n-\tevent_ = event_base_new();\n+\tbase_ = event_base_new();\n \tinstance_ = this;\n }\n \n@@ -26,7 +26,7 @@ EventLoop::~EventLoop()\n {\n \tinstance_ = nullptr;\n \n-\tevent_base_free(event_);\n+\tevent_base_free(base_);\n \tlibevent_global_shutdown();\n }\n \n@@ -42,7 +42,7 @@ int EventLoop::exec()\n \n \twhile (!exit_.load(std::memory_order_acquire)) {\n \t\tdispatchCalls();\n-\t\tevent_base_loop(event_, EVLOOP_NO_EXIT_ON_EMPTY);\n+\t\tevent_base_loop(base_, EVLOOP_NO_EXIT_ON_EMPTY);\n \t}\n \n \treturn exitCode_;\n@@ -57,7 +57,7 @@ void EventLoop::exit(int code)\n \n void EventLoop::interrupt()\n {\n-\tevent_base_loopbreak(event_);\n+\tevent_base_loopbreak(base_);\n }\n \n void EventLoop::callLater(const std::function &func)\ndiff --git a/src/cam/event_loop.h b/src/cam/event_loop.h\nindex 408073c50594d09d..d0d5b5a53c830670 100644\n--- a/src/cam/event_loop.h\n+++ b/src/cam/event_loop.h\n@@ -30,7 +30,7 @@ public:\n private:\n \tstatic EventLoop *instance_;\n \n-\tstruct event_base *event_;\n+\tstruct event_base *base_;\n \tstd::atomic exit_;\n \tint exitCode_;\n \n","prefixes":["libcamera-devel","v4","1/3"]}