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.

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

Jump to bottom

Fix freeze of worker #53

Merged
merged 1 commit into from
Dec 15, 2023
Merged

Fix freeze of worker #53

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
13 changes: 0 additions & 13 deletions redGrapes/dispatch/thread/worker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ WorkerThread::~WorkerThread()
void WorkerThread::start()
{
thread = std::thread([this]{ this->run(); });
this->Worker::start();
}

Worker::Worker( memory::ChunkedBumpAlloc<memory::HwlocAlloc> & alloc, HwlocContext & hwloc_ctx, hwloc_obj_t const & obj, WorkerId worker_id )
Expand All @@ -46,12 +45,6 @@ Worker::~Worker()
{
}

void Worker::start()
{
m_start.store(true, std::memory_order_release);
wake();
}

void Worker::stop()
{
SPDLOG_TRACE("Worker::stop()");
Expand Down Expand Up @@ -83,12 +76,6 @@ void WorkerThread::run()
};
*/

/* wait for start-flag to be triggerd in order
* to avoid premature access to `shared_from_this`
*/
while( ! m_start.load(std::memory_order_consume) )
cv.wait();

/* initialize thread-local variables
*/
SingletonContext::get().current_worker = this->shared_from_this();
Expand Down
10 changes: 1 addition & 9 deletions redGrapes/dispatch/thread/worker.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@ struct Worker
//private:
WorkerId id;

/*!
* if true, the thread shall start
* executing the jobs in its queue
* and request rescheduling if empty
*/
std::atomic_bool m_start{ false };

/*! if true, the thread shall stop
* instead of waiting when it is out of jobs
*/
Expand Down Expand Up @@ -78,7 +71,6 @@ struct Worker
inline scheduler::WakerId get_waker_id() { return id + 1; }
inline bool wake() { return cv.notify(); }

void start();
virtual void stop();

/* adds a new task to the emplacement queue
Expand Down Expand Up @@ -133,7 +125,7 @@ struct WorkerThread
/* function the thread will execute
*/
void run();

void cpubind();
void membind();
};
Expand Down
Loading