[commit: ghc] wip/reapply-atomic-writes: compiler: Write .o files atomically. See #14533 (c8f857f)

git at git.haskell.org git at git.haskell.org
Tue Mar 5 21:44:31 UTC 2019


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/reapply-atomic-writes
Link       : http://ghc.haskell.org/trac/ghc/changeset/c8f857ff01bd573f575a75620f084f64a6c1fa1d/ghc

>---------------------------------------------------------------

commit c8f857ff01bd573f575a75620f084f64a6c1fa1d
Author: Niklas Hambüchen <mail at nh2.me>
Date:   Sun Feb 17 20:48:45 2019 +0100

    compiler: Write .o files atomically. See #14533
    
    This issue was reproduced with, and the fix confirmed with,
    the `hatrace` tool for syscall-based fault injection:
    
        https://github.com/nh2/hatrace
    
    The concrete test case for GHC is at
    
        https://github.com/nh2/hatrace/blob/e23d35a2d2c79e8bf49e9e2266b3ff7094267f29/test/HatraceSpec.hs#L185
    
    A previous, nondeterministic reproducer for the issue was provided by
    Alexey Kuleshevich in
    
        https://github.com/lehins/exec-kill-loop
    
    Signed-off-by: Niklas Hambüchen <niklas at fpcomplete.com>
    Reviewed-by: Alexey Kuleshevich <alexey at fpcomplete.com>


>---------------------------------------------------------------

c8f857ff01bd573f575a75620f084f64a6c1fa1d
 compiler/main/DriverPipeline.hs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 5fe2362..3f59ed3 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1375,7 +1375,12 @@ runPhase (RealPhase (As with_cpp)) input_fn dflags
                           ])
 
         liftIO $ debugTraceMsg dflags 4 (text "Running the assembler")
-        runAssembler input_fn output_fn
+
+        -- Atomic write by writing to temp file and then renaming
+        let temp_output_fn = output_fn <.> "tmp"
+        runAssembler input_fn temp_output_fn
+        liftIO $ renameFile temp_output_fn output_fn
+
         return (RealPhase next_phase, output_fn)
 
 



More information about the ghc-commits mailing list