File 2981-erts-Rename-update_pollset-as-concurrent_u... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2981-erts-Rename-update_pollset-as-concurrent_update_poll.patch of Package erlang (Revision 1a612bb48741a3b5ba3a40c744d129b9)

Currently displaying revision 1a612bb48741a3b5ba3a40c744d129b9 , Show latest

From 5dfc1fee38cb7419919ec6eb063d1032de7f0082 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Thu, 17 Dec 2020 19:03:20 +0100
Subject: [PATCH 1/3] erts: Rename update_pollset as concurrent_update_pollset

to avoid confusion with the non concurrent update_pollset()
which different arguments and return value.
---
 erts/emulator/sys/common/erl_poll.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 9f0c82dc4b..09b673c350 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -750,7 +750,8 @@ grow_fds_status(ErtsPollSet *ps, int min_fd)
 
 #if ERTS_POLL_USE_EPOLL
 static int
-update_pollset(ErtsPollSet *ps, int fd, ErtsPollOp op, ErtsPollEvents events)
+concurrent_update_pollset(ErtsPollSet *ps, int fd, ErtsPollOp op,
+                          ErtsPollEvents events)
 {
     int res;
     int epoll_op = EPOLL_CTL_MOD;
@@ -866,7 +867,8 @@ update_pollset(ErtsPollSet *ps, int fd, ErtsPollOp op, ErtsPollEvents events)
     } while(0)
 
 static int
-update_pollset(ErtsPollSet *ps, int fd, ErtsPollOp op, ErtsPollEvents events)
+concurrent_update_pollset(ErtsPollSet *ps, int fd, ErtsPollOp op,
+                          ErtsPollEvents events)
 {
     int res = 0, len = 0;
     struct kevent evts[2];
@@ -1382,7 +1384,7 @@ poll_control(ErtsPollSet *ps, int fd, ErtsPollOp op,
 
 #if ERTS_POLL_USE_CONCURRENT_UPDATE
 
-    new_events = update_pollset(ps, fd, op, events);
+    new_events = concurrent_update_pollset(ps, fd, op, events);
 
 #else /* !ERTS_POLL_USE_CONCURRENT_UPDATE */
     if (fd >= ps->fds_status_len)
-- 
2.26.2

Places

File 2981-erts-Rename-update_pollset-as-concurrent_update_poll.patch of Package erlang (Revision 1a612bb48741a3b5ba3a40c744d129b9)

Places