Commit aa64f917 authored by Luka Stanisic's avatar Luka Stanisic

fixing codelet names for simgrid

parent 59f3c4b4
......@@ -1039,10 +1039,9 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, p2mTaskNames.get(),
#else
STARPU_NAME, taskNames.print("P2M_nb%d_i%lld_p%lld",
STARPU_NAME, taskNames.print("P2M_nb%d_i%lld",
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval(),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNbParticlesInGroup()),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval()),
#endif
#endif
0);
......@@ -1437,13 +1436,11 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, p2pOuterTaskNames.get(),
#else
STARPU_NAME, taskNames.print("P2P_out_nb%d_i%lld_p%lld_nb%d_i%lld_p%lld_s%d",
STARPU_NAME, taskNames.print("P2P_out_nb%d_i%lld_nb%d_i%lld_s%d",
tree->getParticleGroup(idxGroup)->getNumberOfLeavesInBlock(),
tree->getParticleGroup(idxGroup)->getSizeOfInterval(),
tree->getParticleGroup(idxGroup)->getNbParticlesInGroup(),
tree->getParticleGroup(interactionid)->getNumberOfLeavesInBlock(),
tree->getParticleGroup(interactionid)->getSizeOfInterval(),
tree->getParticleGroup(interactionid)->getNbParticlesInGroup(),
outsideInteractions->size()),
#endif
#endif
......@@ -1469,10 +1466,9 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, p2pTaskNames.get(),
#else
STARPU_NAME, taskNames.print("P2P_nb%d_i%lld_p%lld",
STARPU_NAME, taskNames.print("P2P_nb%d_i%lld",
tree->getParticleGroup(idxGroup)->getNumberOfLeavesInBlock(),
tree->getParticleGroup(idxGroup)->getSizeOfInterval(),
tree->getParticleGroup(idxGroup)->getNbParticlesInGroup()),
tree->getParticleGroup(idxGroup)->getSizeOfInterval()),
#endif
#endif
0);
......@@ -1511,10 +1507,9 @@ protected:
#ifndef SCALFMM_SIMGRID_TASKNAMEPARAMS
STARPU_NAME, l2pTaskNames.get(),
#else
STARPU_NAME, taskNames.print("L2P_nb%d_i%lld_p%lld",
STARPU_NAME, taskNames.print("L2P_nb%d_i%lld",
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNumberOfCellsInBlock(),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval(),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getNbParticlesInGroup()),
tree->getCellGroup(tree->getHeight()-1,idxGroup)->getSizeOfInterval()),
#endif
#endif
0);
......
......@@ -34,7 +34,7 @@ public:
const char* print(const char format[], Params... args ){
const size_t length = 512;
char* name = new char[length+1];
snprintf(name, format, args...);
snprintf(name, length, format, args...);
name[length] = '\0';
names.push_back(name);
return name;
......
Markdown is supported
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