libitm: Don't enforce privatization safety if already in serial mode.

	libitm/
	* beginend.cc (GTM::gtm_thread::trycommit): Don't enforce
	privatization safety if already in serial mode.

From-SVN: r182676

diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index abdf4fb62d8a226947f21a044fe1e2ac99d34ab3..d2f0fd752f084cf9c14efe0a9c550957c296daf9 100644 (file)
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-24  Torvald Riegel  <triegel@redhat.com>
+
+       * beginend.cc (GTM::gtm_thread::trycommit): Don't enforce
+       privatization safety if already in serial mode.
+
 2011-12-24  Torvald Riegel  <triegel@redhat.com>
 
        * beginend.cc (GTM::gtm_thread::restart): Add and handle

diff --git a/libitm/beginend.cc b/libitm/beginend.cc
index 17f9d7490d898f4caa0e2c75429fd5eb3ef89914..797548192eb1641e91502175982ffb7bbf151cff 100644 (file)
--- a/libitm/beginend.cc
+++ b/libitm/beginend.cc
@@ -457,7 +457,12 @@ GTM::gtm_thread::trycommit ()
       // The transaction is now inactive. Everything that we still have to do
       // will not synchronize with other transactions anymore.
       if (state & gtm_thread::STATE_SERIAL)
-       gtm_thread::serial_lock.write_unlock ();
+        {
+          gtm_thread::serial_lock.write_unlock ();
+          // There are no other active transactions, so there's no need to
+          // enforce privatization safety.
+          priv_time = 0;
+        }
       else
        gtm_thread::serial_lock.read_unlock (this);
       state = 0;