From b6f72b240f3263675b7066b7278abe8fe0abc413 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 13 Feb 2014 16:58:19 +0000 Subject: [PATCH] Use mkdir instead of stat+mkdir. This is an optimistic version of create_diretories: it tries to create the directory first and looks at the parent only if that fails. Running strace on "mkdir -p" shows that it is pessimistic, calling mkdir on every element of the path. We could implement that if needed. In any case, with both strategies there is no reason to call stat, just check the return of mkdir. llvm-svn: 201347 --- llvm/lib/Support/Path.cpp | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/llvm/lib/Support/Path.cpp b/llvm/lib/Support/Path.cpp index 1e59c7adb5b8..b21846c5483b 100644 --- a/llvm/lib/Support/Path.cpp +++ b/llvm/lib/Support/Path.cpp @@ -751,20 +751,27 @@ error_code make_absolute(SmallVectorImpl &path) { "occurred above!"); } -error_code create_directories(const Twine &path, bool &existed) { - SmallString<128> path_storage; - StringRef p = path.toStringRef(path_storage); +error_code create_directories(const Twine &Path, bool &Existed) { + SmallString<128> PathStorage; + StringRef P = Path.toStringRef(PathStorage); - StringRef parent = path::parent_path(p); - if (!parent.empty()) { - bool parent_exists; - if (error_code ec = fs::exists(parent, parent_exists)) return ec; + // Be optimistic and try to create the directory + error_code EC = create_directory(P, Existed); + // If we succeeded, or had any error other than the parent not existing, just + // return it. + if (EC != errc::no_such_file_or_directory) + return EC; - if (!parent_exists) - if (error_code ec = create_directories(parent, existed)) return ec; - } + // We failed because of a no_such_file_or_directory, try to create the + // parent. + StringRef Parent = path::parent_path(P); + if (Parent.empty()) + return EC; - return create_directory(p, existed); + if ((EC = create_directories(Parent))) + return EC; + + return create_directory(P, Existed); } bool exists(file_status status) {