ilyagr/pijul - Change G55Y75FUL4LWA346HQCZ5EVA5G54EDTZAW7MPVTO44BP6D5UMURAC

Avoiding deadlocks when using output.rs with a non-filesystem output

Created by pmeunier on April 14, 2022

G55Y75FUL4LWA346HQCZ5EVA5G54EDTZAW7MPVTO44BP6D5UMURAC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/output/output.rs at line 640 [3.671807]

B:BD[2.26099] → [2.26099:26232]

    let txn = txn.read();
    let channel = channel.read();
    let mut l = retrieve(&*txn, txn.graph(&*channel), output_item.pos)?;

[2.26099]

[2.26232]

    let mut l = {
        let txn = txn.read();
        let channel = channel.read();
        retrieve(&*txn, txn.graph(&*channel), output_item.pos)?
    };

Replacement in libpijul/src/output/output.rs at line 649 [3.671807]

B:BD[2.26402] → [2.26402:26524]

    alive::output_graph(changes, &*txn, &*channel, &mut f, &mut l, forward)
        .map_err(PristineOutputError::from)?;

[2.26402]

[2.26524]

    {
        let txn = txn.read();
        let channel = channel.read();
        alive::output_graph(changes, &*txn, &*channel, &mut f, &mut l, forward)
            .map_err(PristineOutputError::from)?;
    }