Merge pull request swiftlang#35414 from nkcsgexi/volatile-open-input

Frontend: add an option -bad-file-descriptor-retry-count

Author: nkcsgexi

include/swift/Basic/FileSystem.h

@@ -80,7 +80,8 @@ namespace swift {
     llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>>
     getFileOrSTDIN(llvm::vfs::FileSystem &FS,
                    const llvm::Twine &Name, int64_t FileSize = -1,
-                   bool RequiresNullTerminator = true, bool IsVolatile = false);
+                   bool RequiresNullTerminator = true, bool IsVolatile = false,
+                   unsigned BADFRetry = 0);
   } // end namespace vfs
 
 } // end namespace swift

include/swift/Frontend/FrontendOptions.h

@@ -86,6 +86,9 @@ class FrontendOptions {
   /// The module for which we should verify all of the generic signatures.
   std::string VerifyGenericSignaturesInModule;
 
+  /// Number of retry opening an input file if the previous opening returns
+  /// bad file descriptor error.
+  unsigned BadFileDescriptorRetryCount = 0;
   enum class ActionType {
     NoneAction,        ///< No specific action
     Parse,             ///< Parse only

include/swift/Option/FrontendOptions.td

@@ -773,4 +773,8 @@ def experimental_allow_module_with_compiler_errors:
   Flags<[HelpHidden]>,
   HelpText<"Attempt to output .swiftmodule, regardless of compilation errors">;
 
+def bad_file_descriptor_retry_count:
+  Separate<["-"], "bad-file-descriptor-retry-count">,
+  HelpText<"Number of retrying opening a file if previous open returns a bad "
+           "file descriptor error.">;
 } // end let Flags = [FrontendOption, NoDriverOption, HelpHidden]

lib/Basic/FileSystem.cpp

@@ -273,12 +273,21 @@ swift::vfs::getFileOrSTDIN(llvm::vfs::FileSystem &FS,
                            const llvm::Twine &Filename,
                            int64_t FileSize,
                            bool RequiresNullTerminator,
-                           bool IsVolatile) {
+                           bool IsVolatile,
+                           unsigned BADFRetry) {
   llvm::SmallString<256> NameBuf;
   llvm::StringRef NameRef = Filename.toStringRef(NameBuf);
 
   if (NameRef == "-")
     return llvm::MemoryBuffer::getSTDIN();
-  return FS.getBufferForFile(Filename, FileSize,
-                             RequiresNullTerminator, IsVolatile);
+  llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> inputFileOrErr = nullptr;
+  for (unsigned I = 0; I != BADFRetry + 1; ++ I) {
+    inputFileOrErr = FS.getBufferForFile(Filename, FileSize,
+                                         RequiresNullTerminator, IsVolatile);
+    if (inputFileOrErr)
+      return inputFileOrErr;
+    if (inputFileOrErr.getError().value() != EBADF)
+      return inputFileOrErr;
+  }
+  return inputFileOrErr;
 }

lib/Frontend/ArgsToFrontendInputsConverter.cpp

@@ -34,7 +34,9 @@ ArgsToFrontendInputsConverter::ArgsToFrontendInputsConverter(
     DiagnosticEngine &diags, const ArgList &args)
     : Diags(diags), Args(args),
       FilelistPathArg(args.getLastArg(options::OPT_filelist)),
-      PrimaryFilelistPathArg(args.getLastArg(options::OPT_primary_filelist)) {}
+      PrimaryFilelistPathArg(args.getLastArg(options::OPT_primary_filelist)),
+      BadFileDescriptorRetryCountArg(
+        args.getLastArg(options::OPT_bad_file_descriptor_retry_count)) {}
 
 Optional<FrontendInputsAndOutputs> ArgsToFrontendInputsConverter::convert(
     SmallVectorImpl<std::unique_ptr<llvm::MemoryBuffer>> *buffers) {
@@ -118,8 +120,26 @@ bool ArgsToFrontendInputsConverter::forAllFilesInFilelist(
   if (!pathArg)
     return false;
   StringRef path = pathArg->getValue();
-  llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> filelistBufferOrError =
-      llvm::MemoryBuffer::getFile(path);
+
+  // Honor -bad-file-descriptor-retry-count from the argument list
+  unsigned RetryCount = 0;
+  if (BadFileDescriptorRetryCountArg &&
+      StringRef(BadFileDescriptorRetryCountArg->getValue())
+        .getAsInteger(10,RetryCount)) {
+    Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
+                   BadFileDescriptorRetryCountArg->getAsString(Args),
+                   BadFileDescriptorRetryCountArg->getValue());
+    return true;
+  }
+
+  llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> filelistBufferOrError = nullptr;
+  for (unsigned I = 0; I < RetryCount + 1; ++I) {
+    filelistBufferOrError = llvm::MemoryBuffer::getFile(path);
+    if (filelistBufferOrError)
+      break;
+    if (filelistBufferOrError.getError().value() != EBADF)
+      break;
+  }
   if (!filelistBufferOrError) {
     Diags.diagnose(SourceLoc(), diag::cannot_open_file, path,
                    filelistBufferOrError.getError().message());

lib/Frontend/ArgsToFrontendInputsConverter.h

@@ -47,6 +47,7 @@ class ArgsToFrontendInputsConverter {
 
   llvm::opt::Arg const *const FilelistPathArg;
   llvm::opt::Arg const *const PrimaryFilelistPathArg;
+  llvm::opt::Arg const *const BadFileDescriptorRetryCountArg;
 
   /// A place to keep alive any buffers that are loaded as part of setting up
   /// the frontend inputs.

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -89,6 +89,16 @@ bool ArgsToFrontendOptionsConverter::convert(
         IntermoduleDepTrackingMode::IncludeSystem;
   }
 
+  if (const Arg *A = Args.getLastArg(OPT_bad_file_descriptor_retry_count)) {
+    unsigned limit;
+    if (StringRef(A->getValue()).getAsInteger(10, limit)) {
+      Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
+                     A->getAsString(Args), A->getValue());
+      return true;
+    }
+    Opts.BadFileDescriptorRetryCount = limit;
+  }
+
   Opts.DisableImplicitModules |= Args.hasArg(OPT_disable_implicit_swift_modules);
 
   Opts.ImportPrescan |= Args.hasArg(OPT_import_prescan);

lib/Frontend/ArgsToFrontendOutputsConverter.cpp

@@ -567,8 +567,24 @@ SupplementaryOutputPathsComputer::readSupplementaryOutputFileMap() const {
   }
   const StringRef supplementaryFileMapPath =
       Args.getLastArgValue(options::OPT_supplementary_output_file_map);
-  llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> buffer =
-      llvm::MemoryBuffer::getFile(supplementaryFileMapPath);
+
+  unsigned BadFileDescriptorRetryCount = 0;
+  if (const Arg *A = Args.getLastArg(options::OPT_bad_file_descriptor_retry_count)) {
+    if (StringRef(A->getValue()).getAsInteger(10, BadFileDescriptorRetryCount)) {
+      Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
+                     A->getAsString(Args), A->getValue());
+      return None;
+    }
+  }
+
+  llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> buffer = nullptr;
+  for (unsigned I = 0; I < BadFileDescriptorRetryCount + 1; ++I) {
+    buffer = llvm::MemoryBuffer::getFile(supplementaryFileMapPath);
+    if (buffer)
+      break;
+    if (buffer.getError().value() != EBADF)
+      break;
+  }
   if (!buffer) {
     Diags.diagnose(SourceLoc(), diag::cannot_open_file,
                    supplementaryFileMapPath, buffer.getError().message());

lib/Frontend/Frontend.cpp

@@ -657,8 +657,13 @@ Optional<ModuleBuffers> CompilerInstance::getInputBuffersIfPresent(
   // FIXME: Working with filenames is fragile, maybe use the real path
   // or have some kind of FileManager.
   using FileOrError = llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>>;
-  FileOrError inputFileOrErr = swift::vfs::getFileOrSTDIN(getFileSystem(),
-                                                          input.getFileName());
+  FileOrError inputFileOrErr =
+    swift::vfs::getFileOrSTDIN(getFileSystem(), input.getFileName(),
+                              /*FileSize*/-1,
+                              /*RequiresNullTerminator*/true,
+                              /*IsVolatile*/false,
+      /*Bad File Descriptor Retry*/getInvocation().getFrontendOptions()
+                               .BadFileDescriptorRetryCount);
   if (!inputFileOrErr) {
     Diagnostics.diagnose(SourceLoc(), diag::error_open_input_file,
                          input.getFileName(),