Commit 60fd84de authored by whitlocb's avatar whitlocb

Fix the GetProcessAttributes function for the engine.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23398 18c085ea-50e0-402c-830e-de6fd14e8384
parent cad64d5b
......@@ -3779,18 +3779,20 @@ Engine::ExecuteSimulationCommand(const std::string &command,
//
// Satheesh Maheswaran, Mon Oct 01 11:48:10 PST 2012
// Added code to get memory information from each processor
//
// ****************************************************************************
ProcessAttributes *
Engine::GetProcessAttributes()
{
unsigned long m_size, m_rss;
double m_size_mb, m_rss_mb;
// Only allocate procAtts once.
if (procAtts == NULL)
{
procAtts = new ProcessAttributes;
// Populate procAtts.
{
unsigned long m_size, m_rss;
double m_size_mb, m_rss_mb;
intVector pids;
intVector ppids;
intVector memusage;
......@@ -3805,7 +3807,6 @@ Engine::GetProcessAttributes()
#endif
#ifdef PARALLEL
char myHost[2*MPI_MAX_PROCESSOR_NAME];
int strLen;
MPI_Get_processor_name(myHost, &strLen);
......@@ -3840,8 +3841,8 @@ Engine::GetProcessAttributes()
MPI_Gather(&myHost, sizeof(myHost), MPI_CHAR,
allHosts, sizeof(myHost), MPI_CHAR, 0, VISIT_MPI_COMM);
int m_size_mb_tmp = (int)m_size_mb;
MPI_Gather(&m_size_mb_tmp, 1, MPI_INT,
allMemusage, 1, MPI_INT, 0, VISIT_MPI_COMM);
MPI_Gather(&m_size_mb_tmp, 1, MPI_INT,
allMemusage, 1, MPI_INT, 0, VISIT_MPI_COMM);
if (PAR_Rank() == 0)
{
......@@ -3858,7 +3859,6 @@ Engine::GetProcessAttributes()
delete [] allHosts;
delete [] allMemusage;
}
#else
pids.push_back(myPid);
......@@ -3882,11 +3882,9 @@ Engine::GetProcessAttributes()
procAtts->SetHosts(hosts);
procAtts->SetMemory(memusage);
procAtts->SetIsParallel(isParallel);
}
return procAtts;
}
// ****************************************************************************
......
......@@ -41,6 +41,7 @@ list of changes in release 2.7.</p>
<li>The VisItSetMPICommunicator() function in libsim was fixed.</li>
<li>Datalevel comparison wizard was fixed so that it doesn't create expressions with nested <>.</li>
<li>Fixed a bug with Pseudocolor plot not using the correct data extents when Material selection appled and 'Current Plot' option chosen.</li>
<li>The <i>GetProcessAttributes()</i> function, which returns information about the engine or viewer, was not updating the returned values when called multiple times for the compute engine.</li>
<li>In build_visit, the CONFIG_SITE env var was cleared to avoid third party lib installs using a lib64 directory style.</li>
</ul>
......
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