aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/memory.cpp
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2016-11-20 09:00:50 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2016-11-20 18:18:36 +0100
commitb7ff56db631be7416cf228dff89cb23d753e4ec8 (patch)
tree9a23fad0141ef7d693f6920256e4b83e8f699c03 /src/memory.cpp
parent29200089d2728b320d9862758ce2493e80116549 (diff)
downloadsciteco-b7ff56db631be7416cf228dff89cb23d753e4ec8.tar.gz
fixed glib warnings about using g_mem_set_vtable() and revised memory limiting
* we were basing the glib allocators on throwing std::bad_alloc just like the C++ operators. However, this always was unsafe since we were throwing exceptions across plain-C frames (Glib). Also, the memory vtable has been deprecated in Glib, resulting in ugly warnings. * Instead, we now let the C++ new/delete operators work like Glib by basing them on g_malloc/g_slice. This means they will assert and the application will terminate abnormally in case of OOM. OOMs cannot be handled properly anyway, so it is more important to have a good memory limiting mechanism. * Memory limiting has been completely revised. Instead of approximating undo stack sizes using virtual methods (which is unprecise and comes with a performance penalty), we now use a common base class SciTECO::Object to count the memory required by all objects allocated within SciTECO. This is less precise than using global replacement new/deletes which would allow us to control allocations in all C++ code including Scintilla, but they are only supported as of C++14 (GCC 5) and adding compile-time checks would be cumbersome. In any case, we're missing Glib allocations (esp. strings). * As a platform-specific extension, on Linux/glibc we use mallinfo() to count the exact memory usage of the process. On Windows, we use GetProcessMemoryInfo() -- the latter implementation is currently UNTESTED. * We use g_malloc() for new/delete operators when there is malloc_trim() since g_slice does not free heap chunks properly (probably does its own mmap()ing), rendering malloc_trim() ineffective. We've also benchmarked g_slice on Linux/glib (malloc_trim() shouldn't be available elsewhere) and found that it brings no significant performance benefit. On all other platforms, we use g_slice since it is assumed that it at least does not hurt. The new g_slice based allocators should be tested on MSVCRT since I assume that they bring a significant performance benefit on Windows. * Memory limiting does now work in batch mode as well and is still enabled by default. * The old UndoTokenWithSize CRTP hack could be removed. UndoStack operations should be a bit faster now. But on the other hand, there will be an overhead due to repeated memory limit checking on every processed character.
Diffstat (limited to 'src/memory.cpp')
-rw-r--r--src/memory.cpp168
1 files changed, 168 insertions, 0 deletions
diff --git a/src/memory.cpp b/src/memory.cpp
new file mode 100644
index 0000000..853e52f
--- /dev/null
+++ b/src/memory.cpp
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2012-2016 Robin Haberkorn
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+
+#include <glib.h>
+
+#include "sciteco.h"
+#include "memory.h"
+#include "error.h"
+#include "undo.h"
+
+#ifdef HAVE_WINDOWS_H
+/* here it shouldn't cause conflicts with other headers */
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <psapi.h>
+#endif
+
+namespace SciTECO {
+
+MemoryLimit memlimit;
+
+#ifdef HAVE_MALLINFO
+
+gsize
+MemoryLimit::get_usage(void)
+{
+ struct mallinfo info = mallinfo();
+
+ /*
+ * NOTE: `uordblks` is an int and thus prone
+ * to wrap-around issues.
+ * Unfortunately, the only other machine readable
+ * alternative is malloc_info() which prints
+ * into a FILE * stream [sic!]
+ */
+ return info.uordblks;
+}
+
+#elif defined(G_OS_WIN32)
+
+gsize
+MemoryLimit::get_usage(void)
+{
+ PROCESS_MEMORY_COUNTERS info;
+
+ /*
+ * This __should__ not fail since the current process has
+ * PROCESS_ALL_ACCESS, but who knows...
+ * Since memory limiting cannot be turned off when this
+ * happens, we can just as well terminate abnormally.
+ */
+ if (G_UNLIKELY(!GetProcessMemoryInfo(GetCurrentProcess(),
+ &info, sizeof(info))) {
+ gchar *msg = g_win32_error_message(GetLastError());
+ g_error("Cannot get memory usage: %s", msg);
+ /* shouldn't be reached */
+ g_free(msg);
+ return 0;
+ }
+
+ return info.WorkingSetSize;
+}
+
+#else
+
+#define USE_MEMORY_COUNTING
+
+static gsize memory_usage = 0;
+
+gsize
+MemoryLimit::get_usage(void)
+{
+ return memory_usage;
+}
+
+#endif /* !HAVE_MALLINFO && !G_OS_WIN32 */
+
+void
+MemoryLimit::set_limit(gsize new_limit)
+{
+ gsize memory_usage = get_usage();
+
+ if (G_UNLIKELY(new_limit && memory_usage > new_limit)) {
+ gchar *usage_str = g_format_size(memory_usage);
+ gchar *limit_str = g_format_size(new_limit);
+
+ Error err("Cannot set undo memory limit (%s): "
+ "Current usage too large (%s).",
+ usage_str, limit_str);
+
+ g_free(limit_str);
+ g_free(usage_str);
+ throw err;
+ }
+
+ undo.push_var(limit) = new_limit;
+}
+
+void
+MemoryLimit::check(void)
+{
+ if (G_UNLIKELY(limit && get_usage() > limit)) {
+ gchar *limit_str = g_format_size(limit);
+
+ Error err("Memory limit (%s) exceeded. See <EJ> command.",
+ limit_str);
+
+ g_free(limit_str);
+ throw err;
+ }
+}
+
+void *
+Object::operator new(size_t size) noexcept
+{
+#ifdef USE_MEMORY_COUNTING
+ SciTECO::memory_usage += size;
+#endif
+
+#ifdef HAVE_MALLOC_TRIM
+ /*
+ * Using g_slice would render malloc_trim()
+ * ineffective. Also, it has been shown to be
+ * unnecessary on Linux/glibc.
+ */
+ return g_malloc(size);
+#else
+ return g_slice_alloc(size);
+#endif
+}
+
+void
+Object::operator delete(void *ptr, size_t size) noexcept
+{
+#ifdef HAVE_MALLOC_TRIM
+ g_free(ptr);
+#else
+ g_slice_free1(size, ptr);
+#endif
+
+#ifdef USE_MEMORY_COUNTING
+ SciTECO::memory_usage -= size;
+#endif
+}
+
+} /* namespace SciTECO */