Move runtime-core into runtime-common (#1126)

VKCOM · Oct 24, 2024 · 5e4b58a · 5e4b58a
1 parent 09783d0
commit 5e4b58a
Show file tree

Hide file tree

Showing 266 changed files with 398 additions and 406 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,8 @@ include(${COMMON_DIR}/common.cmake)
 include(${COMMON_DIR}/tl/tl.cmake)
 include(${COMMON_DIR}/unicode/unicode.cmake)
 
-include(${BASE_DIR}/runtime-core/runtime-core.cmake)
+include(${RUNTIME_COMMON_DIR}/runtime-common.cmake)
+
 if(COMPILE_RUNTIME_LIGHT)
     include(${BASE_DIR}/runtime-light/runtime-light.cmake)
     file(GLOB EXCLUDE_FILES "runtime/*")
@@ -51,6 +52,7 @@ else()
     include(${BASE_DIR}/server/server.cmake)
     file(GLOB EXCLUDE_FILES "runtime-light/*")
 endif()
+
 include(${BASE_DIR}/compiler/compiler.cmake)
 include(${BASE_DIR}/tests/tests.cmake)
 
@@ -85,7 +87,7 @@ endif ()
 
 install(DIRECTORY ${COMMON_DIR}
                   ${BASE_DIR}/runtime
-                  ${BASE_DIR}/runtime-core
+		  ${RUNTIME_COOMON_DIR}
                   ${BASE_DIR}/server
                   ${BASE_DIR}/third-party
         COMPONENT KPHP

diff --git a/cmake/init-global-vars.cmake b/cmake/init-global-vars.cmake
@@ -7,7 +7,7 @@ set(BIN_DIR ${OBJS_DIR}/bin)
 set(GENERATED_DIR "${OBJS_DIR}/generated")
 set(AUTO_DIR "${GENERATED_DIR}/auto")
 set(RUNTIME_LIGHT_DIR "${BASE_DIR}/runtime-light")
-set(RUNTIME_CORE_DIR "${BASE_DIR}/runtime-core")
+set(RUNTIME_COMMON_DIR "${BASE_DIR}/runtime-common")
 
 if(APPLE)
     set(CURL_LIB curl)

diff --git a/compiler/compiler-core.cpp b/compiler/compiler-core.cpp
@@ -647,7 +647,7 @@ const Index &CompilerCore::get_runtime_index() {
 }
 
 const Index &CompilerCore::get_runtime_core_index() {
-  return runtime_core_sources_index;
+  return runtime_common_sources_index;
 }
 
 const Index &CompilerCore::get_common_index() {
@@ -668,9 +668,9 @@ void CompilerCore::init_dest_dir() {
   cpp_dir = cpp_index.get_dir();
 }
 
-static std::vector<std::string> get_runtime_core_sources() {
+static std::vector<std::string> get_runtime_common_sources() {
 #ifdef RUNTIME_LIGHT
-  return split(RUNTIME_CORE_SOURCES, ';');
+  return split(RUNTIME_COMMON_SOURCES, ';');
 #else
   return {};
 #endif
@@ -693,17 +693,16 @@ static std::vector<std::string> get_common_sources() {
 }
 
 void CompilerCore::init_runtime_and_common_srcs_dir() {
-  runtime_core_sources_dir = settings().runtime_and_common_src.get() + "runtime-core/";
-  runtime_core_sources_index.sync_with_dir(runtime_core_sources_dir);
-  runtime_core_sources_dir = runtime_core_sources_index.get_dir();
-  runtime_core_sources_index.filter_with_whitelist(get_runtime_core_sources());
+  runtime_common_sources_dir = settings().runtime_and_common_src.get() + "runtime-common/";
+  runtime_common_sources_index.sync_with_dir(runtime_common_sources_dir);
+  runtime_common_sources_dir = runtime_common_sources_index.get_dir();
+  runtime_common_sources_index.filter_with_whitelist(get_runtime_common_sources());
 
   runtime_sources_dir = settings().runtime_and_common_src.get() + "runtime-light/";
   runtime_sources_index.sync_with_dir(runtime_sources_dir);
   runtime_sources_dir = runtime_sources_index.get_dir(); // As in init_dest_dir, IDK what is it for
   runtime_sources_index.filter_with_whitelist(get_runtime_sources());
 
-
   common_sources_dir = settings().runtime_and_common_src.get() + "common/";
   common_sources_index.sync_with_dir(common_sources_dir);
   common_sources_dir = common_sources_index.get_dir(); // As in init_dest_dir, IDK what is it for

diff --git a/compiler/compiler-core.h b/compiler/compiler-core.h
@@ -37,7 +37,7 @@ enum class OutputMode {
 class CompilerCore {
 private:
   Index cpp_index;
-  Index runtime_core_sources_index;
+  Index runtime_common_sources_index;
   Index runtime_sources_index;
   Index common_sources_index;
   TSHashTable<SrcFilePtr> file_ht;
@@ -68,7 +68,7 @@ class CompilerCore {
   std::string cpp_dir;
 
   // Don't like that, handle in another way
-  std::string runtime_core_sources_dir;
+  std::string runtime_common_sources_dir;
   std::string runtime_sources_dir;
   std::string common_sources_dir;
 

diff --git a/compiler/compiler.cmake b/compiler/compiler.cmake
@@ -7,7 +7,7 @@ if (COMPILE_RUNTIME_LIGHT)
     prepend(RUNTIME_BUILD_INFO ${KPHP_COMPILER_AUTO_DIR}/
         common_sources.h
         runtime_sources.h
-        runtime_core_sources.h
+        runtime_common_sources.h
         runtime_compile_flags.h)
 endif()
 

diff --git a/compiler/runtime_build_info.h b/compiler/runtime_build_info.h
@@ -4,7 +4,7 @@
 
 #include "auto/compiler/common_sources.h"
 #include "auto/compiler/runtime_compile_flags.h"
-#include "auto/compiler/runtime_core_sources.h"
+#include "auto/compiler/runtime_common_sources.h"
 #include "auto/compiler/runtime_sources.h"
 
 #endif
diff --git a/compiler/runtime_common_sources.h.in b/compiler/runtime_common_sources.h.in
@@ -0,0 +1,3 @@
+#pragma once
+
+#define RUNTIME_COMMON_SOURCES "${RUNTIME_COMMON_SOURCES_FOR_COMP}"
diff --git a/compiler/runtime_core_sources.h.in b/compiler/runtime_core_sources.h.in
diff --git a/runtime-core/allocator/runtime-allocator.h → ...common/core/allocator/runtime-allocator.h b/runtime-core/allocator/runtime-allocator.h → ...common/core/allocator/runtime-allocator.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <cstddef>
-#include "runtime-core/memory-resource/unsynchronized_pool_resource.h"
+#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h"
 
 
 struct RuntimeAllocator {

diff --git a/...core/allocator/script-allocator-managed.h → ...core/allocator/script-allocator-managed.h b/...core/allocator/script-allocator-managed.h → ...core/allocator/script-allocator-managed.h
@@ -6,7 +6,7 @@
 
 #include <cstddef>
 
-#include "runtime-core/allocator/runtime-allocator.h"
+#include "runtime-common/core/allocator/runtime-allocator.h"
 
 class ScriptAllocatorManaged {
 public:

diff --git a/...re/class-instance/class-instance-decl.inl → ...re/class-instance/class-instance-decl.inl b/...re/class-instance/class-instance-decl.inl → ...re/class-instance/class-instance-decl.inl
diff --git a/...me-core/class-instance/class-instance.inl → ...on/core/class-instance/class-instance.inl b/...me-core/class-instance/class-instance.inl → ...on/core/class-instance/class-instance.inl
diff --git a/...class-instance/refcountable-php-classes.h → ...class-instance/refcountable-php-classes.h b/...class-instance/refcountable-php-classes.h → ...class-instance/refcountable-php-classes.h
@@ -7,7 +7,7 @@
 
 #include "common/php-functions.h"
 
-#include "runtime-core/allocator/script-allocator-managed.h"
+#include "runtime-common/core/allocator/script-allocator-managed.h"
 
 class abstract_refcountable_php_interface : public ScriptAllocatorManaged {
 public:

diff --git a/...-core/core-types/comparison_operators.inl → .../core/core-types/comparison_operators.inl b/...-core/core-types/comparison_operators.inl → .../core/core-types/comparison_operators.inl
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "runtime-core/utils/migration-php8.h"
+#include "runtime-common/core/utils/migration-php8.h"
 
 #ifndef INCLUDED_FROM_KPHP_CORE
   #error "this file must be included only from runtime-core.h"

diff --git a/...ime-core/core-types/conversions_types.inl → ...mon/core/core-types/conversions_types.inl b/...ime-core/core-types/conversions_types.inl → ...mon/core/core-types/conversions_types.inl
diff --git a/runtime-core/core-types/decl/array_decl.inl → ...ommon/core/core-types/decl/array_decl.inl b/runtime-core/core-types/decl/array_decl.inl → ...ommon/core/core-types/decl/array_decl.inl
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "runtime-core/core-types/decl/array_iterator.h"
-#include "runtime-core/include.h"
+#include "runtime-common/core/core-types/decl/array_iterator.h"
+#include "runtime-common/core/include.h"
 
 #ifndef INCLUDED_FROM_KPHP_CORE
   #error "this file must be included only from runtime-core.h"

diff --git a/...ime-core/core-types/decl/array_iterator.h → ...mon/core/core-types/decl/array_iterator.h b/...ime-core/core-types/decl/array_iterator.h → ...mon/core/core-types/decl/array_iterator.h
@@ -7,7 +7,7 @@
 #include "common/type_traits/list_of_types.h"
 #include "common/sanitizer.h"
 
-#include "runtime-core/core-types/decl/declarations.h"
+#include "runtime-common/core/core-types/decl/declarations.h"
 
 template<class T>
 class array_iterator {

diff --git a/runtime-core/core-types/decl/declarations.h → ...ommon/core/core-types/decl/declarations.h b/runtime-core/core-types/decl/declarations.h → ...ommon/core/core-types/decl/declarations.h
diff --git a/runtime-core/core-types/decl/mixed_decl.inl → ...ommon/core/core-types/decl/mixed_decl.inl b/runtime-core/core-types/decl/mixed_decl.inl → ...ommon/core/core-types/decl/mixed_decl.inl
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "common/smart_ptrs/intrusive_ptr.h"
-#include "runtime-core/class-instance/refcountable-php-classes.h"
+#include "runtime-common/core/class-instance/refcountable-php-classes.h"
 
 
 #ifndef INCLUDED_FROM_KPHP_CORE

diff --git a/runtime-core/core-types/decl/optional.h → ...me-common/core/core-types/decl/optional.h b/runtime-core/core-types/decl/optional.h → ...me-common/core/core-types/decl/optional.h
@@ -10,8 +10,8 @@
 #include "common/type_traits/is_constructible.h"
 #include "common/type_traits/list_of_types.h"
 
-#include "runtime-core/utils/kphp-assert-core.h"
-#include "runtime-core/core-types/decl/declarations.h"
+#include "runtime-common/core/utils/kphp-assert-core.h"
+#include "runtime-common/core/core-types/decl/declarations.h"
 
 template<class T>
 class Optional;

diff --git a/runtime-core/core-types/decl/shape.h → runtime-common/core/core-types/decl/shape.h b/runtime-core/core-types/decl/shape.h → runtime-common/core/core-types/decl/shape.h
diff --git a/...re/core-types/decl/string_buffer_decl.inl → ...re/core-types/decl/string_buffer_decl.inl b/...re/core-types/decl/string_buffer_decl.inl → ...re/core-types/decl/string_buffer_decl.inl
diff --git a/runtime-core/core-types/decl/string_decl.inl → ...mmon/core/core-types/decl/string_decl.inl b/runtime-core/core-types/decl/string_decl.inl → ...mmon/core/core-types/decl/string_decl.inl
diff --git a/runtime-core/core-types/definition/array.inl → ...mmon/core/core-types/definition/array.inl b/runtime-core/core-types/definition/array.inl → ...mmon/core/core-types/definition/array.inl
diff --git a/runtime-core/core-types/definition/mixed.cpp → ...mmon/core/core-types/definition/mixed.cpp b/runtime-core/core-types/definition/mixed.cpp → ...mmon/core/core-types/definition/mixed.cpp
@@ -3,7 +3,7 @@
 // Distributed under the GPL v3 License, see LICENSE.notice.txt
 
 #include "common/wrappers/likely.h"
-#include "runtime-core/runtime-core.h"
+#include "runtime-common/core/runtime-core.h"
 
 void mixed::copy_from(const mixed &other) {
   switch (other.get_type()) {

diff --git a/runtime-core/core-types/definition/mixed.inl → ...mmon/core/core-types/definition/mixed.inl b/runtime-core/core-types/definition/mixed.inl → ...mmon/core/core-types/definition/mixed.inl
@@ -7,8 +7,8 @@
 #include "common/algorithms/find.h"
 #include "common/smart_ptrs/intrusive_ptr.h"
 
-#include "runtime-core/utils/migration-php8.h"
-#include "runtime-core/class-instance/refcountable-php-classes.h"
+#include "runtime-common/core/utils/migration-php8.h"
+#include "runtime-common/core/class-instance/refcountable-php-classes.h"
 
 #ifndef INCLUDED_FROM_KPHP_CORE
   #error "this file must be included only from runtime-core.h"

diff --git a/...ore/core-types/definition/null_coalesce.h → ...ore/core-types/definition/null_coalesce.h b/...ore/core-types/definition/null_coalesce.h → ...ore/core-types/definition/null_coalesce.h
@@ -5,8 +5,8 @@
 #pragma once
 #include <type_traits>
 
-#include "runtime-core/include.h"
-#include "runtime-core/runtime-core.h"
+#include "runtime-common/core/include.h"
+#include "runtime-common/core/runtime-core.h"
 
 namespace impl_ {
 

diff --git a/...ime-core/core-types/definition/string.cpp → ...mon/core/core-types/definition/string.cpp b/...ime-core/core-types/definition/string.cpp → ...mon/core/core-types/definition/string.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) 2021 LLC «V Kontakte»
 // Distributed under the GPL v3 License, see LICENSE.notice.txt
 
-#include "runtime-core/runtime-core.h"
+#include "runtime-common/core/runtime-core.h"
 
 // Don't move this destructor to the headers, it spoils addr2line traces
 string::~string() noexcept {

diff --git a/...ime-core/core-types/definition/string.inl → ...mon/core/core-types/definition/string.inl b/...ime-core/core-types/definition/string.inl → ...mon/core/core-types/definition/string.inl
@@ -8,8 +8,8 @@
 
 #include "common/algorithms/simd-int-to-string.h"
 
-#include "runtime-core/utils/migration-php8.h"
-#include "runtime-core/core-types/definition/string_cache.h"
+#include "runtime-common/core/utils/migration-php8.h"
+#include "runtime-common/core/core-types/definition/string_cache.h"
 
 #ifndef INCLUDED_FROM_KPHP_CORE
   #error "this file must be included only from runtime-core.h"

diff --git a/...e/core-types/definition/string_buffer.cpp → ...e/core-types/definition/string_buffer.cpp b/...e/core-types/definition/string_buffer.cpp → ...e/core-types/definition/string_buffer.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) 2020 LLC «V Kontakte»
 // Distributed under the GPL v3 License, see LICENSE.notice.txt
 
-#include "runtime-core/runtime-core.h"
+#include "runtime-common/core/runtime-core.h"
 
 string_buffer::string_buffer(string::size_type buffer_len) noexcept:
   buffer_end(static_cast<char *>(RuntimeAllocator::current().alloc_global_memory(buffer_len))),

diff --git a/...e/core-types/definition/string_buffer.inl → ...e/core-types/definition/string_buffer.inl b/...e/core-types/definition/string_buffer.inl → ...e/core-types/definition/string_buffer.inl
diff --git a/...re/core-types/definition/string_cache.cpp → ...re/core-types/definition/string_cache.cpp b/...re/core-types/definition/string_cache.cpp → ...re/core-types/definition/string_cache.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) 2020 LLC «V Kontakte»
 // Distributed under the GPL v3 License, see LICENSE.notice.txt
 
-#include "runtime-core/runtime-core.h"
+#include "runtime-common/core/runtime-core.h"
 
 constexpr auto string_cache::constexpr_make_large_ints() noexcept {
   return constexpr_make_ints(std::make_index_sequence<cached_int_max() / 10>{});

diff --git a/...core/core-types/definition/string_cache.h → ...core/core-types/definition/string_cache.h b/...core/core-types/definition/string_cache.h → ...core/core-types/definition/string_cache.h
@@ -9,7 +9,7 @@
 
 #include "common/php-functions.h"
 
-#include "runtime-core/runtime-core.h"
+#include "runtime-common/core/runtime-core.h"
 
 class string_cache {
 private:

diff --git a/runtime-core/core-types/kphp_type_traits.h → ...common/core/core-types/kphp_type_traits.h b/runtime-core/core-types/kphp_type_traits.h → ...common/core/core-types/kphp_type_traits.h
@@ -8,9 +8,9 @@
 
 #include "common/type_traits/list_of_types.h"
 
-#include "runtime-core/core-types/decl/declarations.h"
-#include "runtime-core/core-types/decl/optional.h"
-#include "runtime-core/core-types/decl/shape.h"
+#include "runtime-common/core/core-types/decl/declarations.h"
+#include "runtime-common/core/core-types/decl/optional.h"
+#include "runtime-common/core/core-types/decl/shape.h"
 
 template<typename>
 struct is_array : std::false_type {

diff --git a/runtime-common/core/core.cmake b/runtime-common/core/core.cmake
@@ -0,0 +1,10 @@
+prepend(CORE_UTILS core/utils/ migration-php8.cpp)
+
+prepend(CORE_TYPES core/core-types/definition/ mixed.cpp string.cpp
+        string_buffer.cpp string_cache.cpp)
+
+prepend(CORE_MEMORY_RESOURCE core/memory-resource/
+        details/memory_chunk_tree.cpp details/memory_ordered_chunk_list.cpp
+        monotonic_buffer_resource.cpp unsynchronized_pool_resource.cpp)
+
+set(CORE_SRC ${CORE_UTILS} ${CORE_TYPES} ${CORE_MEMORY_RESOURCE})
diff --git a/runtime-core/include.h → runtime-common/core/include.h b/runtime-core/include.h → runtime-common/core/include.h
@@ -11,10 +11,10 @@
 #include "common/wrappers/likely.h"
 
 #include "common/php-functions.h"
-#include "runtime-core/core-types/decl/declarations.h"
-#include "runtime-core/core-types/kphp_type_traits.h"
-#include "runtime-core/core-types/decl/optional.h"
-#include "runtime-core/utils/kphp-assert-core.h"
+#include "runtime-common/core/core-types/decl/declarations.h"
+#include "runtime-common/core/core-types/kphp_type_traits.h"
+#include "runtime-common/core/core-types/decl/optional.h"
+#include "runtime-common/core/utils/kphp-assert-core.h"
 
 #define COMMA ,
 

diff --git a/...mory-resource/details/memory_chunk_list.h → ...mory-resource/details/memory_chunk_list.h b/...mory-resource/details/memory_chunk_list.h → ...mory-resource/details/memory_chunk_list.h
@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "runtime-core/memory-resource/memory_resource.h"
+#include "runtime-common/core/memory-resource/memory_resource.h"
 
 namespace memory_resource {
 namespace details {

diff --git a/...ry-resource/details/memory_chunk_tree.cpp → ...ry-resource/details/memory_chunk_tree.cpp b/...ry-resource/details/memory_chunk_tree.cpp → ...ry-resource/details/memory_chunk_tree.cpp
@@ -7,8 +7,8 @@
 #include <new>
 #include <utility>
 
-#include "runtime-core/memory-resource/details/memory_ordered_chunk_list.h"
-#include "runtime-core/utils/kphp-assert-core.h"
+#include "runtime-common/core/memory-resource/details/memory_ordered_chunk_list.h"
+#include "runtime-common/core/utils/kphp-assert-core.h"
 
 namespace memory_resource {
 namespace details {

diff --git a/...mory-resource/details/memory_chunk_tree.h → ...mory-resource/details/memory_chunk_tree.h b/...mory-resource/details/memory_chunk_tree.h → ...mory-resource/details/memory_chunk_tree.h
@@ -6,7 +6,7 @@
 
 #include "common/mixin/not_copyable.h"
 
-#include "runtime-core/memory-resource/memory_resource.h"
+#include "runtime-common/core/memory-resource/memory_resource.h"
 
 namespace memory_resource {
 namespace details {

diff --git a/...rce/details/memory_ordered_chunk_list.cpp → ...rce/details/memory_ordered_chunk_list.cpp b/...rce/details/memory_ordered_chunk_list.cpp → ...rce/details/memory_ordered_chunk_list.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) 2020 LLC «V Kontakte»
 // Distributed under the GPL v3 License, see LICENSE.notice.txt
 
-#include "runtime-core/memory-resource/details/memory_ordered_chunk_list.h"
+#include "runtime-common/core/memory-resource/details/memory_ordered_chunk_list.h"
 
 #include <algorithm>
 #include <cstdint>

diff --git a/...ource/details/memory_ordered_chunk_list.h → ...ource/details/memory_ordered_chunk_list.h b/...ource/details/memory_ordered_chunk_list.h → ...ource/details/memory_ordered_chunk_list.h
@@ -10,8 +10,8 @@
 
 #include "common/mixin/not_copyable.h"
 
-#include "runtime-core/memory-resource/memory_resource.h"
-#include "runtime-core/utils/kphp-assert-core.h"
+#include "runtime-common/core/memory-resource/memory_resource.h"
+#include "runtime-common/core/utils/kphp-assert-core.h"
 
 namespace memory_resource {
 namespace details {

diff --git a/...y-resource/details/universal_reallocate.h → ...y-resource/details/universal_reallocate.h b/...y-resource/details/universal_reallocate.h → ...y-resource/details/universal_reallocate.h
@@ -6,7 +6,7 @@
 
 #include <cstring>
 
-#include "runtime-core/memory-resource/memory_resource.h"
+#include "runtime-common/core/memory-resource/memory_resource.h"
 
 namespace memory_resource {
 namespace details {

diff --git a/...-core/memory-resource/extra-memory-pool.h → .../core/memory-resource/extra-memory-pool.h b/...-core/memory-resource/extra-memory-pool.h → .../core/memory-resource/extra-memory-pool.h
diff --git a/...me-core/memory-resource/memory_resource.h → ...on/core/memory-resource/memory_resource.h b/...me-core/memory-resource/memory_resource.h → ...on/core/memory-resource/memory_resource.h
diff --git a/...ry-resource/monotonic_buffer_resource.cpp → ...ry-resource/monotonic_buffer_resource.cpp b/...ry-resource/monotonic_buffer_resource.cpp → ...ry-resource/monotonic_buffer_resource.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) 2020 LLC «V Kontakte»
 // Distributed under the GPL v3 License, see LICENSE.notice.txt
 
-#include "runtime-core/memory-resource/monotonic_buffer_resource.h"
+#include "runtime-common/core/memory-resource/monotonic_buffer_resource.h"
 
 namespace memory_resource {
 

diff --git a/...mory-resource/monotonic_buffer_resource.h → ...mory-resource/monotonic_buffer_resource.h b/...mory-resource/monotonic_buffer_resource.h → ...mory-resource/monotonic_buffer_resource.h
@@ -10,9 +10,9 @@
 #include "common/mixin/not_copyable.h"
 #include "common/wrappers/likely.h"
 
-#include "runtime-core/memory-resource/details/universal_reallocate.h"
-#include "runtime-core/memory-resource/memory_resource.h"
-#include "runtime-core/utils/kphp-assert-core.h"
+#include "runtime-common/core/memory-resource/details/universal_reallocate.h"
+#include "runtime-common/core/memory-resource/memory_resource.h"
+#include "runtime-common/core/utils/kphp-assert-core.h"
 
 namespace memory_resource {