From 702d7e620ff8ce8c2b49700f8c784a2dac66e556 Mon Sep 17 00:00:00 2001 From: Mayeul Cantan Date: Tue, 19 Jul 2022 13:42:28 +0200 Subject: [PATCH 1/2] Better handle 32-bit platforms by limitting database size Experimentally, setting the database size to 2GB didn't work. These values are quite arbitrary, and should probably be settings or automatically adjusted. --- src/Cache.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Cache.cpp b/src/Cache.cpp index 79a5ea04..9782ee99 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -46,10 +46,16 @@ static const std::string_view OLM_ACCOUNT_KEY("olm_account"); static const std::string_view CACHE_FORMAT_VERSION_KEY("cache_format_version"); static const std::string_view CURRENT_ONLINE_BACKUP_VERSION("current_online_backup_version"); +constexpr auto MAX_DBS = 32384UL; +#if Q_PROCESSOR_WORDSIZE == 8 // 64-bit +constexpr auto DB_SIZE = 32ULL * 1024ULL * 1024ULL * 1024ULL; // 32 GB constexpr size_t MAX_RESTORED_MESSAGES = 30'000; - -constexpr auto DB_SIZE = 32ULL * 1024ULL * 1024ULL * 1024ULL; // 32 GB -constexpr auto MAX_DBS = 32384UL; +#elif Q_PROCESSOR_WORDSIZE == 4 // 32-bit address space limits mmaps +constexpr auto DB_SIZE = 1ULL * 1024ULL * 1024ULL * 1024ULL; // 1 GB +constexpr size_t MAX_RESTORED_MESSAGES = 5'000; +#else +#error unknown word size on target CPU +#endif constexpr auto BATCH_SIZE = 100; //! Cache databases and their format. From fb2e019591a42f07b3431eee4ce39f6226f208fc Mon Sep 17 00:00:00 2001 From: Mayeul Cantan Date: Wed, 20 Jul 2022 12:44:07 +0200 Subject: [PATCH 2/2] fixup! Better handle 32-bit platforms by limitting database size --- src/Cache.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Cache.cpp b/src/Cache.cpp index 9782ee99..a4af4d25 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -46,17 +46,18 @@ static const std::string_view OLM_ACCOUNT_KEY("olm_account"); static const std::string_view CACHE_FORMAT_VERSION_KEY("cache_format_version"); static const std::string_view CURRENT_ONLINE_BACKUP_VERSION("current_online_backup_version"); -constexpr auto MAX_DBS = 32384UL; -#if Q_PROCESSOR_WORDSIZE == 8 // 64-bit +constexpr auto MAX_DBS = 32384UL; +constexpr auto BATCH_SIZE = 100; + +#if Q_PROCESSOR_WORDSIZE >= 5 // 40-bit or more, up to 2^(8*WORDSIZE) words addressable. constexpr auto DB_SIZE = 32ULL * 1024ULL * 1024ULL * 1024ULL; // 32 GB constexpr size_t MAX_RESTORED_MESSAGES = 30'000; #elif Q_PROCESSOR_WORDSIZE == 4 // 32-bit address space limits mmaps constexpr auto DB_SIZE = 1ULL * 1024ULL * 1024ULL * 1024ULL; // 1 GB constexpr size_t MAX_RESTORED_MESSAGES = 5'000; #else -#error unknown word size on target CPU +#error Not enough virtual address space for the database on target CPU #endif -constexpr auto BATCH_SIZE = 100; //! Cache databases and their format. //!