Skip to content
Snippets Groups Projects
Commit 9517da42 authored by Xavier Valls Pla's avatar Xavier Valls Pla Committed by Danilo Piparo
Browse files

Apply clang-format to hadd

parent 217441dc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 57 additions and 51 deletions
main/src/hadd.cxx
+ 57
− 51
View file @ 9517da42
......@@ -105,7 +105,7 @@ int main( int argc, char **argv )
std::cout << "If the option -O is used, when merging TTree, the basket size is re-optimized" <<std::endl;
std::cout << "If the option -v is used, explicitly set the verbosity level;\n"\
" 0 request no output, 99 is the default" <<std::endl;
std::cout << "If the option -m is used, the execution will be parallelized in multiple processes\n" <<std::endl;
std::cout << "If the option -m is used, the execution will be parallelized in multiple processes\n" << std::endl;
std::cout << "If the option -n is used, hadd will open at most 'maxopenedfiles' at once, use 0\n"
" to request to use the system maximum." << std::endl;
std::cout << "If the option -cachesize is used, hadd will resize (or disable if 0) the\n"
......@@ -168,28 +168,30 @@ int main( int argc, char **argv )
} else if ( strcmp(argv[a],"-O") == 0 ) {
reoptimize = kTRUE;
++ffirst;
} else if ( strcmp(argv[a],"-j") == 0 ) {
} else if (strcmp(argv[a], "-j") == 0) {
// If the number of processes is not specified, use the default.
if (a+1 != argc && argv[a+1][0] != '-') {
if (a + 1 != argc && argv[a + 1][0] != '-') {
// number of processes specified
Long_t request = 1;
for (char *c = argv[a+1]; *c != '\0'; ++c) {
for (char *c = argv[a + 1]; *c != '\0'; ++c) {
if (!isdigit(*c)) {
// Wrong number of Processes. Use the default:
std::cerr << "Error: could not parse the number of processes to run in parallel passed after -j: " << argv[a+1] << ". We will use the system maximum.\n";
std::cerr << "Error: could not parse the number of processes to run in parallel passed after -j: "
<< argv[a + 1] << ". We will use the system maximum.\n";
request = 0;
break;
}
}
if (request == 1) {
request = strtol(argv[a+1], 0, 10);
request = strtol(argv[a + 1], 0, 10);
if (request < kMaxLong && request >= 0) {
nProcesses = (Int_t)request;
++a;
++ffirst;
std::cout << "Parallelizing with "<<nProcesses<<" processes.\n";
std::cout << "Parallelizing with " << nProcesses << " processes.\n";
} else {
std::cerr << "Error: could not parse the number of processes to use passed after -j: " << argv[a+1] << ". We will use the default value (number of logical cores).\n";
std::cerr << "Error: could not parse the number of processes to use passed after -j: " << argv[a + 1]
<< ". We will use the default value (number of logical cores).\n";
}
}
}
......@@ -341,7 +343,7 @@ int main( int argc, char **argv )
std::cout << "hadd Target file: " << targetname << std::endl;
}
TFileMerger fileMerger(kFALSE,kFALSE);
TFileMerger fileMerger(kFALSE, kFALSE);
fileMerger.SetMsgPrefix("hadd");
fileMerger.SetPrintLevel(verbosity - 1);
if (maxopenedfiles > 0) {
......@@ -381,70 +383,72 @@ int main( int argc, char **argv )
std::cout << "hadd compression setting for all ouput: " << newcomp << '\n';
}
if (append) {
if (!fileMerger.OutputFile(targetname,"UPDATE",newcomp)) {
if (!fileMerger.OutputFile(targetname, "UPDATE", newcomp)) {
std::cerr << "hadd error opening target file for update :" << argv[ffirst-1] << "." << std::endl;
exit(2);
}
} else if (!fileMerger.OutputFile(targetname,force,newcomp) ) {
} else if (!fileMerger.OutputFile(targetname, force, newcomp)) {
std::cerr << "hadd error opening target file (does " << argv[ffirst-1] << " exist?)." << std::endl;
if (!force) std::cerr << "Pass \"-f\" argument to force re-creation of output file." << std::endl;
exit(1);
}
auto filesToProcess = argc - ffirst;
auto step = (filesToProcess+nProcesses-1)/nProcesses;
if(step < 3){
//At least 3 files per process
auto step = (filesToProcess + nProcesses - 1) / nProcesses;
if (step < 3) {
// At least 3 files per process
step = 3;
nProcesses = (filesToProcess+step-1)/step;
std::cout<<"Each process should handle at least 3 files for efficiency.";
std::cout<<" Setting the number of processes to: "<<nProcesses<<std::endl;
nProcesses = (filesToProcess + step - 1) / step;
std::cout << "Each process should handle at least 3 files for efficiency.";
std::cout << " Setting the number of processes to: " << nProcesses << std::endl;
}
std::vector<std::string> partialFiles;
if(multiproc){
for(auto i = 0; (i*step)<filesToProcess; i++) {
if (multiproc) {
for (auto i = 0; (i * step) < filesToProcess; i++) {
std::stringstream buffer;
buffer <<"partial"<<i<<".root";
buffer << "partial" << i << ".root";
partialFiles.emplace_back(buffer.str());
}
}
auto mergeFiles = [&] (TFileMerger &merger){
auto mergeFiles = [&](TFileMerger &merger) {
if (reoptimize) {
merger.SetFastMethod(kFALSE);
} else {
if (!keepCompressionAsIs && merger.HasCompressionChange()) {
// Don't warn if the user any request re-optimization.
std::cout <<"hadd Sources and Target have different compression levels"<<std::endl;
std::cout <<"hadd merging will be slower"<<std::endl;
std::cout << "hadd Sources and Target have different compression levels" << std::endl;
std::cout << "hadd merging will be slower" << std::endl;
}
}
merger.SetNotrees(noTrees);
merger.SetMergeOptions(cacheSize);
Bool_t status;
if (append) status = merger.PartialMerge(TFileMerger::kIncremental | TFileMerger::kAll);
else status = merger.Merge();
if (append)
status = merger.PartialMerge(TFileMerger::kIncremental | TFileMerger::kAll);
else
status = merger.Merge();
return status;
};
auto sequentialMerge = [&](TFileMerger &merger, int start, int nFiles){
auto sequentialMerge = [&](TFileMerger &merger, int start, int nFiles) {
for ( auto i = start; i < (start + nFiles) && i<argc; i++ ) {
if (argv[i] && argv[i][0]=='@') {
std::ifstream indirect_file(argv[i]+1);
if( ! indirect_file.is_open() ) {
std::cerr<< "hadd could not open indirect file " << (argv[i]+1) << std::endl;
for (auto i = start; i < (start + nFiles) && i < argc; i++) {
if (argv[i] && argv[i][0] == '@') {
std::ifstream indirect_file(argv[i] + 1);
if (!indirect_file.is_open()) {
std::cerr << "hadd could not open indirect file " << (argv[i] + 1) << std::endl;
return kFALSE;
}
while( indirect_file ){
while (indirect_file) {
std::string line;
if( std::getline(indirect_file, line) && line.length() && !merger.AddFile(line.c_str()) ) {
if (std::getline(indirect_file, line) && line.length() && !merger.AddFile(line.c_str())) {
return kFALSE;
}
}
} else if( ! merger.AddFile(argv[i]) ) {
if ( skip_errors ) {
} else if (!merger.AddFile(argv[i])) {
if (skip_errors) {
std::cerr << "hadd skipping file with error: " << argv[i] << std::endl;
} else {
std::cerr << "hadd exiting due to error in " << argv[i] << std::endl;
......@@ -455,22 +459,22 @@ int main( int argc, char **argv )
return mergeFiles(merger);
};
auto parallelMerge = [&](int start){
TFileMerger mergerP(kFALSE,kFALSE);
auto parallelMerge = [&](int start) {
TFileMerger mergerP(kFALSE, kFALSE);
mergerP.SetMsgPrefix("hadd");
mergerP.SetPrintLevel(verbosity - 1);
if (maxopenedfiles > 0) {
mergerP.SetMaxOpenedFiles(maxopenedfiles/nProcesses);
mergerP.SetMaxOpenedFiles(maxopenedfiles / nProcesses);
}
if (!mergerP.OutputFile(partialFiles[(start-ffirst)/step].c_str(), newcomp)) {
std::cerr << "hadd error opening target partial file"<<std::endl;
if (!mergerP.OutputFile(partialFiles[(start - ffirst) / step].c_str(), newcomp)) {
std::cerr << "hadd error opening target partial file" << std::endl;
exit(1);
}
return sequentialMerge(mergerP, start, step);
};
auto reductionFunc = [&](){
for(auto pf:partialFiles){
auto reductionFunc = [&]() {
for (auto pf : partialFiles) {
fileMerger.AddFile(pf.c_str());
}
return mergeFiles(fileMerger);
......@@ -478,30 +482,32 @@ int main( int argc, char **argv )
Bool_t status;
if(multiproc) {
if (multiproc) {
ROOT::TProcessExecutor p(nProcesses);
auto res = p.Map(parallelMerge, ROOT::TSeqI(ffirst, argc, step));
status = std::accumulate(res.begin(), res.end(), 0U) == partialFiles.size();
if(status){
if (status) {
status = reductionFunc();
} else{
std::cout<<"hadd failed at the parallel stage"<<std::endl;
} else {
std::cout << "hadd failed at the parallel stage" << std::endl;
}
for(auto pf:partialFiles){
for (auto pf : partialFiles) {
gSystem->Unlink(pf.c_str());
}
} else{
} else {
status = sequentialMerge(fileMerger, ffirst, filesToProcess);
}
if (status) {
if (verbosity == 1) {
std::cout << "hadd merged " << fileMerger.GetMergeList()->GetEntries() << " input files in " << targetname << ".\n";
std::cout << "hadd merged " << fileMerger.GetMergeList()->GetEntries() << " input files in " << targetname
<< ".\n";
}
return 0;
} else {
if (verbosity == 1) {
std::cout << "hadd failure during the merge of " << fileMerger.GetMergeList()->GetEntries() << " input files in " << targetname << ".\n";
std::cout << "hadd failure during the merge of " << fileMerger.GetMergeList()->GetEntries()
<< " input files in " << targetname << ".\n";
}
return 1;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment