Commit 4be1e334 authored by miller86's avatar miller86

improving robustness of Silo plugin; adding top-level make check for...

improving robustness of Silo plugin; adding top-level make check for environment var collisions; removed arg from definition of CATCHALL macro

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7562 18c085ea-50e0-402c-830e-de6fd14e8384
parent a8415238
......@@ -145,6 +145,9 @@
# Brad Whitlock, Wed Jun 3 15:45:55 PST 2009
# I added an engine-only build option.
#
# Mark C. Miller, Tue Jun 16 15:32:47 PDT 2009
# Added logic to check for possible environment variable collision with
# VisIt's Makefile variables.
##############################################################################
@SET_MAKE@
......@@ -198,7 +201,7 @@ DISTCLEAN_FILES= Makefile config.cache config.log config.status \
include/make-depend-gnu include/make-depend-std \
include/make-targets-gnu include/make-targets-std
message:
message: check-make-and-env-vars
maintainer-clean: distclean
-$(RM) ${DISTCLEAN_FILES}
......@@ -206,3 +209,22 @@ maintainer-clean: distclean
visitmodule:
do (cd visitpy && $(MAKE) $@) || exit 1; done
check-make-and-env-vars:
@echo "Checking for possible collisions between environment"; \
echo -n "and VisIt's Make variables..."; \
env | cut -d'=' -f1 | sort | uniq > env_vars.txt; \
find . -name .svn -prune -o -name Makefile | grep -v .svn | xargs -n 1 -i cat '{}' | tr ' ' '\n'| grep '$$([A-Z_]*)' | sed -e 's#.*$$(\(.*\)).*#\1#' | sort | uniq > make_vars.txt; \
em_vars=`grep -x -f env_vars.txt make_vars.txt`; \
rm -f env_vars.txt make_vars.txt
if test -n "$$em_vars"; then \
echo ""; \
echo "The following variables in your environment may collide with"; \
echo "variables in VisIt's Makefiles. You may want to temporarily"; \
echo "adjust your environment by removing them using unsetenv (csh)"; \
echo "or unset (sh) before proceeding..."; \
echo $$em_vars | tr ' ' '\n'; \
sleep 10; \
else \
echo "OK"; \
fi
......@@ -264,6 +264,8 @@ avtDatabaseFactory::SetDefaultFileOpenOptions(const FileOpenOptions &opts)
// Brad Whitlock, Tue Jun 24 15:33:58 PDT 2008
// Pass in the database plugin manager since it's no longer a singleton.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
avtDatabase *
......@@ -380,7 +382,7 @@ avtDatabaseFactory::FileList(DatabasePluginManager *dbmgr,
nBlocks, forceReadAllCyclesAndTimes,
treatAllDBsAsTimeVarying);
}
CATCHALL(...)
CATCHALL
{
rv = NULL;
}
......@@ -410,7 +412,7 @@ avtDatabaseFactory::FileList(DatabasePluginManager *dbmgr,
fileIndex, nBlocks, forceReadAllCyclesAndTimes,
treatAllDBsAsTimeVarying);
}
CATCHALL(...)
CATCHALL
{
rv = NULL;
}
......
......@@ -362,6 +362,8 @@ avtCMFEExpression::ProcessArguments(ArgsExpr *args,
// Hank Childs, Tue May 5 14:15:45 PDT 2009
// Fix parsing problem with names that have subdirectories.
//
// Mark C. Miller, Wed Jun 17 14:23:25 PDT 2009
// Replaced CATCH(...) with CATCHALL
// ****************************************************************************
void
......@@ -459,7 +461,7 @@ avtCMFEExpression::Execute()
{
dob->Update(spec);
}
CATCH(...)
CATCHALL
{
//
// Now switch back #1 and #2
......
......@@ -101,6 +101,8 @@ using std::string;
// Added 'useVarForYAxis'. Retrieve time curve specs here rather than
// in Execute method at every timestep.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
avtQueryOverTimeFilter::avtQueryOverTimeFilter(const AttributeGroup *a)
......@@ -130,7 +132,7 @@ avtQueryOverTimeFilter::avtQueryOverTimeFilter(const AttributeGroup *a)
nResultsToStore = tqs.GetEntry("nResultsToStore")->AsInt();
delete query;
}
CATCHALL(...)
CATCHALL
{
numAdditionalFilters = 2; // it's a guess
debug1 << "There was a problem trying to instantiate a query for "
......@@ -216,6 +218,8 @@ avtQueryOverTimeFilter::Create(const AttributeGroup *atts)
// Kathleen Bonnell, Tue Jul 8 18:10:34 PDT 2008
// Removed call to query.GetTimeCurveSpecs. Now handled in constructor.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -296,7 +300,7 @@ avtQueryOverTimeFilter::Execute(void)
{
query->PerformQuery(&qatts);
}
CATCHALL( ... )
CATCHALL
{
SetOutputDataTree(dummy);
success = false;
......
......@@ -1464,6 +1464,8 @@ RemoteProcess::StartMakingConnection(const std::string &rHost, int numRead,
// Brad Whitlock, Tue Jan 17 14:15:14 PST 2006
// Added debug logging.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -1516,7 +1518,7 @@ RemoteProcess::FinishMakingConnection(int numRead, int numWrite)
debug5 << mName << "Exchanging type representations" << endl;
ExchangeTypeRepresentations();
}
CATCHALL(...)
CATCHALL
{
// Call the progress callback and tell it to end.
CallProgressCallback(2);
......
......@@ -190,7 +190,7 @@ class MISC_API VisItException
#define TRY try {
#define CATCH(T) } catch(T) { VisItException::LogCatch(#T, __FILE__, __LINE__);
#define CATCH2(T, A) } catch(T &A) { VisItException::LogCatch(#T, __FILE__, __LINE__);
#define CATCHALL(T) } catch(...) { VisItException::LogCatch(#T, __FILE__, __LINE__);
#define CATCHALL } catch(...) { VisItException::LogCatch("unknown", __FILE__, __LINE__);
#define ENDTRY }
#define RETHROW throw
#define CATCH_RETURN(n) return
......@@ -298,12 +298,12 @@ int exception_default_id();
exception_caught = true;
#define CATCHALL(e) \
#define CATCHALL \
exception_delete(jump_retval != 0); \
} \
else \
{ \
VisItException::LogCatch(#e, __FILE__, __LINE__); \
VisItException::LogCatch("unknown", __FILE__, __LINE__); \
exception_caught = true; \
......
......@@ -207,6 +207,8 @@ class TestGrammar : public Grammar
// Hank Childs, Fri Jan 28 15:43:04 PST 2005
// Use expression macros.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ----------------------------------------------------------------------------
class TestParser : public Parser
{
......@@ -300,7 +302,7 @@ class TestParser : public Parser
cerr << e.GetPos().GetErrorText(input) << endl;
CATCH_RETURN2(1, NULL);
}
CATCHALL(...)
CATCHALL
{
cerr << "Unknown exception!\n";
CATCH_RETURN2(1, NULL);
......
......@@ -868,6 +868,8 @@ PluginManager::LoadSinglePluginNow(const std::string& id)
// Brad Whitlock, Thu Apr 23 11:56:46 PDT 2009
// Added Simulation case.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
bool
......@@ -894,7 +896,7 @@ PluginManager::LoadSinglePlugin(int index)
{
PluginOpen(libfiles[index]);
}
CATCHALL(...)
CATCHALL
{
if (category==GUI || category==Viewer)
{
......
This diff is collapsed.
......@@ -304,7 +304,26 @@ class avtSiloFileFormat : public avtSTMDFileFormat
DBfile *OpenFile(int, bool skipGlobalInfo = false);
DBfile *OpenFile(const char *, bool skipGlobalInfo = false);
virtual void CloseFile(int);
void ReadDir(DBfile *,const char *,avtDatabaseMetaData *);
void ReadTopDirStuff(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*,char**);
void ReadMultimeshes(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadQuadmeshes(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadUcdmeshes(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadPointmeshes(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadCurves(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadCSGmeshes(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadMultivars(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadQuadvars(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadUcdvars(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadPointvars(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadCSGvars(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadMaterials(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadMultimats(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadSpecies(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadMultispecies(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void ReadDefvars(DBfile*, DBtoc*, const char*,avtDatabaseMetaData*);
void DoRootDirectoryWork(avtDatabaseMetaData*);
void BroadcastGlobalInfo(avtDatabaseMetaData*);
void StoreMultimeshInfo(const char *const dirname, int which_mm,
......
......@@ -1315,6 +1315,8 @@ RPCExecutor<OpenDatabaseRPC>::Execute(OpenDatabaseRPC *rpc)
// Brad Whitlock, Tue Jun 24 16:02:35 PDT 2008
// Changed how the database plugin manager is accessed.
//
// Mark C. Miller, Wed Jun 17 16:10:59 PDT 2009
// Added logic to send replies and catch exceptions.
// ****************************************************************************
template<>
void
......@@ -1331,15 +1333,26 @@ RPCExecutor<DefineVirtualDatabaseRPC>::Execute(DefineVirtualDatabaseRPC *rpc)
<< endl;
for (int i = 0; i < rpc->GetDatabaseFiles().size(); ++i)
debug5 << "file["<<i<<"]="<<rpc->GetDatabaseFiles()[i].c_str() << endl;
netmgr->GetDatabasePluginManager()->PluginAvailable(rpc->GetFileFormat());
avtDatabaseFactory::SetCreateMeshQualityExpressions(
rpc->GetCreateMeshQualityExpressions());
avtDatabaseFactory::SetCreateTimeDerivativeExpressions(
rpc->GetCreateTimeDerivativeExpressions());
TRY
{
netmgr->GetDatabasePluginManager()->PluginAvailable(rpc->GetFileFormat());
avtDatabaseFactory::SetCreateMeshQualityExpressions(
rpc->GetCreateMeshQualityExpressions());
avtDatabaseFactory::SetCreateTimeDerivativeExpressions(
rpc->GetCreateTimeDerivativeExpressions());
netmgr->DefineDB(rpc->GetDatabaseName(), rpc->GetDatabasePath(),
rpc->GetDatabaseFiles(), rpc->GetTime(), rpc->GetFileFormat());
netmgr->DefineDB(rpc->GetDatabaseName(), rpc->GetDatabasePath(),
rpc->GetDatabaseFiles(), rpc->GetTime(), rpc->GetFileFormat());
rpc->SendReply();
}
CATCH2(VisItException, e)
{
rpc->SendError(e.Message(), e.GetExceptionType());
}
ENDTRY
}
// ****************************************************************************
......
......@@ -262,6 +262,8 @@ IceTNetworkManager::TileLayout(size_t width, size_t height) const
// Hank Childs, Sat Mar 21 10:34:16 PST 2009
// Fix compilation error.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
avtDataObject_p
......@@ -396,7 +398,7 @@ IceTNetworkManager::Render(bool, intVector networkIds, bool getZBuffer,
this->RenderCleanup(windowID);
}
CATCHALL(...)
CATCHALL
{
RETHROW;
}
......
......@@ -380,6 +380,8 @@ LoadBalancer::CheckDynamicLoadBalancing(avtContract_p input)
// Check here to see if we should do DBPLUGIN_DYNAMIC, rather than
// setting it as a global.
//
// Mark C. Miller, Wed Jun 17 14:25:59 PDT 2009
// Replaced CATCH(...) with CATCHALL.
// ****************************************************************************
LoadBalanceScheme
......@@ -403,7 +405,7 @@ LoadBalancer::DetermineAppropriateScheme(avtContract_p input)
{
meshName = md->MeshForVar(data->GetVariable());
}
CATCH(...)
CATCHALL
{
// Probably a CMFE.
return scheme;
......
......@@ -1896,6 +1896,8 @@ NetworkManager::UpdatePlotAtts(int id, const AttributeGroup *atts)
// are streaming, not about whether we are doing dynamic load balancing.
// And the two are no longer synonymous.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
avtDataObjectWriter_p
......@@ -1956,7 +1958,7 @@ NetworkManager::GetOutput(bool respondWithNullData, bool calledForRender,
// return it
CATCH_RETURN2(1, writer);
}
CATCHALL(...)
CATCHALL
{
// Zero out the workingNet to ensure that the exception doesn't
// cause a crash next time we try to build a network. Remember
......@@ -2191,6 +2193,8 @@ NetworkManager::NeedZBufferToCompositeEvenIn2D(const intVector plotIds)
// from the last rendering.
// Move an image dump up. It was giving misleading results before.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
avtDataObject_p
......@@ -2375,7 +2379,7 @@ NetworkManager::Render(bool checkThreshold, intVector plotIds, bool getZBuffer,
this->RenderCleanup(windowID);
}
CATCHALL(...)
CATCHALL
{
// rethrow
RETHROW;
......@@ -3172,6 +3176,8 @@ NetworkManager::StopQueryMode(void)
// Add else statement to make Klocwork happy. Also make sure we don't
// delete already freed memory during error condition.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -3437,7 +3443,7 @@ NetworkManager::Pick(const int id, const int winId, PickAttributes *pa)
}
visitTimer->DumpTimings();
}
CATCHALL( ... )
CATCHALL
{
if (lQ != NULL)
delete lQ;
......@@ -3525,6 +3531,8 @@ NetworkManager::Pick(const int id, const int winId, PickAttributes *pa)
// Hank Childs, Fri Feb 15 13:13:21 PST 2008
// Prevent possible problem of freeing freed memory during error condition.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -3632,7 +3640,7 @@ NetworkManager::Query(const std::vector<int> &ids, QueryAttributes *qa)
}
visitTimer->DumpTimings();
}
CATCHALL( ... )
CATCHALL
{
if (query != NULL)
delete query;
......
......@@ -953,6 +953,8 @@ EngineProxy::OpenDatabase(const std::string &format, const std::string &file,
// Kathleen Bonnell, Tue Oct 9 14:40:10 PDT 2007
// Added createMeshQualityExpressions, createTimeDerivativeExpressions.
//
// Mark C. Miller, Wed Jun 17 16:10:27 PDT 2009
// Added logic to recieve possible error message and re-constitute it.
// ****************************************************************************
void
......@@ -963,6 +965,20 @@ EngineProxy::DefineVirtualDatabase(const std::string &fileFormat,
{
defineVirtualDatabaseRPC(fileFormat,wholeDBName, pathToFiles, files, time,
createMeshQualityExpressions, createTimeDerivativeExpressions);
while (defineVirtualDatabaseRPC.GetStatus() == VisItRPC::incomplete ||
defineVirtualDatabaseRPC.GetStatus() == VisItRPC::warning)
{
defineVirtualDatabaseRPC.RecvReply();
}
// Check for an error
if (defineVirtualDatabaseRPC.GetStatus() == VisItRPC::error)
{
RECONSTITUTE_EXCEPTION(defineVirtualDatabaseRPC.GetExceptionType(),
defineVirtualDatabaseRPC.Message());
}
}
// ****************************************************************************
......
......@@ -483,6 +483,8 @@ FileServerList::Notify()
// Brad Whitlock, Thu Jul 29 13:43:04 PST 2004
// I added smartFileGroupingFlag.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -627,7 +629,7 @@ FileServerList::SilentNotify()
else
info = 0;
}
CATCHALL(...)
CATCHALL
{
info = 0;
tryAgain = false;
......@@ -828,6 +830,8 @@ FileServerList::SetHost(const string &host)
// Added SSH tunneling option to MDServerProxy::Create, and set it to false.
// If we need to tunnel, the VCL will do the host/port translation for us.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -858,7 +862,7 @@ FileServerList::StartServer(const string &host)
// Add the default path to the recent path list.
AddPathToRecentList(host, info->path);
}
CATCHALL(...) // Clean-up handler
CATCHALL
{
connectingServer = false;
delete info->server;
......@@ -980,6 +984,8 @@ FileServerList::LoadPlugins()
//
// Modifications:
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -997,7 +1003,7 @@ FileServerList::SendKeepAlives()
pos->second->server->SendKeepAlive();
++pos;
}
CATCHALL(...)
CATCHALL
{
debug2 << "Could not send keep alive signal to mdserver on "
<< pos->first.c_str() << " so that mdserver will be closed."
......@@ -1496,6 +1502,9 @@ FileServerList::CloseFile()
//
// Mark C. Miller, Thu Aug 3 13:33:20 PDT 2006
// Fixed missing line to set readFileFailed to false
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -1591,7 +1600,7 @@ FileServerList::OpenAndGetMetaData(const QualifiedFilename &filename,
CloseServer(filename.host);
StartServer(filename.host);
}
CATCHALL(...)
CATCHALL
{
tryAgain = false;
}
......@@ -2973,6 +2982,8 @@ FileServerList::DecodePath(const string &path)
// I made it use a wrapper that tries to restart the mdserver. This prevents
// us from ever trying to use a NULL pointer.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
#define SAFE_GET_SEPARATOR(host, func) TRY\
......@@ -2984,7 +2995,7 @@ FileServerList::DecodePath(const string &path)
sep = info->server->func();\
}\
}\
CATCHALL(...)\
CATCHALL\
{\
}\
ENDTRY
......
......@@ -1709,6 +1709,8 @@ QvisGUIApplication::FinalInitialization()
// Brad Whitlock, Mon Oct 22 18:25:42 PST 2001
// Changed the exception handling keywords to macros.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
int
......@@ -1721,7 +1723,7 @@ QvisGUIApplication::Exec()
// Execute the application's main loop.
retval = mainApp->exec();
}
CATCHALL(...)
CATCHALL
{
// return an error code.
retval = -1;
......
......@@ -3159,6 +3159,8 @@ QvisSaveMovieWizard::page12_UpdateButtons()
//
// Modifications:
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
bool
......@@ -3187,7 +3189,7 @@ QvisSaveMovieWizard::LoadTemplateSpecification(const std::string &spec)
<< "\" could not be read" << endl;
}
}
CATCHALL(...)
CATCHALL
{
debug1 << mName << "The defaults file \"" << spec.c_str()
<< "\" could not be read and VisIt caught an unknown exception "
......
......@@ -81,6 +81,9 @@
//
// Mark C. Miller, Thu Apr 3 14:36:48 PDT 2008
// Moved setting of component name to before Initialize
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
int
......@@ -102,7 +105,7 @@ main(int argc, char **argv)
// Execute the GUI and return its return code.
retval = VisitGUI.Exec();
}
CATCHALL(...)
CATCHALL
{
retval = -1;
}
......
......@@ -1292,6 +1292,8 @@ LauncherApplication::ConnectSimulation(const stringVector &origLaunchArgs,
// Brad Whitlock, Tue Jul 29 11:39:03 PDT 2003
// Changed interface to ParentProcess::Connect.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -1308,7 +1310,7 @@ LauncherApplication::TerminateConnectionRequest(int argc, char *argv[])
// Connect back to the process and say that we could not connect.
killer.Connect(1, 1, &argc, &argv, true, 3);
}
CATCHALL(...)
CATCHALL
{
// We know that we're going to get here, but no action is required.
}
......
......@@ -683,6 +683,8 @@ MDServerConnection::GetPluginErrors()
// Hank Childs, Wed Dec 19 08:39:46 PST 2007
// Added timing information.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -745,7 +747,7 @@ MDServerConnection::ReadMetaData(std::string file, int timeState,
treatAllDBsAsTimeVarying);
visitTimer->StopTimer(t0, "Get metadata from inside ReadMetaData");
}
CATCHALL(...)
CATCHALL
{
EXCEPTION2(InvalidFilesException, file.c_str(), plugins);
}
......
......@@ -147,6 +147,8 @@ avtDeferExpressionFilter::Equivalent(const AttributeGroup *a)
// Brad Whitlock, Fri Mar 9 17:31:44 PST 2007
// Updated because of small change to ExpressionList.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
avtContract_p
......@@ -200,7 +202,7 @@ avtDeferExpressionFilter::ModifyContract(avtContract_p spec)
rv = avtExpressionEvaluatorFilter::ModifyContract(spec);
*el = orig_el;
}
CATCHALL(...)
CATCHALL
{
*el = orig_el;
......
......@@ -89,6 +89,9 @@
#
# Mark C. Miller Mon Jun 8 21:22:04 PDT 2009
# Removed diff tolerances due to transition of baselines to Davinci.
#
# Mark C. Miller, Wed Jun 17 14:57:12 PDT 2009
# Changed URL in email to specify portal.nersc.gov
# ----------------------------------------------------------------------------
dateTag=`date +%y%b%d`
svnHost=svn.nersc.gov
......@@ -450,8 +453,8 @@ for m in $modes; do
rm -f short_summary
touch short_summary
echo "Failed results should be obtainable on davinci.nersc.gov" >> short_summary
echo "file:///project/projectdirs/visit/www/${dateTag}/${theMode}/index.html" >> short_summary
grep 'category\|failed\|killed' summary >> short_summary
echo "http://portal.nersc.gov/project/visit/${dateTag}/${theMode}/index.html" >> short_summary
grep 'category\|failed' summary >> short_summary
checkAndHandleError $curerror warning "test mode $m failed" short_summary
failedPyFiles=`grep failed short_summary | cut -d':' -f1`
......
......@@ -335,6 +335,9 @@ HandleReadOptions(bool noOptions, DatabasePluginManager *dbmgr, const char *arg0
// Mark C. Miller, Tue May 19 21:55:37 PDT 2009
// Added support for handling read options. Allowed for multiple '-variable'
// options on the command line.
//
// Mark C. Miller, Wed Jun 17 14:23:51 PDT 2009
// Replaced CATCH(...) with CATCHALL
// ****************************************************************************
int main(int argc, char *argv[])
......@@ -453,7 +456,7 @@ int main(int argc, char *argv[])
else
db = avtDatabaseFactory::FileList(dbmgr, argv+1, 1, 0, pluginList);
}
CATCH(...)
CATCHALL
{
cerr << "The file " << argv[1] << " does not exist or could "
<< "not be opened." << endl;
......
......@@ -406,6 +406,8 @@ ViewerEngineManager::EngineExists(const EngineKey &ek) const
// were allowing the exception to propagate to a level where the viewer
// self-quit because it incorrectly thought the GUI had died.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
bool
......@@ -531,7 +533,7 @@ ViewerEngineManager::CreateEngine(const EngineKey &ek,
// small amount of time.
newEngine.proxy->SendKeepAlive();
}
CATCHALL(...)
CATCHALL
{
inLaunch = false;
RETHROW;
......@@ -867,6 +869,8 @@ ViewerEngineManager::ConnectSim(const EngineKey &ek,
// Brad Whitlock, Wed Aug 4 17:21:25 PST 2004
// I changed EngineMap.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -897,7 +901,7 @@ ViewerEngineManager::CloseEngines()
{
engine->Close();
}
CATCHALL(...)
CATCHALL
{
debug1 << "Caught an exception while closing the engine." << endl;
}
......@@ -1090,6 +1094,8 @@ ViewerEngineManager::InLaunch() const
// Brad Whitlock, Wed Aug 4 17:23:00 PST 2004
// Changed EngineMap.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -1109,7 +1115,7 @@ ViewerEngineManager::SendKeepAlives()
{
i->second.proxy->SendKeepAlive();
}
CATCHALL(...)
CATCHALL
{
debug1 << "Caught an exception while sending a keep alive "
"signal to the engine."
......
......@@ -251,6 +251,8 @@ ViewerFileServer::~ViewerFileServer()
// Brad Whitlock, Fri Dec 27 14:47:54 PST 2002
// I added debugging information.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
void
......@@ -269,7 +271,7 @@ ViewerFileServer::CloseServers()
// Tell the server to quit.
pos->second->proxy->Close();
}
CATCHALL(...)
CATCHALL
{
debug1 << "Caught an exception while closing the server."
<< endl;
......@@ -625,6 +627,8 @@ ViewerFileServer::GetMetaDataForState(const std::string &host,
// Fix typo in generating error message for opening bad file when running
// client-server.
//
// Mark C. Miller, Wed Jun 17 14:27:08 PDT 2009
// Replaced CATCHALL(...) with CATCHALL.
// ****************************************************************************
const avtDatabaseMetaData *
......@@ -752,7 +756,7 @@ ViewerFileServer::GetMetaDataHelper(const std::string &host,
StartServer(host, startArgs);
SendFileOpenOptions(host);
}
CATCHALL(...)
CATCHALL
{
tryAgain = false;
}
......@@ -951,6 +955,8 @@ ViewerFileServer::GetSILForState(const std::string &host,
// Kathleen Bonnell, Thu Aug 14 16:13:41 PDT 2008
// Added call to SendFileOpenOptions after StartServer.
//