From: jzhou <jzhou>
Date: Wed, 20 Jul 2011 21:30:28 +0000 (+0000)
Subject: Missing changes
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=55f482b4e93e0e80cdb7eb2ee203b32992312b76;p=IRC.git

Missing changes
---

diff --git a/Robust/src/Runtime/bamboo/multicorecache.c b/Robust/src/Runtime/bamboo/multicorecache.c
index 52a725a7..6c41b9f4 100644
--- a/Robust/src/Runtime/bamboo/multicorecache.c
+++ b/Robust/src/Runtime/bamboo/multicorecache.c
@@ -106,7 +106,7 @@ void cacheAdapt_gc(bool isgccachestage) {
 #ifdef GC_CACHE_COHERENT_ON
   if(!isgccachestage) {
     // get out of GC
-#if defined(GC_CACHE_ADAPT_POLICY3)&&defined(GC_CACHE_ADAPT_POLICY4)
+#if (defined(GC_CACHE_ADAPT_POLICY4)||defined(GC_CACHE_ADAPT_POLICY3))
     // flush the shared heap
     BAMBOO_CACHE_FLUSH_L2();
 
@@ -297,7 +297,7 @@ unsigned int cacheAdapt_decision(int coren) {
 #elif defined(GC_CACHE_ADAPT_POLICY2)
   //cacheAdapt_policy_local(coren);
 #elif defined(GC_CACHE_ADAPT_POLICY3)
-  //cacheAdapt_policy_hottest(coren);
+  cacheAdapt_policy_hottest(coren);
 #elif defined(GC_CACHE_ADAPT_POLICY4)
   cacheAdapt_policy_dominate(coren);
 #endif