summaryrefslogtreecommitdiff
path: root/src/script/squirrel.hpp
diff options
context:
space:
mode:
authorNiels Martin Hansen <nielsm@indvikleren.dk>2019-04-15 19:49:30 +0200
committerNiels Martin Hansen <nielsm@indvikleren.dk>2019-05-11 15:34:33 +0200
commit140a96b3a0fa652b66c701ac941cebc17ff24622 (patch)
treeec64deb3e7ef5032dc18991cf5bb0d4eede52fb5 /src/script/squirrel.hpp
parentc9fe6e7b8fde3a23f6aab3b55fd8cca639d49696 (diff)
downloadopenttd-140a96b3a0fa652b66c701ac941cebc17ff24622.tar.xz
Change: Limit memory allocations for each Squirrel instance
This can avoid out-of-memory situations due to single scripts using up the entire address space. Instead, scripts that go above the maximum are killed. The maximum is default 1 GB per script, but can be configured by a setting.
Diffstat (limited to 'src/script/squirrel.hpp')
-rw-r--r--src/script/squirrel.hpp30
1 files changed, 30 insertions, 0 deletions
diff --git a/src/script/squirrel.hpp b/src/script/squirrel.hpp
index bec41f575..d0d02e80f 100644
--- a/src/script/squirrel.hpp
+++ b/src/script/squirrel.hpp
@@ -20,7 +20,11 @@ enum ScriptType {
ST_GS, ///< The script is for Game scripts.
};
+struct ScriptAllocator;
+
class Squirrel {
+ friend class ScriptAllocatorScope;
+
private:
typedef void (SQPrintFunc)(bool error_msg, const SQChar *message);
@@ -30,6 +34,7 @@ private:
bool crashed; ///< True if the squirrel script made an error.
int overdrawn_ops; ///< The amount of operations we have overdrawn.
const char *APIName; ///< Name of the API used for this squirrel.
+ std::unique_ptr<ScriptAllocator> allocator; ///< Allocator object used by this script.
/**
* The internal RunError handler. It looks up the real error and calls RunError with it.
@@ -272,6 +277,31 @@ public:
* Completely reset the engine; start from scratch.
*/
void Reset();
+
+ /**
+ * Get number of bytes allocated by this VM.
+ */
+ size_t GetAllocatedMemory() const noexcept;
+};
+
+
+extern ScriptAllocator *_squirrel_allocator;
+
+class ScriptAllocatorScope {
+ ScriptAllocator *old_allocator;
+
+public:
+ ScriptAllocatorScope(const Squirrel *engine)
+ {
+ this->old_allocator = _squirrel_allocator;
+ /* This may get called with a nullptr engine, in case of a crashed script */
+ _squirrel_allocator = engine != nullptr ? engine->allocator.get() : nullptr;
+ }
+
+ ~ScriptAllocatorScope()
+ {
+ _squirrel_allocator = this->old_allocator;
+ }
};
#endif /* SQUIRREL_HPP */