From: Brian Norris Date: Wed, 3 Oct 2012 00:58:01 +0000 (-0700) Subject: action: edit some spacing X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=bad8cc4598438f8b8d9e8fa210e2790f92c9ec44;hp=cef10a2b49af5da16ffe59c5b9ddd210c668fbac;ds=inline action: edit some spacing --- diff --git a/action.cc b/action.cc index 6a18ffee..1655d942 100644 --- a/action.cc +++ b/action.cc @@ -27,31 +27,38 @@ ModelAction::~ModelAction() delete cv; } -void ModelAction::copy_from_new(ModelAction *newaction) { - seq_number=newaction->seq_number; +void ModelAction::copy_from_new(ModelAction *newaction) +{ + seq_number = newaction->seq_number; } -bool ModelAction::is_mutex_op() const { +bool ModelAction::is_mutex_op() const +{ return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK; } -bool ModelAction::is_lock() const { +bool ModelAction::is_lock() const +{ return type == ATOMIC_LOCK; } -bool ModelAction::is_unlock() const { +bool ModelAction::is_unlock() const +{ return type == ATOMIC_UNLOCK; } -bool ModelAction::is_trylock() const { +bool ModelAction::is_trylock() const +{ return type == ATOMIC_TRYLOCK; } -bool ModelAction::is_success_lock() const { +bool ModelAction::is_success_lock() const +{ return type == ATOMIC_LOCK || (type == ATOMIC_TRYLOCK && value == VALUE_TRYSUCCESS); } -bool ModelAction::is_failed_trylock() const { +bool ModelAction::is_failed_trylock() const +{ return (type == ATOMIC_TRYLOCK && value == VALUE_TRYFAILED); } @@ -130,8 +137,8 @@ bool ModelAction::same_thread(const ModelAction *act) const } void ModelAction::copy_typeandorder(ModelAction * act) { - this->type=act->type; - this->order=act->order; + this->type = act->type; + this->order = act->order; } /** This method changes an existing read part of an RMW action into either: