diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-10 17:59:45 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-10 17:59:45 +0100 |
| commit | 7135bdf5917962a972233bfd307a7bc936d48642 (patch) | |
| tree | b7fd3d91bd4376d537e49f7a18023ff8fabfc449 | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| download | cuberite-7135bdf5917962a972233bfd307a7bc936d48642.tar cuberite-7135bdf5917962a972233bfd307a7bc936d48642.tar.gz cuberite-7135bdf5917962a972233bfd307a7bc936d48642.tar.bz2 cuberite-7135bdf5917962a972233bfd307a7bc936d48642.tar.lz cuberite-7135bdf5917962a972233bfd307a7bc936d48642.tar.xz cuberite-7135bdf5917962a972233bfd307a7bc936d48642.tar.zst cuberite-7135bdf5917962a972233bfd307a7bc936d48642.zip | |
| -rw-r--r-- | src/DeadlockDetect.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/DeadlockDetect.cpp b/src/DeadlockDetect.cpp index e699e0c84..c42d09b89 100644 --- a/src/DeadlockDetect.cpp +++ b/src/DeadlockDetect.cpp @@ -7,6 +7,7 @@ #include "DeadlockDetect.h" #include "Root.h" #include "World.h" +# include <cstdlib> @@ -137,11 +138,7 @@ void cDeadlockDetect::CheckWorldAge(const AString & a_WorldName, Int64 a_Age) void cDeadlockDetect::DeadlockDetected(void) { ASSERT(!"Deadlock detected"); - - // TODO: Make a crashdump / coredump - - // Crash the server intentionally: - *((volatile int *)0) = 0; + abort(); } |