Skip to content

Commit 5c1dcee

Browse files
committed
Revert "avoid race between a scheduler starting up and an enclave trying to acquire."
This reverts commit b4c6963.
1 parent 84f527e commit 5c1dcee

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

include/reactor-cpp/scheduler.hh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@ private:
110110

111111
std::mutex scheduling_mutex_;
112112
std::condition_variable cv_schedule_;
113-
// lock used to protect the scheduler from asynchronous requests (i.e. from
114-
// enclaves pr federates). We hold the mutex from construction and release in
115-
// start().
116-
std::unique_lock<std::mutex> startup_lock_{scheduling_mutex_};
117113

118114
std::shared_mutex mutex_event_queue_;
119115
std::map<Tag, ActionListPtr> event_queue_;

lib/scheduler.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,6 @@ void Scheduler::start() {
214214
set_ports_.resize(num_workers);
215215
triggered_reactions_.resize(num_workers);
216216

217-
// release the scheduling mutex, allowing other asynchronous processes (i.e.
218-
// enclaves or federates) to access the event queue and the current logical
219-
// time.
220-
startup_lock_.unlock();
221-
222217
// Initialize and start the workers. By resizing the workers vector first,
223218
// we make sure that there is sufficient space for all the workers and non of
224219
// them needs to be moved. This is important because a running worker may not

0 commit comments

Comments
 (0)