commit 4b95e8fad803ad307fa09c11c08894544e07a731
author Mathieu Chartier <mathieuc@google.com> Mon Jul 15 16:32:50 2013 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Jul 15 17:16:37 2013 -0700
tree 1415e3c30d673aeba09e20afe567cc757af124f0
parent 57a77c8650e84aefbc9985350989242296a18e00

Refactor atomic integer.

Refactored atomic integer to be similar to c++11 std::atomic<int>.

Removed jdwp serial lock and reverted lock level name change from
https://googleplex-android-review.googlesource.com/#/c/327297/

Change-Id: I2229f30c4d5762a0e8c72697d6aca4683750af35

runtime/gc/collector/mark_sweep.cc

diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc
index 79a571b..7664657 100644
--- a/runtime/gc/collector/mark_sweep.cc
+++ b/runtime/gc/collector/mark_sweep.cc
@@ -852,8 +852,8 @@
   // AllocSpace::FreeList clears the value in ptrs, so perform after clearing the live bit
   size_t freed_bytes = space->FreeList(self, num_ptrs, ptrs);
   heap->RecordFree(freed_objects, freed_bytes);
-  mark_sweep->freed_objects_ += freed_objects;
-  mark_sweep->freed_bytes_ += freed_bytes;
+  mark_sweep->freed_objects_.fetch_add(freed_objects);
+  mark_sweep->freed_bytes_.fetch_add(freed_bytes);
 }
 
 void MarkSweep::ZygoteSweepCallback(size_t num_ptrs, Object** ptrs, void* arg) {
@@ -918,8 +918,8 @@
   VLOG(heap) << "Freed " << freed_objects << "/" << count
              << " objects with size " << PrettySize(freed_bytes);
   heap_->RecordFree(freed_objects + freed_large_objects, freed_bytes);
-  freed_objects_ += freed_objects;
-  freed_bytes_ += freed_bytes;
+  freed_objects_.fetch_add(freed_objects);
+  freed_bytes_.fetch_add(freed_bytes);
 
   timings_.NewSplit("ResetStack");
   allocations->Reset();
@@ -997,8 +997,8 @@
       ++freed_objects;
     }
   }
-  freed_objects_ += freed_objects;
-  freed_bytes_ += freed_bytes;
+  freed_objects_.fetch_add(freed_objects);
+  freed_bytes_.fetch_add(freed_bytes);
   GetHeap()->RecordFree(freed_objects, freed_bytes);
 }
 
@@ -1205,7 +1205,7 @@
       thread_pool_->AddTask(Thread::Current(), output_);
       output_ = NULL;
       if (kMeasureOverhead) {
-        mark_sweep_->overhead_time_ += NanoTime() - start;
+        mark_sweep_->overhead_time_.fetch_add(NanoTime() - start);
       }
     }
   }
@@ -1217,7 +1217,7 @@
     }
     output_ = new MarkStackChunk(thread_pool_, mark_sweep_, NULL, NULL);
     if (kMeasureOverhead) {
-      mark_sweep_->overhead_time_ += NanoTime() - start;
+      mark_sweep_->overhead_time_.fetch_add(NanoTime() - start);
     }
   }