diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-12 15:21:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 15:21:37 +0200 |
| commit | 704f2c5d857cd057e65eef0627ed3dbff348f178 (patch) | |
| tree | f4a572d72906b493a676f1c3df22a1517097877e | |
| parent | 082f398481648e826818c755c55a0a67826c51b7 (diff) | |
| parent | 746bfc366244373b8d385b3761e14cb2c9eaa1fc (diff) | |
Merge pull request #29615 from Calinou/fix-editor-monitor-large-sizes
Fix display of large sizes in the editor monitors
| -rw-r--r-- | core/ustring.cpp | 2 | ||||
| -rw-r--r-- | editor/script_editor_debugger.cpp | 16 |
2 files changed, 3 insertions, 15 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp index 741c825448..7ed23fa2c2 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -3221,7 +3221,7 @@ static int _humanize_digits(int p_num) { String String::humanize_size(size_t p_size) { uint64_t _div = 1; - static const char *prefix[] = { " Bytes", " KB", " MB", " GB", "TB", " PB", "HB", "" }; + static const char *prefix[] = { " Bytes", " KB", " MB", " GB", " TB", " PB", " EB", "" }; int prefix_idx = 0; while (p_size > (_div * 1024) && prefix[prefix_idx][0]) { diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index c3b62810f1..3b086c6316 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -727,20 +727,8 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da String tt = vs; switch (Performance::MonitorType((int)perf_items[i]->get_metadata(1))) { case Performance::MONITOR_TYPE_MEMORY: { - // for the time being, going above GBs is a bad sign. - String unit = "B"; - if ((int)v > 1073741824) { - unit = "GB"; - v /= 1073741824.0; - } else if ((int)v > 1048576) { - unit = "MB"; - v /= 1048576.0; - } else if ((int)v > 1024) { - unit = "KB"; - v /= 1024.0; - } - tt += " bytes"; - vs = String::num(v, 2) + " " + unit; + vs = String::humanize_size(v); + tt = vs; } break; case Performance::MONITOR_TYPE_TIME: { tt += " seconds"; |