Skip to content

[cxxmodules] Preload more modules #1697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vgvassilev wants to merge 12 commits into from
Closed

[cxxmodules] Preload more modules #1697

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d0ca156
[cxxmodules] Add flag if module has C++ module alongside it
Teemperor Nov 30, 2017
179e0b0
[cxxmodules] Also preload TMVA/TreePlayer/Graf
Teemperor Nov 23, 2017
ad48d79
Add LD_LIBRARY_PATH to module path (broken commit?)
Teemperor Nov 30, 2017
6fe98eb
Another attempt at loading from library path
Teemperor Nov 30, 2017
0650032
Fixed library loading
Teemperor Dec 1, 2017
3f6ba92
Re-enable header parsing on demand
Teemperor Dec 1, 2017
e4df711
Also add cwd to prebuilt module path
Teemperor Dec 1, 2017
44bb027
Preload TreeViewer, Net, Hist, GenVector, Gpad and RooStats.
Teemperor Nov 30, 2017
9757e12
Preload EG, RGL, RooFit, TMVAGui and MathCore.
Teemperor Dec 1, 2017
a900091
Use sparse vector in LoadedSLocEntryTable
Teemperor Dec 5, 2017
3ed20f2
[cxxmodules] Add prebuilt module paths.
vgvassilev Mar 18, 2018
390cc01
[cxxmodules] Remove RooFit and RooStats as they are optional.
vgvassilev Apr 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed library loading
  • Loading branch information
@Teemperor @vgvassilev
Teemperor authored and vgvassilev committed Mar 11, 2018
commit 0650032de8e97ca21a30be64c7261f9fda36e2cf
23 changes: 19 additions & 4 deletions core/metacling/src/TCling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,11 +1121,12 @@ static void loadModulePath(HeaderSearch& hdrSearch, const char* inputPath) {
path.split(paths, ":");

for (StringRef path : paths) {
SmallString<128> ModuleMapFilePath = path;
SmallString<128> ModuleMapFilePath = path;
llvm::sys::path::append(ModuleMapFilePath, "module.modulemap");

if (auto file = hdrSearch.getFileMgr().getFile(ModuleMapFilePath)) {
hdrSearch.loadModuleMapFile(file, false, FileID());
}
if (auto file = hdrSearch.getFileMgr().getFile(ModuleMapFilePath)) {
hdrSearch.loadModuleMapFile(file, false, FileID());
}
}
}
}
Expand Down Expand Up @@ -5149,6 +5150,20 @@ Int_t TCling::LoadLibraryMap(const char* rootmapfile)
}
if (!skip) {
void* dirp = gSystem->OpenDirectory(d);

// Load the modulemap from the dir and add it to the prebuilt module
// path.
// FIXME: This is ROOT quality code, refactor me.
fInterpreter->getCI()->getHeaderSearchOpts().AddPrebuiltModulePath(d.Data());
auto& hdrSearch = fInterpreter->getCI()->getPreprocessor().getHeaderSearchInfo();
SmallString<128> ModuleMapFilePath = StringRef(d.Data());
llvm::sys::path::append(ModuleMapFilePath, "module.modulemap");

if (auto file = hdrSearch.getFileMgr().getFile(ModuleMapFilePath)) {
hdrSearch.loadModuleMapFile(file, false, FileID());
}


if (dirp) {
if (gDebug > 3) {
Info("LoadLibraryMap", "%s", d.Data());
Expand Down