Changeset 2a301ff for doc/papers/llheap/figures/AllocDS1.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/AllocDS1.fig (modified) (1 diff)

doc/papers/llheap/figures/AllocDS1.fig

@@ -114 +114 @@
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
          3600 3150 5100 3150 5100 3525 3600 3525 3600 3150
-4 2 0 50 -1 0 11 0.0000 2 135 300 2625 1950 lock\001
-4 1 0 50 -1 0 11 0.0000 2 150 1155 3000 1725 N$\\times$S$_1$\001
-4 1 0 50 -1 0 11 0.0000 2 150 1155 3600 1725 N$\\times$S$_2$\001
-4 1 0 50 -1 0 12 0.0000 2 180 390 4425 1500 heap\001
-4 2 0 50 -1 0 12 0.0000 2 135 1140 2550 1425 kernel threads\001
-4 2 0 50 -1 0 11 0.0000 2 120 270 2625 2100 size\001
-4 2 0 50 -1 0 11 0.0000 2 120 270 2625 2250 free\001
-4 2 0 50 -1 0 12 0.0000 2 135 600 2625 2700 free list\001
-4 0 0 50 -1 0 12 0.0000 2 135 360 3675 3325 lock\001
-4 1 0 50 -1 0 12 0.0000 2 180 1455 4350 3075 global pool (sbrk)\001
-4 1 0 50 -1 0 11 0.0000 2 150 1110 4800 1725 N$\\times$S$_t$\001
+4 2 0 50 -1 0 10 0.0000 2 135 300 2625 1950 lock\001
+4 1 0 50 -1 0 10 0.0000 2 150 1155 3000 1725 N$\\times$S$_1$\001
+4 1 0 50 -1 0 10 0.0000 2 150 1155 3600 1725 N$\\times$S$_2$\001
+4 1 0 50 -1 0 10 0.0000 2 180 390 4425 1500 heap\001
+4 2 0 50 -1 0 10 0.0000 2 135 1140 2550 1425 kernel threads\001
+4 2 0 50 -1 0 10 0.0000 2 120 270 2625 2100 size\001
+4 2 0 50 -1 0 10 0.0000 2 120 270 2625 2250 free\001
+4 2 0 50 -1 0 10 0.0000 2 135 600 2625 2700 free list\001
+4 0 0 50 -1 0 10 0.0000 2 135 360 3675 3325 lock\001
+4 1 0 50 -1 0 10 0.0000 2 180 1455 4350 3075 global pool (sbrk)\001
+4 1 0 50 -1 0 10 0.0000 2 150 1110 4800 1725 N$\\times$S$_t$\001