Put stdout in line buffer mode for MCed apps.

[simgrid.git] / src / mc / remote / AppSide.cpp

diff --git a/src/mc/remote/AppSide.cpp b/src/mc/remote/AppSide.cpp
index f45e856..d27c534 100644 (file)
--- a/src/mc/remote/AppSide.cpp
+++ b/src/mc/remote/AppSide.cpp
@@ -7,8 +7,13 @@
 #include "src/internal_config.h"
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/actor/SimcallObserver.hpp"
+#include "src/mc/mc_base.hpp"
 #include "src/mc/remote/RemoteProcess.hpp"
+#if HAVE_SMPI
+#include "src/smpi/include/private.hpp"
+#endif
 #include "xbt/coverage.h"
+#include "xbt/str.h"
 #include "xbt/xbt_modinter.h" /* mmalloc_preinit to get the default mmalloc arena address */
 #include <simgrid/modelchecker.h>
 
@@ -38,6 +43,8 @@ AppSide* AppSide::initialize()
 
   _sg_do_model_check = 1;
 
+  setvbuf(stdout, NULL, _IOLBF, 0);
+
   // Fetch socket from MC_ENV_SOCKET_FD:
   const char* fd_env = std::getenv(MC_ENV_SOCKET_FD);
   int fd = xbt_str_parse_int(fd_env, "Variable '" MC_ENV_SOCKET_FD "' should contain a number but contains '%s'");
@@ -199,6 +206,7 @@ void AppSide::handle_messages() const
         coverage_checkpoint();
         xbt_assert(channel_.send(MessageType::DEADLOCK_CHECK_REPLY) == 0, // DEADLOCK_CHECK_REPLY, really?
                    "Could not answer to FINALIZE");
+        std::fflush(stdout);
         if (terminate_asap)
           ::_Exit(0);
         break;