Skip to content

Refactor StableEventPool to use global sequence counter for event ordering #25

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

Open
chenyx10358 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor StableEventPool to use global sequence counter for event ordering #25

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
16 changes: 4 additions & 12 deletions qns/simulator/stablepool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def __eq__(self, other) -> bool:
return self.event == other.event and self.seq == other.seq

def __lt__(self, other) -> bool:
return self.event < other.event or (
return self.event < other.event or (@
self.event == other.event and self.seq < other.seq
)

Expand Down Expand Up @@ -62,8 +62,7 @@ def __init__(self, ts: Time, te: Time):
self.te = te
self.tc = ts
self.event_list = []
self.insert_num = {}
self.pop_num = {}
self.seq = 0

@property
def current_time(self) -> Time:
Expand All @@ -84,11 +83,8 @@ def add_event(self, event: Event) -> bool:
if event.t < self.tc or event.t > self.te:
return False

if event.t not in self.insert_num:
self.insert_num[event.t] = 0
self.pop_num[event.t] = 0
sevent = self.StableEvent(event, self.insert_num[event.t])
self.insert_num[event.t] += 1
sevent = self.StableEvent(event, self.seq)
self.seq += 1
heapq.heappush(self.event_list, sevent)
return True

Expand All @@ -103,10 +99,6 @@ def next_event(self) -> Event:
sevent = heapq.heappop(self.event_list)
event = sevent.event
self.tc = event.t
self.pop_num[event.t] += 1
if self.pop_num[event.t] == self.insert_num[event.t]:
self.insert_num.pop(event.t, None)
self.pop_num.pop(event.t, None)
except IndexError:
event = None
self.tc = self.te
Expand Down
Loading