alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bloemen: simplify style

Browse source 
Fixes #510.

* spot/mc/bloemen_ec.hh: Here.
This commit is contained in:
Alexandre Duret-Lutz 2022-07-06 17:11:55 +02:00
parent 69eba6fd9a
commit 1cfb4a14ec
1 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
spot/mc/bloemen_ec.hh
View file

@ -251,7 +251,7 @@ namespace spot
uf_element* q; uf_element* q;
uf_element* r; uf_element* r;
while (true) do
{ {
a_root = find(a); a_root = find(a);
b_root = find(b); b_root = find(b);
@ -261,28 +261,24 @@ namespace spot
// Update acceptance condition // Update acceptance condition
{ {
std::lock_guard<std::mutex> rlock(a_root->acc_mutex_); std::lock_guard<std::mutex> rlock(a_root->acc_mutex_);
a_root->acc |= acc;
acc |= a_root->acc; acc |= a_root->acc;
a_root->acc = acc;
} }
while (a_root->parent.load() != a_root) while (a_root->parent.load() != a_root)
{ {
a_root = find(a_root); a_root = find(a_root);
std::lock_guard<std::mutex> rlock(a_root->acc_mutex_); std::lock_guard<std::mutex> rlock(a_root->acc_mutex_);
a_root->acc |= acc;
acc |= a_root->acc; acc |= a_root->acc;
a_root->acc = acc;
} }
return acc; return acc;
} }
r = std::max(a_root, b_root); r = std::max(a_root, b_root);
q = std::min(a_root, b_root); q = std::min(a_root, b_root);
if (!lock_root(q))
continue;
break;
} }
while (!lock_root(q));
uf_element* a_list = lock_list(a); uf_element* a_list = lock_list(a);
if (a_list == nullptr) if (a_list == nullptr)
@ -329,9 +325,8 @@ namespace spot
{ {
std::lock_guard<std::mutex> rlock(r->acc_mutex_); std::lock_guard<std::mutex> rlock(r->acc_mutex_);
std::lock_guard<std::mutex> qlock(q->acc_mutex_); std::lock_guard<std::mutex> qlock(q->acc_mutex_);
q->acc |= acc; acc |= r->acc | q->acc;
r->acc |= q->acc; r->acc = q->acc = acc;
acc |= r->acc;
} }
while (r->parent.load() != r) while (r->parent.load() != r)
@ -339,8 +334,8 @@ namespace spot
r = find(r); r = find(r);
std::lock_guard<std::mutex> rlock(r->acc_mutex_); std::lock_guard<std::mutex> rlock(r->acc_mutex_);
std::lock_guard<std::mutex> qlock(q->acc_mutex_); std::lock_guard<std::mutex> qlock(q->acc_mutex_);
r->acc |= q->acc; acc |= r->acc | q->acc;
acc |= r->acc; r->acc = acc;
} }
unlock_list(a_list); unlock_list(a_list);
@ -360,9 +355,7 @@ namespace spot
a_status = a->list_status_.load(); a_status = a->list_status_.load();
if (a_status == list_status::BUSY) if (a_status == list_status::BUSY)
{ return a;
return a;
}
if (a_status == list_status::DONE) if (a_status == list_status::DONE)
break; break;
@ -407,9 +400,7 @@ namespace spot
b_status = b->list_status_.load(); b_status = b->list_status_.load();
if (b_status == list_status::BUSY) if (b_status == list_status::BUSY)
{ return b;
return b;
}
if (b_status == list_status::DONE) if (b_status == list_status::DONE)
break; break;