From: Brian Norris <banorris@uci.edu>
Date: Wed, 6 Mar 2013 03:04:57 +0000 (-0800)
Subject: Merge remote 'yield' work
X-Git-Tag: oopsla2013~156^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=90471233ff4dcca9a196152574dca4e7cf183698;hp=fa36db2da01d7da10e0cd375fda3c2db4ce3a05b;p=model-checker.git

Merge remote 'yield' work
---

diff --git a/include/impatomic.h b/include/impatomic.h
index 60e5d36..5548619 100644
--- a/include/impatomic.h
+++ b/include/impatomic.h
@@ -3902,11 +3902,11 @@ T* atomic<T*>::fetch_sub( ptrdiff_t __v__, memory_order __x__ ) volatile
 #ifdef __cplusplus
 extern "C" {
 #endif
-inline void atomic_thread_fence(memory_order order)
+static inline void atomic_thread_fence(memory_order order)
 { _ATOMIC_FENCE_(order); }
 
 /** @todo Do we want to try to support a user's signal-handler? */
-inline void atomic_signal_fence(memory_order order)
+static inline void atomic_signal_fence(memory_order order)
 { /* No-op? */ }
 #ifdef __cplusplus
 }
diff --git a/model.cc b/model.cc
index 8e513a3..55d5d0d 100644
--- a/model.cc
+++ b/model.cc
@@ -2834,7 +2834,9 @@ static void print_list(action_list_t *list)
 	unsigned int hash = 0;
 
 	for (it = list->begin(); it != list->end(); it++) {
-		(*it)->print();
+		const ModelAction *act = *it;
+		if (act->get_seq_number() > 0)
+			act->print();
 		hash = hash^(hash<<3)^((*it)->hash());
 	}
 	model_print("HASH %u\n", hash);