This is an archive of the discontinued LLVM Phabricator instance.

Fix module cache sym links' creation for symbol files
ClosedPublic

Authored by ovyalov on Nov 2 2015, 4:16 PM.

Download Raw Diff

Details

Reviewers

Summary

Pass symbol file platform's file spec to ModuleCache::Put - i.e., to make sym link path like this: .lldb/module_cache/remote-android/04a2366b2238fb06/data/dalvik-cache/arm/system@framework@boot.oat.sym

Diff Detail

Event Timeline

ovyalov updated this revision to Diff 39000.Nov 2 2015, 4:16 PM

ovyalov retitled this revision from to Fix module cache sym links' creation for symbol files.

ovyalov updated this object.

ovyalov added a reviewer: tberghammer.

ovyalov added a subscriber: lldb-commits.

Herald added subscribers: danalbert, tberghammer, aemerson. · View Herald TranscriptNov 2 2015, 4:16 PM

LGTM

This revision is now accepted and ready to land.Nov 2 2015, 4:27 PM

Submitted as http://reviews.llvm.org/rL251871

Revision Contents

Path

Size

source/

Utility/

ModuleCache.cpp

4 lines

Diff 39000

source/Utility/ModuleCache.cpp

Show First 20 Lines • Show All 298 Lines • ▼ Show 20 Lines	ModuleCache::GetAndPut (const FileSpec &root_dir_spec,
const auto tmp_download_sym_file_spec = JoinPath (module_spec_dir, kTempSymFileName);		const auto tmp_download_sym_file_spec = JoinPath (module_spec_dir, kTempSymFileName);
error = symfile_downloader (cached_module_sp, tmp_download_sym_file_spec);		error = symfile_downloader (cached_module_sp, tmp_download_sym_file_spec);
llvm::FileRemover tmp_symfile_remover (tmp_download_sym_file_spec.GetPath ().c_str ());		llvm::FileRemover tmp_symfile_remover (tmp_download_sym_file_spec.GetPath ().c_str ());
if (error.Fail ())		if (error.Fail ())
// Failed to download a symfile but fetching the module was successful. The module might		// Failed to download a symfile but fetching the module was successful. The module might
// contain the neccessary symbols and the debugging is also possible without a symfile.		// contain the neccessary symbols and the debugging is also possible without a symfile.
return Error ();		return Error ();

FileSpec symfile_spec = GetSymbolFileSpec (cached_module_sp->GetFileSpec ());		error = Put (root_dir_spec, hostname, module_spec, tmp_download_sym_file_spec, GetSymbolFileSpec(module_spec.GetFileSpec ()));
error = Put (root_dir_spec, hostname, module_spec, tmp_download_sym_file_spec, symfile_spec);
if (error.Fail ())		if (error.Fail ())
return Error ("Failed to put symbol file into cache: %s", error.AsCString ());		return Error ("Failed to put symbol file into cache: %s", error.AsCString ());

tmp_symfile_remover.releaseFile();		tmp_symfile_remover.releaseFile();

		FileSpec symfile_spec = GetSymbolFileSpec (cached_module_sp->GetFileSpec ());
cached_module_sp->SetSymbolFileFileSpec (symfile_spec);		cached_module_sp->SetSymbolFileFileSpec (symfile_spec);
return Error ();		return Error ();
}		}