From 10df540dad6ba429731920c5e36638a3ac557eab Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Mon, 21 May 2012 11:51:07 -0700 Subject: [PATCH] fix indentation + spacing, esp. for MEMALLOC macro --- action.h | 3 ++- model.h | 3 ++- schedule.h | 3 ++- threads.cc | 2 +- threads.h | 6 ++++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/action.h b/action.h index 4cc6847..005e658 100644 --- a/action.h +++ b/action.h @@ -46,7 +46,8 @@ public: inline bool operator >(const ModelAction& act) const { return get_seq_number() > act.get_seq_number(); } - MEMALLOC + + MEMALLOC private: action_type type; memory_order order; diff --git a/model.h b/model.h index 4718c50..99ec69e 100644 --- a/model.h +++ b/model.h @@ -42,7 +42,8 @@ public: int switch_to_master(ModelAction *act); bool next_execution(); - MEMALLOC + + MEMALLOC private: int next_thread_id; int used_sequence_numbers; diff --git a/schedule.h b/schedule.h index 68900a5..c99748c 100644 --- a/schedule.h +++ b/schedule.h @@ -15,7 +15,8 @@ public: Thread * next_thread(void); Thread * get_current_thread(void); void print(); - MEMALLOC + + MEMALLOC private: std::list > readyList; Thread *current; diff --git a/threads.cc b/threads.cc index 80957ad..d00e212 100644 --- a/threads.cc +++ b/threads.cc @@ -25,7 +25,7 @@ Thread * thread_current(void) /* This method just gets around makecontext not being 64-bit clean */ void thread_startup() { - Thread * curr_thread=thread_current(); + Thread * curr_thread = thread_current(); curr_thread->start_routine(curr_thread->arg); } diff --git a/threads.h b/threads.h index 5731906..ebe33a3 100644 --- a/threads.h +++ b/threads.h @@ -30,8 +30,10 @@ public: thread_id_t get_id(); thrd_t get_thrd_t() { return *user_thread; } Thread * get_parent() { return parent; } - friend void thread_startup(); - MEMALLOC + + friend void thread_startup(); + + MEMALLOC private: int create_context(); Thread *parent; -- 2.34.1