diff options
author | Idan Horowitz <idan.horowitz@gmail.com> | 2021-03-26 18:46:20 +0300 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-03-28 20:42:33 +0200 |
commit | 9f656b6fa98439132bce394fe46f2691cb9afa90 (patch) | |
tree | b4a17797700fba4685e2dbf8d26e8356c901bc22 /Userland/Services | |
parent | b8f462a78b459466d34945ee82fb1e6bcea936ae (diff) | |
download | serenity-9f656b6fa98439132bce394fe46f2691cb9afa90.zip |
LibCoreDump+CrashDaemon: Compress coredumps
Most coredumps contain large amounts of consecutive null bytes and as
such are a prime candidate for compression.
This commit makes CrashDaemon compress files once the kernel finishes
emitting them, as well as adds the functionality needed in LibCoreDump
to then parse them.
Diffstat (limited to 'Userland/Services')
-rw-r--r-- | Userland/Services/CrashDaemon/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Userland/Services/CrashDaemon/main.cpp | 41 | ||||
-rw-r--r-- | Userland/Services/SystemServer/main.cpp | 3 |
3 files changed, 40 insertions, 6 deletions
diff --git a/Userland/Services/CrashDaemon/CMakeLists.txt b/Userland/Services/CrashDaemon/CMakeLists.txt index 5dcf13aacb..232c4d5a84 100644 --- a/Userland/Services/CrashDaemon/CMakeLists.txt +++ b/Userland/Services/CrashDaemon/CMakeLists.txt @@ -3,4 +3,4 @@ set(SOURCES ) serenity_bin(CrashDaemon) -target_link_libraries(CrashDaemon LibC LibCore LibCoreDump) +target_link_libraries(CrashDaemon LibC LibCompress LibCore LibCoreDump) diff --git a/Userland/Services/CrashDaemon/main.cpp b/Userland/Services/CrashDaemon/main.cpp index 6b27e3d41b..bed4770beb 100644 --- a/Userland/Services/CrashDaemon/main.cpp +++ b/Userland/Services/CrashDaemon/main.cpp @@ -25,6 +25,9 @@ */ #include <AK/LexicalPath.h> +#include <AK/MappedFile.h> +#include <LibCompress/Gzip.h> +#include <LibCore/File.h> #include <LibCore/FileWatcher.h> #include <LibCoreDump/Backtrace.h> #include <LibCoreDump/Reader.h> @@ -49,6 +52,33 @@ static void wait_until_coredump_is_ready(const String& coredump_path) } } +static bool compress_coredump(const String& coredump_path) +{ + auto file_or_error = MappedFile::map(coredump_path); + if (file_or_error.is_error()) { + dbgln("Could not open coredump '{}': {}", coredump_path, file_or_error.error()); + return false; + } + auto coredump_file = file_or_error.value(); + auto compressed_coredump = Compress::GzipCompressor::compress_all(coredump_file->bytes()); + if (!compressed_coredump.has_value()) { + dbgln("Could not compress coredump '{}'", coredump_path); + return false; + } + auto output_path = String::formatted("{}.gz", coredump_path); + auto output_file_or_error = Core::File::open(output_path, Core::File::WriteOnly); + if (output_file_or_error.is_error()) { + dbgln("Could not open '{}' for writing: {}", output_path, output_file_or_error.error()); + return false; + } + auto output_file = output_file_or_error.value(); + if (!output_file->write(compressed_coredump.value().data(), compressed_coredump.value().size())) { + dbgln("Could not write compressed coredump '{}'", output_path); + return false; + } + return true; +} + static void print_backtrace(const String& coredump_path) { auto coredump = CoreDump::Reader::create(coredump_path); @@ -70,10 +100,10 @@ static void print_backtrace(const String& coredump_path) }); } -static void launch_crash_reporter(const String& coredump_path) +static void launch_crash_reporter(const String& coredump_path, bool unlink_after_use) { pid_t child; - const char* argv[] = { "CrashReporter", coredump_path.characters(), nullptr, nullptr }; + const char* argv[] = { "CrashReporter", coredump_path.characters(), unlink_after_use ? "--unlink" : nullptr, nullptr, nullptr }; if ((errno = posix_spawn(&child, "/bin/CrashReporter", nullptr, nullptr, const_cast<char**>(argv), environ))) { perror("posix_spawn"); } else { @@ -84,7 +114,7 @@ static void launch_crash_reporter(const String& coredump_path) int main() { - if (pledge("stdio rpath proc exec", nullptr) < 0) { + if (pledge("stdio rpath wpath cpath proc exec", nullptr) < 0) { perror("pledge"); return 1; } @@ -96,9 +126,12 @@ int main() if (event.value().type != Core::FileWatcherEvent::Type::ChildAdded) continue; auto coredump_path = event.value().child_path; + if (coredump_path.ends_with(".gz")) + continue; // stops compress_coredump from accidentally triggering us dbgln("New coredump file: {}", coredump_path); wait_until_coredump_is_ready(coredump_path); + auto compressed = compress_coredump(coredump_path); print_backtrace(coredump_path); - launch_crash_reporter(coredump_path); + launch_crash_reporter(coredump_path, compressed); } } diff --git a/Userland/Services/SystemServer/main.cpp b/Userland/Services/SystemServer/main.cpp index 8773dc3b45..b7da5d2965 100644 --- a/Userland/Services/SystemServer/main.cpp +++ b/Userland/Services/SystemServer/main.cpp @@ -185,7 +185,8 @@ static void create_tmp_coredump_directory() { dbgln("Creating /tmp/coredump directory"); auto old_umask = umask(0); - auto rc = mkdir("/tmp/coredump", 0755); + // FIXME: the coredump directory should be made read-only once CrashDaemon is no longer responsible for compressing coredumps + auto rc = mkdir("/tmp/coredump", 0777); if (rc < 0) { perror("mkdir(/tmp/coredump)"); VERIFY_NOT_REACHED(); |