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/Header.fig

    r92355883 r2a301ff  
    3131        1 1 1.00 45.00 90.00
    3232         4200 3000 3450 3000 3450 2025
    33 4 0 0 50 -1 0 12 0.0000 2 180 1185 1875 1725 bucket pointer\001
    34 4 0 0 50 -1 0 12 0.0000 2 180 1005 1875 2025 mapped size\001
    35 4 0 0 50 -1 0 12 0.0000 2 135 1215 1875 2325 next free block\001
    36 4 2 0 50 -1 0 12 0.0000 2 135 480 1725 2025 union\001
    37 4 1 0 50 -1 0 12 0.0000 2 180 945 5400 2025 request size\001
    38 4 1 0 50 -1 0 12 0.0000 2 180 765 5400 1425 4/8-bytes\001
    39 4 1 0 50 -1 0 12 0.0000 2 180 765 3000 1425 4/8-bytes\001
    40 4 1 0 50 -1 0 12 0.0000 2 135 270 3475 2025 0/1\001
    41 4 1 0 50 -1 0 12 0.0000 2 135 270 3775 1725 0/1\001
    42 4 1 0 50 -1 0 12 0.0000 2 135 270 4075 1725 0/1\001
    43 4 0 0 50 -1 0 12 0.0000 2 180 1515 4275 3075 mapped allocation\001
    44 4 0 0 50 -1 0 12 0.0000 2 135 825 4275 2850 zero filled\001
    45 4 0 0 50 -1 0 12 0.0000 2 180 1920 4275 2625 alignment (fake header)\001
     334 0 0 50 -1 0 10 0.0000 2 180 1185 1875 1725 bucket pointer\001
     344 0 0 50 -1 0 10 0.0000 2 180 1005 1875 2025 mapped size\001
     354 0 0 50 -1 0 10 0.0000 2 135 1215 1875 2325 next free block\001
     364 2 0 50 -1 0 10 0.0000 2 135 480 1725 2025 union\001
     374 1 0 50 -1 0 10 0.0000 2 180 945 5400 2025 request size\001
     384 1 0 50 -1 0 10 0.0000 2 180 765 5400 1425 4/8-bytes\001
     394 1 0 50 -1 0 10 0.0000 2 180 765 3000 1425 4/8-bytes\001
     404 1 0 50 -1 0 10 0.0000 2 135 270 3475 2025 0/1\001
     414 1 0 50 -1 0 10 0.0000 2 135 270 3775 1725 0/1\001
     424 1 0 50 -1 0 10 0.0000 2 135 270 4075 1725 0/1\001
     434 0 0 50 -1 0 10 0.0000 2 180 1515 4275 3075 mapped allocation\001
     444 0 0 50 -1 0 10 0.0000 2 135 825 4275 2850 zero filled\001
     454 0 0 50 -1 0 10 0.0000 2 180 1920 4275 2625 alignment (fake header)\001
Note: See TracChangeset for help on using the changeset viewer.