Changeset 2a301ff for doc/papers/llheap/figures/AllocInducedActiveFalseSharing.fig

Timestamp:

Aug 31, 2023, 11:31:15 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• doc/papers/llheap/figures/AllocInducedActiveFalseSharing.fig (modified) (2 diffs)

doc/papers/llheap/figures/AllocInducedActiveFalseSharing.fig

@@ -13 +13 @@
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
          3450 2700 4350 2700 4350 3000 3450 3000 3450 2700
-4 1 0 50 -1 0 11 0.0000 2 165 825 3000 2925 Object$_1$\001
-4 1 0 50 -1 0 11 0.0000 2 165 825 3900 2925 Object$_2$\001
+4 1 0 50 -1 0 10 0.0000 2 165 825 3000 2925 Object$_1$\001
+4 1 0 50 -1 0 10 0.0000 2 165 825 3900 2925 Object$_2$\001
 -6
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
@@ -38 +38 @@
 2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
          5625 1500 4875 1500 4875 1275 5625 1275 5625 1500
-4 1 0 50 -1 0 11 0.0000 2 165 855 2850 1425 Thread$_1$\001
-4 0 0 50 -1 0 11 0.0000 2 165 720 1275 1425 CPU$_1$\001
-4 1 0 50 -1 0 11 0.0000 2 135 435 2250 1725 Cache\001
-4 1 0 50 -1 0 11 0.0000 2 165 825 1800 2025 Object$_1$\001
-4 1 0 50 -1 0 11 0.0000 2 165 825 2700 2025 Object$_2$\001
-4 2 0 50 -1 2 11 0.0000 2 135 525 2550 2550 1. alloc\001
-4 1 0 50 -1 0 11 0.0000 2 165 855 5250 1425 Thread$_2$\001
-4 0 0 50 -1 0 11 0.0000 2 165 720 3675 1425 CPU$_2$\001
-4 1 0 50 -1 0 11 0.0000 2 165 825 4200 2025 Object$_1$\001
-4 1 0 50 -1 0 11 0.0000 2 165 825 5100 2025 Object$_2$\001
-4 1 0 50 -1 0 11 0.0000 2 135 435 4650 1725 Cache\001
-4 2 0 50 -1 0 11 0.0000 2 165 615 2475 2925 Memory\001
-4 0 0 50 -1 2 11 0.0000 2 180 720 4350 2550 4. modify\001
-4 2 0 50 -1 2 11 0.0000 2 135 525 4200 2475 3. alloc\001
-4 0 0 50 -1 2 11 0.0000 2 180 720 2700 2475 2. modify\001
+4 1 0 50 -1 0 10 0.0000 2 165 855 2850 1425 Thread$_1$\001
+4 0 0 50 -1 0 10 0.0000 2 165 720 1275 1425 CPU$_1$\001
+4 1 0 50 -1 0 10 0.0000 2 135 435 2250 1725 Cache\001
+4 1 0 50 -1 0 10 0.0000 2 165 825 1800 2025 Object$_1$\001
+4 1 0 50 -1 0 10 0.0000 2 165 825 2700 2025 Object$_2$\001
+4 2 0 50 -1 2 10 0.0000 2 135 525 2550 2550 1. alloc\001
+4 1 0 50 -1 0 10 0.0000 2 165 855 5250 1425 Thread$_2$\001
+4 0 0 50 -1 0 10 0.0000 2 165 720 3675 1425 CPU$_2$\001
+4 1 0 50 -1 0 10 0.0000 2 165 825 4200 2025 Object$_1$\001
+4 1 0 50 -1 0 10 0.0000 2 165 825 5100 2025 Object$_2$\001
+4 1 0 50 -1 0 10 0.0000 2 135 435 4650 1725 Cache\001
+4 2 0 50 -1 0 10 0.0000 2 165 615 2475 2925 Memory\001
+4 0 0 50 -1 2 10 0.0000 2 180 720 4350 2550 4. modify\001
+4 2 0 50 -1 2 10 0.0000 2 135 525 4200 2475 3. alloc\001
+4 0 0 50 -1 2 10 0.0000 2 180 720 2700 2475 2. modify\001