Ignore:
Timestamp:
Aug 31, 2023, 11:31:15 PM (2 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:
1 edited

Legend:

Unmodified
Added
Removed

  • doc/papers/llheap/figures/AllocatorComponents.fig

    r92355883 r2a301ff  
    58582 2 0 1 0 7 60 -1 13 0.000 0 0 -1 0 0 5
    5959         3300 2700 6300 2700 6300 3000 3300 3000 3300 2700
    60 4 0 0 50 -1 2 11 0.0000 2 165 1005 3300 1725 Storage Data\001
    61 4 2 0 50 -1 0 11 0.0000 2 165 810 3000 1875 free objects\001
    62 4 2 0 50 -1 0 11 0.0000 2 135 1140 3000 2850 reserve memory\001
    63 4 1 0 50 -1 0 11 0.0000 2 120 795 2325 1500 Static Zone\001
    64 4 1 0 50 -1 0 11 0.0000 2 165 1845 4800 1500 Dynamic-Allocation Zone\001
    65 4 2 0 50 -1 2 11 0.0000 2 165 1005 2325 2325 Management\001
    66 4 2 0 50 -1 2 11 0.0000 2 135 375 2325 2525 Data\001
     604 0 0 50 -1 2 10 0.0000 2 165 1005 3300 1725 Storage Data\001
     614 2 0 50 -1 0 10 0.0000 2 165 810 3000 1875 free objects\001
     624 2 0 50 -1 0 10 0.0000 2 135 1140 3000 2850 reserve memory\001
     634 1 0 50 -1 0 10 0.0000 2 120 795 2325 1500 Static Zone\001
     644 1 0 50 -1 0 10 0.0000 2 165 1845 4800 1500 Dynamic-Allocation Zone\001
     654 2 0 50 -1 2 10 0.0000 2 165 1005 2325 2325 Management\001
     664 2 0 50 -1 2 10 0.0000 2 135 375 2325 2525 Data\001
Note: See TracChangeset for help on using the changeset viewer.