Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Share lock to acceptors via pool #238

Merged
merged 3 commits into from
Dec 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions proxy/core/acceptor/acceptor.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"""
import logging
import multiprocessing
import multiprocessing.synchronize
import selectors
import socket
import threading
Expand All @@ -33,20 +34,20 @@ class Acceptor(multiprocessing.Process):
starts a new work thread.
"""

lock = multiprocessing.Lock()

def __init__(
self,
idd: int,
work_queue: connection.Connection,
flags: Flags,
work_klass: Type[ThreadlessWork],
lock: multiprocessing.synchronize.Lock,
event_queue: Optional[EventQueue] = None) -> None:
super().__init__()
self.idd = idd
self.work_queue: connection.Connection = work_queue
self.flags = flags
self.work_klass = work_klass
self.lock = lock
self.event_queue = event_queue

self.running = multiprocessing.Event()
Expand Down Expand Up @@ -101,12 +102,13 @@ def start_work(self, conn: socket.socket, addr: Tuple[str, int]) -> None:
work_thread.start()

def run_once(self) -> None:
assert self.selector and self.sock
with self.lock:
assert self.selector and self.sock
events = self.selector.select(timeout=1)
if len(events) == 0:
return
conn, addr = self.sock.accept()

# now = time.time()
# fileno: int = conn.fileno()
self.start_work(conn, addr)
Expand Down
5 changes: 4 additions & 1 deletion proxy/core/acceptor/pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

logger = logging.getLogger(__name__)

LOCK = multiprocessing.Lock()


class AcceptorPool:
"""AcceptorPool.
Expand Down Expand Up @@ -66,7 +68,8 @@ def start_workers(self) -> None:
work_queue=work_queue[1],
flags=self.flags,
work_klass=self.work_klass,
event_queue=self.event_queue
lock=LOCK,
event_queue=self.event_queue,
)
acceptor.start()
logger.debug(
Expand Down
1 change: 1 addition & 0 deletions tests/core/test_acceptor.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def setUp(self) -> None:
idd=self.acceptor_id,
work_queue=self.pipe[1],
flags=self.flags,
lock=multiprocessing.Lock(),
work_klass=self.mock_protocol_handler)

@mock.patch('selectors.DefaultSelector')
Expand Down