Skip to content
Snippets Groups Projects
Commit def6885c authored by Florian Schmaus's avatar Florian Schmaus
Browse files

Merge branch 'worker-improvements' into 'master'

Various small changes

See merge request i4/manycore/emper!55
parents d85469f2 f4f49216
No related branches found
No related tags found
No related merge requests found
......@@ -80,6 +80,9 @@ class Actor {
const auto start = std::chrono::steady_clock::now();
const auto deadline = start + std::chrono::milliseconds(timeout);
while (!(queue.size() == 0 && state.load(std::memory_order_acquire) == Retrieving)) {
// TODO: The suppressed linter error below may be a false positive
// reported by clang-tidy.
// NOLINTNEXTLINE(modernize-use-nullptr)
if (std::chrono::steady_clock::now() > deadline) {
return false;
}
......
......@@ -2,6 +2,7 @@
// Copyright © 2020 Florian Schmaus
#pragma once
#include "Common.hpp"
#include "emper-common.h"
class Runtime;
......@@ -12,7 +13,7 @@ class Worker {
const workerid_t workerId;
unsigned int seed;
ALIGN_TO_CACHE_LINE unsigned int seed;
Worker(workerid_t workerId, unsigned int seed) : workerId(workerId), seed(seed) {}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment