Merge branch 'master' into soc-2020-io-performancesoc-2020-io-performance

1 files changed, 48 insertions, 0 deletions

diff --git a/intern/cycles/util/guarded_allocator.cpp b/intern/cycles/util/guarded_allocator.cpp
new file mode 100644
index 00000000000..4063b301331
--- /dev/null
+++ b/intern/cycles/util/guarded_allocator.cpp
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2011-2015 Blender Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "util/guarded_allocator.h"
+#include "util/stats.h"
+
+CCL_NAMESPACE_BEGIN
+
+static Stats global_stats(Stats::static_init);
+
+/* Internal API. */
+
+void util_guarded_mem_alloc(size_t n)
+{
+  global_stats.mem_alloc(n);
+}
+
+void util_guarded_mem_free(size_t n)
+{
+  global_stats.mem_free(n);
+}
+
+/* Public API. */
+
+size_t util_guarded_get_mem_used()
+{
+  return global_stats.mem_used;
+}
+
+size_t util_guarded_get_mem_peak()
+{
+  return global_stats.mem_peak;
+}
+
+CCL_NAMESPACE_END