Commit b3efd44f authored by hrchilds's avatar hrchilds

Update from March 22, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@437 18c085ea-50e0-402c-830e-de6fd14e8384
parent ae8eb62f
......@@ -106,7 +106,10 @@
# Add skips for dynamic load balancing mode. Run the DLB mode every Sunday.
#
# Mark C. Miller Mon Mar 21 18:57:08 PST 2005
# Added skips for purify mode
# Added skips for purify mode, added code to make clean in data dir
#
# Mark C. Miller, Tue Mar 22 08:54:39 PST 2005
# Added cat of output from make clean in data dir to /dev/null
#
# ----------------------------------------------------------------------------
......@@ -191,7 +194,7 @@ LD_LIBRARY_PATH=/usr/local/lib
export LD_LIBRARY_PATH
env CXXFLAGS="-g" ./configure --enable-parallel 1>> buildlog 2>&1
rm -f plugins/*/*.so
(cd data; clearmake clean)
(cd data; clearmake clean 1> /dev/null 2>&1 )
clearmake -J 2 1>> buildlog 2>&1
error=$?
......
......@@ -27,6 +27,7 @@ int ftime(struct timeb *);
#endif
bool haveInitialized = false;
TimingsManager *visitTimer = TimingsManager::Initialize("default");
......@@ -136,11 +137,16 @@ TimingsManager::TimingsManager()
// Brad Whitlock, Thu Mar 14 12:24:34 PDT 2002
// Renamed UnixTimingsManager to SystemTimingsManager.
//
// Hank Childs, Tue Mar 22 16:13:20 PST 2005
// Fix memory leak.
//
// ****************************************************************************
TimingsManager *
TimingsManager::Initialize(const char *fname)
{
if (haveInitialized)
return visitTimer;
#ifdef PARALLEL
visitTimer = new MPITimingsManager;
#else
......@@ -148,6 +154,7 @@ TimingsManager::Initialize(const char *fname)
#endif
visitTimer->SetFilename(fname);
haveInitialized = true;
return visitTimer;
}
......
......@@ -50,11 +50,15 @@ class avtDatabaseWriter;
// Added the general plugin info method HasWriter so the mdserver
// can still check if it is supported by the given plugin.
//
// Hank Childs, Tue Mar 22 16:06:15 PST 2005
// Make destructor virtual.
//
// ****************************************************************************
class PLUGIN_API GeneralDatabasePluginInfo
{
public:
virtual ~GeneralDatabasePluginInfo() {;};
virtual char *GetName() const = 0;
virtual char *GetVersion() const = 0;
virtual char *GetID() const = 0;
......
......@@ -168,6 +168,9 @@ DatabasePluginManager::GetCommonPluginInfo(const string &id)
// Jeremy Meredith, Tue Feb 22 15:22:29 PST 2005
// Added a way to determine directly if a plugin has a writer.
//
// Hank Childs, Tue Mar 22 16:06:15 PST 2005
// Fix memory leak.
//
// ****************************************************************************
bool
......@@ -192,7 +195,10 @@ DatabasePluginManager::LoadGeneralPluginInfo()
// We can't have two plugins with the same id.
if (PluginExists(info->GetID()))
{
delete info;
return false;
}
// Success! Add it to the list.
allindexmap[info->GetID()] = ids.size();
......@@ -201,6 +207,7 @@ DatabasePluginManager::LoadGeneralPluginInfo()
versions .push_back(info->GetVersion());
enabled .push_back(info->EnabledByDefault());
haswriter.push_back(info->HasWriter());
delete info;
return true;
}
......
......@@ -52,11 +52,15 @@ class ViewerPlot;
// Brad Whitlock, Tue Dec 14 09:44:04 PDT 2004
// Added support for operator wizards.
//
// Hank Childs, Tue Mar 22 16:06:15 PST 2005
// Made destructor virtual.
//
// ****************************************************************************
class PLUGIN_API GeneralOperatorPluginInfo
{
public:
virtual ~GeneralOperatorPluginInfo() {;};
virtual char *GetName() const = 0;
virtual char *GetVersion() const = 0;
virtual char *GetID() const = 0;
......
......@@ -244,6 +244,9 @@ OperatorPluginManager::GetScriptingPluginInfo(const string &id)
// Jeremy Meredith, Wed Nov 5 13:28:03 PST 2003
// Use the default value for enabled status instead of always true.
//
// Hank Childs, Tue Mar 22 16:06:15 PST 2005
// Fix memory leak.
//
// ****************************************************************************
bool
......@@ -268,7 +271,10 @@ OperatorPluginManager::LoadGeneralPluginInfo()
// We can't have two plugins with the same id.
if (PluginExists(info->GetID()))
{
delete info;
return false;
}
// Success! Add it to the list.
allindexmap[info->GetID()] = ids.size();
......@@ -276,6 +282,7 @@ OperatorPluginManager::LoadGeneralPluginInfo()
names .push_back(info->GetName());
versions.push_back(info->GetVersion());
enabled .push_back(info->EnabledByDefault());
delete info;
return true;
}
......
......@@ -83,11 +83,15 @@ class avtPlot;
// Brad Whitlock, Tue Dec 14 09:42:33 PDT 2004
// I added support for plot wizards.
//
// Hank Childs, Tue Mar 22 16:06:15 PST 2005
// Made destructor virtual.
//
// ****************************************************************************
class PLUGIN_API GeneralPlotPluginInfo
{
public:
virtual ~GeneralPlotPluginInfo() { ; };
virtual char *GetName() const = 0;
virtual char *GetVersion() const = 0;
virtual char *GetID() const = 0;
......
......@@ -244,6 +244,9 @@ PlotPluginManager::GetScriptingPluginInfo(const string &id)
// Jeremy Meredith, Wed Nov 5 13:28:03 PST 2003
// Use the default value for enabled status instead of always true.
//
// Hank Childs, Tue Mar 22 16:06:15 PST 2005
// Fix memory leak.
//
// ****************************************************************************
bool
......@@ -268,7 +271,10 @@ PlotPluginManager::LoadGeneralPluginInfo()
// We can't have two plugins with the same id.
if (PluginExists(info->GetID()))
{
delete info;
return false;
}
// Success! Add it to the list.
allindexmap[info->GetID()] = ids.size();
......@@ -276,6 +282,7 @@ PlotPluginManager::LoadGeneralPluginInfo()
names .push_back(info->GetName());
versions.push_back(info->GetVersion());
enabled .push_back(info->EnabledByDefault());
delete info;
return true;
}
......
......@@ -89,7 +89,12 @@ avtDatabase::avtDatabase()
// Hank Childs, Thu Mar 1 13:42:43 PST 2001
// Split class so functionality went in derived type, avtGenericDatabase.
//
// Mark C. Miller, 30Sep03 Added support to time-varying SIL/MD
// Mark C. Miller, 30Sep03
// Added support to time-varying SIL/MD
//
// Hank Childs, Tue Mar 22 10:41:23 PST 2005
// Fix memory leak.
//
// ****************************************************************************
avtDatabase::~avtDatabase()
......@@ -111,6 +116,17 @@ avtDatabase::~avtDatabase()
delete invariantSIL;
invariantSIL = NULL;
}
std::list<CachedMDEntry>::iterator it2;
for (it2 = metadata.begin() ; it2 != metadata.end() ; it2++)
{
delete (*it2).md;
}
std::list<CachedSILEntry>::iterator it3;
for (it3 = sil.begin() ; it3 != sil.end() ; it3++)
{
delete (*it3).sil;
}
}
......
......@@ -2,6 +2,9 @@
// avtPixieFileFormat.C //
// ************************************************************************* //
// define this to make sure the plugin always serves up float data to VisIt
#define FORCE_FLOATS
#include <avtPixieFileFormat.h>
#include <algorithm>
......@@ -1410,7 +1413,22 @@ avtPixieFileFormat::GetVariableList(hid_t group, const char *name,
// Determine the variable's type to see if we can support it.
//
hid_t t = H5Dget_type(obj);
//
// MCM - Added 16Mar05
// VisIt can't deal well with a large variety of different data
// types. So, we force everything to float with this line of
// code. This tells the plugin that everything is float,
// regardless of its real type on disk. Note that if we
// every implement GetAuxiliaryData functions for global node/zone
// ids, we'll have to be a little smarter.
//
#ifdef FORCE_FLOATS
varInfo.nativeVarType = H5T_NATIVE_FLOAT;
#else
varInfo.nativeVarType = H5Tget_native_type(t, H5T_DIR_ASCEND);
#endif
bool supported = false;
if(H5Tequal(varInfo.nativeVarType, H5T_NATIVE_INT) > 0 ||
H5Tequal(varInfo.nativeVarType, H5T_NATIVE_UINT) > 0)
......
......@@ -58,6 +58,9 @@ DataNetwork::DataNetwork(void)
// Kathleen Bonnell, Tue Mar 15 17:41:26 PST 2005
// Don't release data if this network is a clone.
//
// Hank Childs, Tue Mar 22 10:08:11 PST 2005
// Fix memory leak.
//
// ****************************************************************************
DataNetwork::~DataNetwork(void)
{
......@@ -65,7 +68,13 @@ DataNetwork::~DataNetwork(void)
terminalNode = NULL;
if (!clone)
{
ReleaseData();
for (int i = 0 ; i < nodeList.size() ; i++)
{
delete nodeList[i];
}
}
}
// ****************************************************************************
......
......@@ -76,6 +76,10 @@ const int INTERRUPT_MESSAGE_TAG = GetUniqueStaticMessageTag();
//
// Mark C. Miller, Tue Mar 8 17:59:40 PST 2005
// Added procAtts
//
// Hank Childs, Mon Mar 21 11:24:06 PST 2005
// Initialize all of the data members.
//
// ****************************************************************************
Engine::Engine()
{
......@@ -85,6 +89,29 @@ Engine::Engine()
netmgr = NULL;
lb = NULL;
procAtts = NULL;
metaData = NULL;
silAtts = NULL;
quitRPC = NULL;
keepAliveRPC = NULL;
readRPC = NULL;
applyOperatorRPC = NULL;
makePlotRPC = NULL;
useNetworkRPC = NULL;
updatePlotAttsRPC = NULL;
pickRPC = NULL;
startPickRPC = NULL;
startQueryRPC = NULL;
executeRPC = NULL;
clearCacheRPC = NULL;
queryRPC = NULL;
releaseDataRPC = NULL;
openDatabaseRPC = NULL;
defineVirtualDatabaseRPC = NULL;
renderRPC = NULL;
setWinAnnotAttsRPC = NULL;
cloneNetworkRPC = NULL;
procInfoRPC = NULL;
}
// ****************************************************************************
......@@ -93,14 +120,43 @@ Engine::Engine()
// Programmer: Jeremy Meredith
// Creation: July 10, 2003
//
// Modifications:
//
// Hank Childs, Mon Mar 21 11:21:42 PST 2005
// Delete RPCs.
//
// ****************************************************************************
Engine::~Engine()
{
delete netmgr;
delete xfer;
delete lb;
delete silAtts;
delete metaData;
for (int i=0; i<rpcExecutors.size(); i++)
delete rpcExecutors[i];
delete quitRPC;
delete keepAliveRPC;
delete readRPC;
delete applyOperatorRPC;
delete makePlotRPC;
delete useNetworkRPC;
delete updatePlotAttsRPC;
delete pickRPC;
delete startPickRPC;
delete startQueryRPC;
delete executeRPC;
delete clearCacheRPC;
delete queryRPC;
delete releaseDataRPC;
delete openDatabaseRPC;
delete defineVirtualDatabaseRPC;
delete renderRPC;
delete setWinAnnotAttsRPC;
delete cloneNetworkRPC;
delete procInfoRPC;
}
// ****************************************************************************
......
......@@ -2,7 +2,6 @@
#define ENGINE_H
// RPCs
class ApplyNamedFunctionRPC;
class ApplyOperatorRPC;
class ClearCacheRPC;
class CloneNetworkRPC;
......@@ -17,7 +16,6 @@ class QuitRPC;
class ReadRPC;
class ReleaseDataRPC;
class RenderRPC;
class SetFinalVariableNameRPC;
class SetWinAnnotAttsRPC;
class StartPickRPC;
class StartQueryRPC;
......@@ -91,6 +89,9 @@ class ProcessAttributes;
// Mark C. Miller, Tue Mar 8 18:06:19 PST 2005
// Added GetProcessAttributes
//
// Hank Childs, Tue Mar 22 09:37:58 PST 2005
// Remove unused data members that date back to old expression calls.
//
// ****************************************************************************
class Engine
......@@ -197,8 +198,6 @@ class Engine
KeepAliveRPC *keepAliveRPC;
ReadRPC *readRPC;
ApplyOperatorRPC *applyOperatorRPC;
ApplyNamedFunctionRPC *applyNamedFunctionRPC;
SetFinalVariableNameRPC *setFinalVariableNameRPC;
MakePlotRPC *makePlotRPC;
UseNetworkRPC *useNetworkRPC;
UpdatePlotAttsRPC *updatePlotAttsRPC;
......
......@@ -126,6 +126,9 @@ ViewerPasswordWindow::~ViewerPasswordWindow()
// is to click the Cancel button. This changes the message that is seen
// after the launch is cancelled.
//
// Jeremy Meredith, Tue Mar 22 08:42:14 PST 2005
// Added a new parsed message ('6090).
//
// ****************************************************************************
void
......@@ -159,6 +162,11 @@ ViewerPasswordWindow::authenticate(const char *username, const char *host,
write(fd, "yes\n", 4);
pbuf = buffer;
}
else if (strstr(buffer, "continue connecting(yes/no)?"))
{
write(fd, "yes\n", 4);
pbuf = buffer;
}
else if (strstr(buffer, "assword"))
{
// Password needed. Prompt for it and write it to the FD.
......
......@@ -14,10 +14,17 @@
vtkStandardNewMacro(vtkDebugStream);
// *****************************************************
// Modifications:
// Hank Childs, Tue Mar 22 16:19:59 PST 2005
// Fix memory leak.
// *****************************************************
void vtkDebugStream::Initialize(void)
{
vtkDebugStream *ds = vtkDebugStream::New();
vtkOutputWindow::SetInstance(ds);
ds->Delete();
}
......
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