portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Hadrons: code cleaning

Browse Source
This commit is contained in:
Antonin Portelli 2017-12-13 12:13:40 +00:00
parent 259d504ef0
commit a9c8d7dad0
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
extras/Hadrons/VirtualMachine.cc
View File

@ -79,21 +79,26 @@ void VirtualMachine::pushModule(VirtualMachine::ModPt &pt)
unsigned int address; unsigned int address;
ModuleInfo m; ModuleInfo m;
// module registration -------------------------------------------------
m.data = std::move(pt); m.data = std::move(pt);
m.type = typeIdPt(*m.data.get()); m.type = typeIdPt(*m.data.get());
m.name = name; m.name = name;
// input dependencies
for (auto &in: m.data->getInput()) for (auto &in: m.data->getInput())
{ {
if (!env().hasObject(in)) if (!env().hasObject(in))
{ {
// if object does not exist, add it with no creator module
env().addObject(in , -1); env().addObject(in , -1);
} }
m.input.push_back(env().getObjectAddress(in)); m.input.push_back(env().getObjectAddress(in));
} }
// reference dependencies
for (auto &ref: m.data->getReference()) for (auto &ref: m.data->getReference())
{ {
if (!env().hasObject(ref)) if (!env().hasObject(ref))
{ {
// if object does not exist, add it with no creator module
env().addObject(ref , -1); env().addObject(ref , -1);
} }
m.input.push_back(env().getObjectAddress(ref)); m.input.push_back(env().getObjectAddress(ref));
@ -101,20 +106,24 @@ void VirtualMachine::pushModule(VirtualMachine::ModPt &pt)
module_.push_back(std::move(m)); module_.push_back(std::move(m));
address = static_cast<unsigned int>(module_.size() - 1); address = static_cast<unsigned int>(module_.size() - 1);
moduleAddress_[name] = address; moduleAddress_[name] = address;
// connecting outputs to potential inputs ------------------------------
for (auto &out: getModule(address)->getOutput()) for (auto &out: getModule(address)->getOutput())
{ {
if (!env().hasObject(out)) if (!env().hasObject(out))
{ {
// output does not exists, add it
env().addObject(out, address); env().addObject(out, address);
} }
else else
{ {
if (env().getObjectModule(env().getObjectAddress(out)) < 0) if (env().getObjectModule(env().getObjectAddress(out)) < 0)
{ {
// output exists but without creator, correct it
env().setObjectModule(env().getObjectAddress(out), address); env().setObjectModule(env().getObjectAddress(out), address);
} }
else else
{ {
// output already fully registered, error
HADRON_ERROR(Definition, "object '" + out HADRON_ERROR(Definition, "object '" + out
+ "' is already produced by module '" + "' is already produced by module '"
+ module_[env().getObjectModule(out)].name + module_[env().getObjectModule(out)].name
@ -122,10 +131,14 @@ void VirtualMachine::pushModule(VirtualMachine::ModPt &pt)
} }
if (getModule(address)->getReference().size() > 0) if (getModule(address)->getReference().size() > 0)
{ {
// module has references, dependency should be propagated
// to children modules; find module with `out` as an input
// and add references to their input
auto pred = [this, out](const ModuleInfo &n) auto pred = [this, out](const ModuleInfo &n)
{ {
auto &in = n.input; auto &in = n.input;
auto it = std::find(in.begin(), in.end(), env().getObjectAddress(out)); auto it = std::find(in.begin(), in.end(),
env().getObjectAddress(out));
return (it != in.end()); return (it != in.end());
}; };
@ -154,7 +167,7 @@ unsigned int VirtualMachine::getNModule(void) const
} }
void VirtualMachine::createModule(const std::string name, const std::string type, void VirtualMachine::createModule(const std::string name, const std::string type,
XmlReader &reader) XmlReader &reader)
{ {
auto &factory = ModuleFactory::getInstance(); auto &factory = ModuleFactory::getInstance();
auto pt = factory.create(type, name); auto pt = factory.create(type, name);
@ -267,17 +280,6 @@ Graph<unsigned int> VirtualMachine::makeModuleGraph(void) const
return moduleGraph; return moduleGraph;
} }
// void VirtualMachine::checkGraph(void) const
// {
// for (auto &o: object_)
// {
// if (o.module < 0)
// {
// HADRON_ERROR(Runtime, "object '" + o.name + "' does not have a creator");
// }
// }
// }
// general execution /////////////////////////////////////////////////////////// // general execution ///////////////////////////////////////////////////////////
#define BIG_SEP "===============" #define BIG_SEP "==============="
#define SEP "---------------" #define SEP "---------------"
@ -412,7 +414,8 @@ VirtualMachine::MemoryProfile VirtualMachine::memoryProfile(void) const
if (profile.module[a].empty()) if (profile.module[a].empty())
{ {
LOG(Debug) << "Profiling memory for module '" << module_[a].name << "' (" << a << ")..." << std::endl; LOG(Debug) << "Profiling memory for module '" << module_[a].name
<< "' (" << a << ")..." << std::endl;
memoryProfile(profile, a); memoryProfile(profile, a);
env().freeAll(); env().freeAll();
} }