diff options
| author | Stefan Boberg <[email protected]> | 2021-05-16 22:11:30 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-05-16 22:11:30 +0200 |
| commit | 46482fab4517db13b5435b41e85ea44d7f666830 (patch) | |
| tree | 17766ff6a81561a219f49e06a4a5c96e9b952010 | |
| parent | HTTP: added some basic comments to httpserver.h (diff) | |
| download | zen-46482fab4517db13b5435b41e85ea44d7f666830.tar.xz zen-46482fab4517db13b5435b41e85ea44d7f666830.zip | |
Removed some experimental dependencies
| -rw-r--r-- | vcpkg.json | 6 | ||||
| -rw-r--r-- | zencore/compactbinary.cpp | 18 | ||||
| -rw-r--r-- | zenserver/diag/crashreport.cpp | 77 |
3 files changed, 3 insertions, 98 deletions
diff --git a/vcpkg.json b/vcpkg.json index 573e5b4bc..793abeab0 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,7 +3,6 @@ "version-string": "0.1.0-dev", "dependencies": [ "asio", - "curl", "cpr", "openssl", "json11", @@ -13,11 +12,9 @@ "zstd", "xxhash", "gsl-lite", - "restinio", "cxxopts", "doctest", "modp-base64", - "ryml", "http-parser", "lmdb", "robin-map", @@ -25,7 +22,6 @@ "name": "rocksdb", "features": [ "lz4", "zstd" ] }, - "sol2", - "breakpad" + "sol2" ] } diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp index cae6c506d..b42bcec7e 100644 --- a/zencore/compactbinary.cpp +++ b/zencore/compactbinary.cpp @@ -7,7 +7,6 @@ #include <zencore/trace.h> #include <doctest/doctest.h> -#include <ryml/ryml.hpp> #include <string_view> namespace zen { @@ -1111,23 +1110,6 @@ SaveCompactBinary(BinaryWriter& Ar, const CbObjectView& Object) ////////////////////////////////////////////////////////////////////////// -StringBuilderBase& -ToString(CbObjectView& Root, StringBuilderBase& OutString) -{ - ryml::Tree Tree; - - ryml::NodeRef r = Tree.rootref(); - r |= ryml::MAP; - - for (CbFieldViewIterator It = Root.CreateViewIterator(); It; ++It) - { - } - - return OutString; -} - -////////////////////////////////////////////////////////////////////////// - void uson_forcelink() { diff --git a/zenserver/diag/crashreport.cpp b/zenserver/diag/crashreport.cpp index 03e74ca5c..b9b8b5020 100644 --- a/zenserver/diag/crashreport.cpp +++ b/zenserver/diag/crashreport.cpp @@ -5,81 +5,8 @@ #include <zencore/filesystem.h> #include <zencore/zencore.h> -#include <client/windows/handler/exception_handler.h> - -#include <filesystem> - -// A callback function to run after the minidump has been written. -// minidump_id is a unique id for the dump, so the minidump -// file is <dump_path>\<minidump_id>.dmp. context is the parameter supplied -// by the user as callback_context when the handler was created. exinfo -// points to the exception record, or NULL if no exception occurred. -// succeeded indicates whether a minidump file was successfully written. -// assertion points to information about an assertion if the handler was -// invoked by an assertion. -// -// If an exception occurred and the callback returns true, Breakpad will treat -// the exception as fully-handled, suppressing any other handlers from being -// notified of the exception. If the callback returns false, Breakpad will -// treat the exception as unhandled, and allow another handler to handle it. -// If there are no other handlers, Breakpad will report the exception to the -// system as unhandled, allowing a debugger or native crash dialog the -// opportunity to handle the exception. Most callback implementations -// should normally return the value of |succeeded|, or when they wish to -// not report an exception of handled, false. Callbacks will rarely want to -// return true directly (unless |succeeded| is true). -// -// For out-of-process dump generation, dump path and minidump ID will always -// be NULL. In case of out-of-process dump generation, the dump path and -// minidump id are controlled by the server process and are not communicated -// back to the crashing process. - -static bool -CrashMinidumpCallback(const wchar_t* dump_path, - const wchar_t* minidump_id, - void* context, - EXCEPTION_POINTERS* exinfo, - MDRawAssertionInfo* assertion, - bool succeeded) -{ - ZEN_UNUSED(dump_path, minidump_id, context, exinfo, assertion, succeeded); - - // TODO! - return succeeded; -} - -// A callback function to run before Breakpad performs any substantial -// processing of an exception. A FilterCallback is called before writing -// a minidump. context is the parameter supplied by the user as -// callback_context when the handler was created. exinfo points to the -// exception record, if any; assertion points to assertion information, -// if any. -// -// If a FilterCallback returns true, Breakpad will continue processing, -// attempting to write a minidump. If a FilterCallback returns false, -// Breakpad will immediately report the exception as unhandled without -// writing a minidump, allowing another handler the opportunity to handle it. - -bool -CrashFilterCallback(void* context, EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion) -{ - ZEN_UNUSED(context, exinfo, assertion); - - // Yes, write a dump - return false; -} - void -InitializeCrashReporting(const std::filesystem::path& DumpPath) +InitializeCrashReporting(const std::filesystem::path&) { - // handler_types specifies the types of handlers that should be installed. - - zen::CreateDirectories(DumpPath); - - static google_breakpad::ExceptionHandler _(DumpPath.native().c_str(), // Dump path - CrashFilterCallback, // Filter Callback - CrashMinidumpCallback, // Minidump callback - nullptr, // Callback context - google_breakpad::ExceptionHandler::HANDLER_ALL // Handler Types - ); + // TODO: properly implement crash reporting } |