[Lldb-commits] [lldb] r236917 - Use hard links to link sysroot files within ModuleCache.
Oleksiy Vyalov
ovyalov at google.com
Fri May 8 16:54:34 PDT 2015
Author: ovyalov
Date: Fri May 8 18:54:34 2015
New Revision: 236917
URL: http://llvm.org/viewvc/llvm-project?rev=236917&view=rev
Log:
Use hard links to link sysroot files within ModuleCache.
http://reviews.llvm.org/D9587
Modified:
lldb/trunk/include/lldb/Host/FileSystem.h
lldb/trunk/source/Host/posix/FileSystem.cpp
lldb/trunk/source/Host/windows/FileSystem.cpp
lldb/trunk/source/Utility/ModuleCache.cpp
lldb/trunk/source/Utility/ModuleCache.h
Modified: lldb/trunk/include/lldb/Host/FileSystem.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/FileSystem.h?rev=236917&r1=236916&r2=236917&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/FileSystem.h (original)
+++ lldb/trunk/include/lldb/Host/FileSystem.h Fri May 8 18:54:34 2015
@@ -32,6 +32,7 @@ class FileSystem
static lldb::user_id_t GetFileSize(const FileSpec &file_spec);
static bool GetFileExists(const FileSpec &file_spec);
+ static Error Hardlink(const char *src, const char *dst);
static Error Symlink(const char *src, const char *dst);
static Error Readlink(const char *path, char *buf, size_t buf_len);
static Error Unlink(const char *path);
Modified: lldb/trunk/source/Host/posix/FileSystem.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/posix/FileSystem.cpp?rev=236917&r1=236916&r2=236917&view=diff
==============================================================================
--- lldb/trunk/source/Host/posix/FileSystem.cpp (original)
+++ lldb/trunk/source/Host/posix/FileSystem.cpp Fri May 8 18:54:34 2015
@@ -149,6 +149,15 @@ FileSystem::GetFileExists(const FileSpec
}
Error
+FileSystem::Hardlink(const char *src, const char *dst)
+{
+ Error error;
+ if (::link(dst, src) == -1)
+ error.SetErrorToErrno();
+ return error;
+}
+
+Error
FileSystem::Symlink(const char *src, const char *dst)
{
Error error;
Modified: lldb/trunk/source/Host/windows/FileSystem.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/windows/FileSystem.cpp?rev=236917&r1=236916&r2=236917&view=diff
==============================================================================
--- lldb/trunk/source/Host/windows/FileSystem.cpp (original)
+++ lldb/trunk/source/Host/windows/FileSystem.cpp Fri May 8 18:54:34 2015
@@ -96,6 +96,15 @@ FileSystem::GetFileExists(const FileSpec
}
Error
+FileSystem::Hardlink(const char *linkname, const char *target)
+{
+ Error error;
+ if (!::CreateHardLink(linkname, target, nullptr))
+ error.SetError(::GetLastError(), lldb::eErrorTypeWin32);
+ return error;
+}
+
+Error
FileSystem::Symlink(const char *linkname, const char *target)
{
Error error;
Modified: lldb/trunk/source/Utility/ModuleCache.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/ModuleCache.cpp?rev=236917&r1=236916&r2=236917&view=diff
==============================================================================
--- lldb/trunk/source/Utility/ModuleCache.cpp (original)
+++ lldb/trunk/source/Utility/ModuleCache.cpp Fri May 8 18:54:34 2015
@@ -53,6 +53,28 @@ MakeDirectory (const FileSpec &dir_path)
eFilePermissionsDirectoryDefault);
}
+FileSpec
+GetModuleDirectory (const FileSpec &root_dir_spec, const UUID &uuid)
+{
+ const auto modules_dir_spec = JoinPath (root_dir_spec, kModulesSubdir);
+ return JoinPath (modules_dir_spec, uuid.GetAsString ().c_str ());
+}
+
+Error
+CreateHostSysRootModuleLink (const FileSpec &root_dir_spec, const char *hostname, const FileSpec &platform_module_spec, const FileSpec &local_module_spec)
+{
+ const auto sysroot_module_path_spec = JoinPath (
+ JoinPath (root_dir_spec, hostname), platform_module_spec.GetPath ().c_str ());
+ if (sysroot_module_path_spec.Exists())
+ return Error ();
+
+ const auto error = MakeDirectory (FileSpec (sysroot_module_path_spec.GetDirectory ().AsCString (), false));
+ if (error.Fail ())
+ return error;
+
+ return FileSystem::Hardlink (sysroot_module_path_spec.GetPath ().c_str (), local_module_spec.GetPath ().c_str ());
+}
+
} // namespace
Error
@@ -70,9 +92,10 @@ ModuleCache::Put (const FileSpec &root_d
return Error ("Failed to rename file %s to %s: %s",
tmp_file_path.c_str (), module_file_path.GetPath ().c_str (), err_code.message ().c_str ());
- // Create sysroot link to a module.
- const auto sysroot_module_path_spec = GetHostSysRootModulePath (root_dir_spec, hostname, module_spec.GetFileSpec ());
- return CreateHostSysRootModuleSymLink (sysroot_module_path_spec, module_file_path);
+ const auto error = CreateHostSysRootModuleLink(root_dir_spec, hostname, module_spec.GetFileSpec(), module_file_path);
+ if (error.Fail ())
+ return Error ("Failed to create link to %s: %s", module_file_path.GetPath ().c_str (), error.AsCString ());
+ return Error ();
}
Error
@@ -91,7 +114,7 @@ ModuleCache::Get (const FileSpec &root_d
m_loaded_modules.erase (find_it);
}
- const auto module_spec_dir = GetModuleDirectory (root_dir_spec, module_spec.GetUUID ());
+ const auto module_spec_dir = GetModuleDirectory (root_dir_spec, module_spec.GetUUID ());
const auto module_file_path = JoinPath (module_spec_dir, module_spec.GetFileSpec ().GetFilename ().AsCString ());
if (!module_file_path.Exists ())
@@ -99,10 +122,10 @@ ModuleCache::Get (const FileSpec &root_d
if (module_file_path.GetByteSize () != module_spec.GetObjectSize ())
return Error ("Module %s has invalid file size", module_file_path.GetPath ().c_str ());
- // We may have already cached module but downloaded from an another host - in this case let's create a symlink to it.
- const auto sysroot_module_path_spec = GetHostSysRootModulePath (root_dir_spec, hostname, module_spec.GetFileSpec ());
- if (!sysroot_module_path_spec.Exists ())
- CreateHostSysRootModuleSymLink (sysroot_module_path_spec, module_spec.GetFileSpec ());
+ // We may have already cached module but downloaded from an another host - in this case let's create a link to it.
+ const auto error = CreateHostSysRootModuleLink(root_dir_spec, hostname, module_spec.GetFileSpec(), module_file_path);
+ if (error.Fail ())
+ return Error ("Failed to create link to %s: %s", module_file_path.GetPath().c_str(), error.AsCString());
auto cached_module_spec (module_spec);
cached_module_spec.GetUUID ().Clear (); // Clear UUID since it may contain md5 content hash instead of real UUID.
@@ -162,28 +185,3 @@ ModuleCache::GetAndPut (const FileSpec &
tmp_file_remover.releaseFile ();
return Get (root_dir_spec, hostname, module_spec, cached_module_sp, did_create_ptr);
}
-
-FileSpec
-ModuleCache::GetModuleDirectory (const FileSpec &root_dir_spec, const UUID &uuid)
-{
- const auto modules_dir_spec = JoinPath (root_dir_spec, kModulesSubdir);
- return JoinPath (modules_dir_spec, uuid.GetAsString ().c_str ());
-}
-
-FileSpec
-ModuleCache::GetHostSysRootModulePath (const FileSpec &root_dir_spec, const char *hostname, const FileSpec &platform_module_spec)
-{
- const auto sysroot_dir = JoinPath (root_dir_spec, hostname);
- return JoinPath (sysroot_dir, platform_module_spec.GetPath ().c_str ());
-}
-
-Error
-ModuleCache::CreateHostSysRootModuleSymLink (const FileSpec &sysroot_module_path_spec, const FileSpec &module_file_path)
-{
- const auto error = MakeDirectory (FileSpec (sysroot_module_path_spec.GetDirectory ().AsCString (), false));
- if (error.Fail ())
- return error;
-
- return FileSystem::Symlink (sysroot_module_path_spec.GetPath ().c_str (),
- module_file_path.GetPath ().c_str ());
-}
Modified: lldb/trunk/source/Utility/ModuleCache.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/ModuleCache.h?rev=236917&r1=236916&r2=236917&view=diff
==============================================================================
--- lldb/trunk/source/Utility/ModuleCache.h (original)
+++ lldb/trunk/source/Utility/ModuleCache.h Fri May 8 18:54:34 2015
@@ -70,15 +70,6 @@ private:
lldb::ModuleSP &cached_module_sp,
bool *did_create_ptr);
- static FileSpec
- GetModuleDirectory (const FileSpec &root_dir_spec, const UUID &uuid);
-
- static FileSpec
- GetHostSysRootModulePath (const FileSpec &root_dir_spec, const char *hostname, const FileSpec &platform_module_spec);
-
- static Error
- CreateHostSysRootModuleSymLink (const FileSpec &sysroot_module_path_spec, const FileSpec &module_file_path);
-
std::unordered_map<std::string, lldb::ModuleWP> m_loaded_modules;
};
More information about the lldb-commits
mailing list