Merge pull request #4023 from roystgnr/no_libmeshinit_fix

Fix error reporting without LibMeshInit in use

Author: lindsayad

include/base/libmesh_common.h

@@ -397,9 +397,7 @@ struct casting_compare {
   do {                                                                  \
     std::stringstream message_stream;                                   \
     message_stream << msg << '\n';                                      \
-    libMesh::Threads::lock_singleton_spin_mutex();                      \
     libMesh::MacroFunctions::report_error(__FILE__, __LINE__, LIBMESH_DATE, LIBMESH_TIME, message_stream); \
-    libMesh::Threads::unlock_singleton_spin_mutex();                    \
     LIBMESH_THROW(libMesh::LogicError(message_stream.str()));           \
   } while (0)
 
@@ -415,9 +413,9 @@ struct casting_compare {
   do {                                                                  \
     libMesh::Threads::lock_singleton_spin_mutex();                      \
     libMesh::err << msg << '\n';                                        \
+    libMesh::Threads::unlock_singleton_spin_mutex();                    \
     libmesh_try { libMesh::MacroFunctions::report_error(__FILE__, __LINE__, LIBMESH_DATE, LIBMESH_TIME); } \
     libmesh_catch (...) {}                                              \
-    libMesh::Threads::unlock_singleton_spin_mutex();                    \
     std::terminate();                                                   \
   } while (0)
 
@@ -427,9 +425,7 @@ struct casting_compare {
   do {                                                                  \
     std::stringstream message_stream;                                   \
     message_stream << msg << '\n';                                      \
-    libMesh::Threads::lock_singleton_spin_mutex();                      \
     libMesh::MacroFunctions::report_error(__FILE__, __LINE__, LIBMESH_DATE, LIBMESH_TIME, message_stream); \
-    libMesh::Threads::unlock_singleton_spin_mutex();                    \
     LIBMESH_THROW(libMesh::NotImplemented(message_stream.str()));       \
   } while (0)
 
@@ -439,9 +435,7 @@ struct casting_compare {
   do {                                                                  \
     std::stringstream message_stream;                                   \
     message_stream << msg << '\n';                                      \
-    libMesh::Threads::lock_singleton_spin_mutex();                      \
     libMesh::MacroFunctions::report_error(__FILE__, __LINE__, LIBMESH_DATE, LIBMESH_TIME, message_stream); \
-    libMesh::Threads::unlock_singleton_spin_mutex();                    \
     LIBMESH_THROW(libMesh::FileError(filename, message_stream.str()));  \
   } while (0)
 

src/base/libmesh.C

@@ -948,8 +948,12 @@ std::vector<std::string> command_line_names()
 
 bool on_command_line (std::string arg)
 {
-  // Make sure the command line parser is ready for use
-  libmesh_assert(command_line.get());
+  // Make sure the command line parser is ready for use.  If it's not,
+  // then we'll have to treat the command line as empty, for maximum
+  // compatibility with programs that don't use LibMeshInit but
+  // indirectly (e.g. via error handling code) query the command line.
+  if (!command_line.get())
+    return false;
 
   // Keep track of runtime queries, for later
   add_command_line_name(arg);

src/base/libmesh_common.C

@@ -20,6 +20,7 @@
 #include "libmesh/libmesh.h"
 #include "libmesh/libmesh_common.h"
 #include "libmesh/print_trace.h"
+#include "libmesh/threads.h"
 
 // C/C++ includes
 #ifdef LIBMESH_HAVE_SYS_TYPES_H
@@ -66,8 +67,13 @@ void stop(const char * file, int line, const char * date, const char * time)
 }
 
 
+Threads::spin_mutex report_error_spin_mtx;
+
 void report_error(const char * file, int line, const char * date, const char * time, std::ostream & os)
 {
+  // Avoid a race condition on that static bool
+  Threads::spin_mutex::scoped_lock lock(report_error_spin_mtx);
+
   // It is possible to have an error *inside* report_error; e.g. from
   // print_trace.  We don't want to infinitely recurse.
   static bool reporting_error = false;