Return libc_alloc_guard back to runtime-light

Author: mkornaukhov03

runtime-common/core/allocator/platform-malloc-interface.h

@@ -13,22 +13,8 @@
 #include "runtime-common/core/allocator/runtime-allocator.h"
 #include "runtime-common/core/utils/kphp-assert-core.h"
 
-namespace kphp::memory {
+namespace kphp::memory::platform {
 
-struct libc_alloc_guard final {
-  libc_alloc_guard() noexcept;
-  // AllocatorState::get_mutable().enable_libc_alloc();
-
-  ~libc_alloc_guard();
-  // AllocatorState::get_mutable().disable_libc_alloc();
-
-  libc_alloc_guard(const libc_alloc_guard&) = delete;
-  libc_alloc_guard(libc_alloc_guard&&) = delete;
-  libc_alloc_guard& operator=(const libc_alloc_guard&) = delete;
-  libc_alloc_guard& operator=(libc_alloc_guard&&) = delete;
-};
-
-namespace platform {
 constexpr int64_t MALLOC_REPLACER_SIZE_OFFSET = sizeof(size_t);
 constexpr uint64_t MALLOC_REPLACER_MAX_ALLOC = 0xFFFFFF00;
 
@@ -83,6 +69,4 @@ inline void* realloc(void* ptr, size_t new_size) noexcept {
   }
   return new_ptr;
 }
-} // namespace platform
-
-} // namespace kphp::memory
+} // namespace kphp::memory::platform

runtime-common/stdlib/kml/kphp_ml_interface.cpp

@@ -162,7 +162,6 @@ Optional<string> f$kml_get_custom_property(const string& model_name, const strin
     return {};
   }
 
-  auto guard = kphp::memory::libc_alloc_guard{};
   auto inner_result = p_kml->get_custom_property(kphp_ml::stl::string(property_name.c_str()));
 
   if (!inner_result.has_value()) {

runtime-light/allocator/allocator.h

@@ -8,9 +8,27 @@
 #include <cstddef>
 
 #include "runtime-common/core/allocator/script-allocator-managed.h"
+#include "runtime-light/allocator/allocator-state.h"
 
 template<std::derived_from<ScriptAllocatorManaged> T, typename... Args>
 requires std::constructible_from<T, Args...>
 auto make_unique_on_script_memory(Args&&... args) noexcept {
   return std::make_unique<T>(std::forward<Args>(args)...);
 }
+
+namespace kphp::memory {
+struct libc_alloc_guard final {
+  libc_alloc_guard() noexcept {
+    AllocatorState::get_mutable().enable_libc_alloc();
+  }
+
+  ~libc_alloc_guard() {
+    AllocatorState::get_mutable().disable_libc_alloc();
+  }
+
+  libc_alloc_guard(const libc_alloc_guard&) = delete;
+  libc_alloc_guard(libc_alloc_guard&&) = delete;
+  libc_alloc_guard& operator=(const libc_alloc_guard&) = delete;
+  libc_alloc_guard& operator=(libc_alloc_guard&&) = delete;
+};
+} // namespace kphp::memory

runtime-light/allocator/runtime-light-allocator.cpp

@@ -6,7 +6,7 @@
 #include <cstddef>
 #include <cstring>
 
-#include "runtime-common/core/allocator/platform-malloc-interface.h"
+#include "runtime-light/allocator/allocator.h"
 #include "runtime-light/allocator/allocator-state.h"
 #include "runtime-light/k2-platform/k2-api.h"
 #include "runtime-light/stdlib/diagnostics/logs.h"
@@ -114,15 +114,3 @@ void* RuntimeAllocator::realloc_global_memory(void* old_mem, size_t new_size, si
 void RuntimeAllocator::free_global_memory(void* mem, size_t /*unused*/) noexcept {
   k2::free(mem);
 }
-
-namespace kphp::memory {
-
-libc_alloc_guard::libc_alloc_guard() noexcept {
-  AllocatorState::get_mutable().enable_libc_alloc();
-}
-
-libc_alloc_guard::~libc_alloc_guard() {
-  AllocatorState::get_mutable().disable_libc_alloc();
-}
-
-} // namespace kphp::memory

runtime-light/state/component-state.h

@@ -10,11 +10,9 @@
 #include <string_view>
 
 #include "common/mixin/not_copyable.h"
-#include "runtime-common/core/allocator/platform-malloc-interface.h"
 #include "runtime-common/core/runtime-core.h"
 #include "runtime-common/stdlib/kml/kphp_ml_init.h"
 #include "runtime-light/allocator/allocator-state.h"
-#include "runtime-light/allocator/allocator.h"
 #include "runtime-light/k2-platform/k2-api.h"
 #include "runtime-light/stdlib/kml/kml-component-state.h"
 
@@ -37,7 +35,6 @@ struct ComponentState final : private vk::not_copyable {
     strncpy(buffer, kml_dir.c_str(), kml_dir.size() + 1); // Copy null terminator, too
     kml_component_state.kml_models_context.kml_directory = buffer;
 
-    kphp::memory::libc_alloc_guard guard;
     kml_init_models();
   }
 

runtime-light/stdlib/time/timelib-timezone-cache.h

@@ -13,7 +13,7 @@
 
 #include "kphp/timelib/timelib.h"
 
-#include "runtime-common/core/allocator/platform-malloc-interface.h"
+#include "runtime-light/allocator/allocator.h"
 #include "runtime-common/core/allocator/script-allocator.h"
 #include "runtime-common/core/std/containers.h"
 #include "runtime-light/stdlib/diagnostics/logs.h"

runtime/critical_section.cpp

@@ -44,13 +44,3 @@ void init_critical_section() noexcept {
 }
 
 } // namespace dl
-
-namespace kphp::memory {
-libc_alloc_guard::libc_alloc_guard() noexcept {
-  dl::enter_critical_section();
-}
-
-libc_alloc_guard::~libc_alloc_guard() {
-  dl::leave_critical_section();
-}
-} // namespace kphp::memory