Skip to content

Added locks and multithreaded logic to the Session object. #81

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.

Sign up for GitHub

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

Draft
kbarkevich wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Added locks and multithreaded logic to the Session object. #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 36 additions & 3 deletions mh/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,14 +360,19 @@ def __init__(self):
self.servers = new_servers()

def get_support_code(self, session):
"""Get the online support code or create one."""
"""SESSION LOCKING

Get the online support code or create one.
"""
session.lock()
support_code = session.online_support_code
if support_code is None:
while True:
support_code = new_random_str(11)
if support_code not in self.consoles:
session.online_support_code = support_code
break
session.unlock()

# Create some default users
if support_code not in self.consoles:
Expand All @@ -378,12 +383,17 @@ def get_support_code(self, session):
return support_code

def new_pat_ticket(self, session):
"""Generates a new PAT ticket for the session."""
"""SESSION LOCKING

Generates a new PAT ticket for the session.
"""
session.lock()
while True:
session.pat_ticket = new_random_str(11)
if session.pat_ticket not in self.sessions:
break
self.sessions[session.pat_ticket] = session
session.unlock()
return session.pat_ticket

def use_capcom_id(self, session, capcom_id, name=None):
Expand All @@ -398,9 +408,13 @@ def use_capcom_id(self, session, capcom_id, name=None):
return name

def use_user(self, session, index, name):
"""Use User from the slot or create one if empty"""
"""SESSION LOCKING

Use User from the slot or create one if empty.
"""
assert 1 <= index <= 6, "Invalid Capcom ID slot"
index -= 1
session.lock()
users = self.consoles[session.online_support_code]
while users[index] == "******":
capcom_id = new_random_str(6)
Expand All @@ -413,6 +427,7 @@ def use_user(self, session, index, name):
name = self.use_capcom_id(session, capcom_id, name)
session.capcom_id = capcom_id
session.hunter_name = name
session.unlock()

def get_session(self, pat_ticket):
"""Returns existing PAT session or None."""
Expand Down Expand Up @@ -451,18 +466,24 @@ def get_users(self, session, first_index, count):
return capcom_ids

def join_server(self, session, index):
"""SESSION LOCKING"""
session.lock()
if session.local_info["server_id"] is not None:
self.leave_server(session, session.local_info["server_id"])
server = self.get_server(index)
server.players.add(session)
session.local_info["server_id"] = index
session.local_info["server_name"] = server.name
session.unlock()
return server

def leave_server(self, session, index):
"""SESSION LOCKING"""
session.lock()
self.get_server(index).players.remove(session)
session.local_info["server_id"] = None
session.local_info["server_name"] = None
session.unlock()

def get_server_time(self):
pass
Expand All @@ -486,20 +507,26 @@ def get_gate(self, server_id, index):
return gates[index - 1]

def join_gate(self, session, server_id, index):
"""SESSION LOCKING"""
session.lock()
gate = self.get_gate(server_id, index)
gate.parent.players.remove(session)
gate.players.add(session)
session.local_info["gate_id"] = index
session.local_info["gate_name"] = gate.name
session.unlock()
return gate

def leave_gate(self, session):
"""SESSION LOCKING"""
session.lock()
gate = self.get_gate(session.local_info["server_id"],
session.local_info["gate_id"])
gate.parent.players.add(session)
gate.players.remove(session)
session.local_info["gate_id"] = None
session.local_info["gate_name"] = None
session.unlock()

def get_cities(self, server_id, gate_id):
return self.get_gate(server_id, gate_id).cities
Expand Down Expand Up @@ -557,14 +584,19 @@ def create_city(self, session, server_id, gate_id, index,
return city

def join_city(self, session, server_id, gate_id, index):
"""SESSION LOCKING"""
session.lock()
city = self.get_city(server_id, gate_id, index)
city.parent.players.remove(session)
city.players.add(session)
session.local_info["city_id"] = index
session.local_info["city_name"] = city.name
session.unlock()
return city

def leave_city(self, session):
"""SESSION LOCKING"""
session.lock()
city = self.get_city(session.local_info["server_id"],
session.local_info["gate_id"],
session.local_info["city_id"])
Expand All @@ -574,6 +606,7 @@ def leave_city(self, session):
city.clear_circles()
session.local_info["city_id"] = None
session.local_info["city_name"] = None
session.unlock()

def layer_detail_search(self, server_type, fields):
cities = []
Expand Down
Loading