diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a44c5e272..d318f5c39a 100644 --- 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 index 34a1f81410..2fe33ef78f 100644 --- 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 index bebcc37411..9b2c88bfaf 100644 --- 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 get_runtime_core_sources() { +static std::vector 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 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 index 7d02d4e180..238b4de484 100644 --- 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 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 index 17bbbb8967..24f0efa2d4 100644 --- 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 index 482f9044a4..0cc05a8cd9 100644 --- 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 new file mode 100644 index 0000000000..c57bd03849 --- /dev/null +++ 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 deleted file mode 100644 index c9829e6a13..0000000000 --- a/compiler/runtime_core_sources.h.in +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define RUNTIME_CORE_SOURCES "${RUNTIME_CORE_SOURCES_FOR_COMP}" diff --git a/runtime-core/allocator/runtime-allocator.h b/runtime-common/core/allocator/runtime-allocator.h similarity index 92% rename from runtime-core/allocator/runtime-allocator.h rename to runtime-common/core/allocator/runtime-allocator.h index 9b31e1d7a8..8264a07392 100644 --- a/runtime-core/allocator/runtime-allocator.h +++ b/runtime-common/core/allocator/runtime-allocator.h @@ -5,7 +5,7 @@ #pragma once #include -#include "runtime-core/memory-resource/unsynchronized_pool_resource.h" +#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h" struct RuntimeAllocator { diff --git a/runtime-core/allocator/script-allocator-managed.h b/runtime-common/core/allocator/script-allocator-managed.h similarity index 92% rename from runtime-core/allocator/script-allocator-managed.h rename to runtime-common/core/allocator/script-allocator-managed.h index 67598cc89a..f51f642539 100644 --- a/runtime-core/allocator/script-allocator-managed.h +++ b/runtime-common/core/allocator/script-allocator-managed.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/allocator/runtime-allocator.h" +#include "runtime-common/core/allocator/runtime-allocator.h" class ScriptAllocatorManaged { public: diff --git a/runtime-core/class-instance/class-instance-decl.inl b/runtime-common/core/class-instance/class-instance-decl.inl similarity index 100% rename from runtime-core/class-instance/class-instance-decl.inl rename to runtime-common/core/class-instance/class-instance-decl.inl diff --git a/runtime-core/class-instance/class-instance.inl b/runtime-common/core/class-instance/class-instance.inl similarity index 100% rename from runtime-core/class-instance/class-instance.inl rename to runtime-common/core/class-instance/class-instance.inl diff --git a/runtime-core/class-instance/refcountable-php-classes.h b/runtime-common/core/class-instance/refcountable-php-classes.h similarity index 98% rename from runtime-core/class-instance/refcountable-php-classes.h rename to runtime-common/core/class-instance/refcountable-php-classes.h index 04c54f164c..3d919255ac 100644 --- a/runtime-core/class-instance/refcountable-php-classes.h +++ b/runtime-common/core/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/runtime-core/core-types/comparison_operators.inl b/runtime-common/core/core-types/comparison_operators.inl similarity index 99% rename from runtime-core/core-types/comparison_operators.inl rename to runtime-common/core/core-types/comparison_operators.inl index 9589e9bf78..f7b6f2eb89 100644 --- a/runtime-core/core-types/comparison_operators.inl +++ b/runtime-common/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/runtime-core/core-types/conversions_types.inl b/runtime-common/core/core-types/conversions_types.inl similarity index 100% rename from runtime-core/core-types/conversions_types.inl rename to runtime-common/core/core-types/conversions_types.inl diff --git a/runtime-core/core-types/decl/array_decl.inl b/runtime-common/core/core-types/decl/array_decl.inl similarity index 99% rename from runtime-core/core-types/decl/array_decl.inl rename to runtime-common/core/core-types/decl/array_decl.inl index e85963cf64..893616334e 100644 --- a/runtime-core/core-types/decl/array_decl.inl +++ b/runtime-common/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/runtime-core/core-types/decl/array_iterator.h b/runtime-common/core/core-types/decl/array_iterator.h similarity index 98% rename from runtime-core/core-types/decl/array_iterator.h rename to runtime-common/core/core-types/decl/array_iterator.h index f4c6050a9f..c7304eea3f 100644 --- a/runtime-core/core-types/decl/array_iterator.h +++ b/runtime-common/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 array_iterator { diff --git a/runtime-core/core-types/decl/declarations.h b/runtime-common/core/core-types/decl/declarations.h similarity index 100% rename from runtime-core/core-types/decl/declarations.h rename to runtime-common/core/core-types/decl/declarations.h diff --git a/runtime-core/core-types/decl/mixed_decl.inl b/runtime-common/core/core-types/decl/mixed_decl.inl similarity index 99% rename from runtime-core/core-types/decl/mixed_decl.inl rename to runtime-common/core/core-types/decl/mixed_decl.inl index 6ae9e080a8..e407fd3a49 100644 --- a/runtime-core/core-types/decl/mixed_decl.inl +++ b/runtime-common/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 b/runtime-common/core/core-types/decl/optional.h similarity index 97% rename from runtime-core/core-types/decl/optional.h rename to runtime-common/core/core-types/decl/optional.h index 925549c56a..5bb88a927c 100644 --- a/runtime-core/core-types/decl/optional.h +++ b/runtime-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 Optional; diff --git a/runtime-core/core-types/decl/shape.h b/runtime-common/core/core-types/decl/shape.h similarity index 100% rename from runtime-core/core-types/decl/shape.h rename to runtime-common/core/core-types/decl/shape.h diff --git a/runtime-core/core-types/decl/string_buffer_decl.inl b/runtime-common/core/core-types/decl/string_buffer_decl.inl similarity index 100% rename from runtime-core/core-types/decl/string_buffer_decl.inl rename to runtime-common/core/core-types/decl/string_buffer_decl.inl diff --git a/runtime-core/core-types/decl/string_decl.inl b/runtime-common/core/core-types/decl/string_decl.inl similarity index 100% rename from runtime-core/core-types/decl/string_decl.inl rename to runtime-common/core/core-types/decl/string_decl.inl diff --git a/runtime-core/core-types/definition/array.inl b/runtime-common/core/core-types/definition/array.inl similarity index 100% rename from runtime-core/core-types/definition/array.inl rename to runtime-common/core/core-types/definition/array.inl diff --git a/runtime-core/core-types/definition/mixed.cpp b/runtime-common/core/core-types/definition/mixed.cpp similarity index 99% rename from runtime-core/core-types/definition/mixed.cpp rename to runtime-common/core/core-types/definition/mixed.cpp index cb2bfeb296..aa8bfa57a3 100644 --- a/runtime-core/core-types/definition/mixed.cpp +++ b/runtime-common/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 b/runtime-common/core/core-types/definition/mixed.inl similarity index 98% rename from runtime-core/core-types/definition/mixed.inl rename to runtime-common/core/core-types/definition/mixed.inl index fee5617ccb..055299533a 100644 --- a/runtime-core/core-types/definition/mixed.inl +++ b/runtime-common/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/runtime-core/core-types/definition/null_coalesce.h b/runtime-common/core/core-types/definition/null_coalesce.h similarity index 98% rename from runtime-core/core-types/definition/null_coalesce.h rename to runtime-common/core/core-types/definition/null_coalesce.h index 146c4e0ff3..7f39b9fd88 100644 --- a/runtime-core/core-types/definition/null_coalesce.h +++ b/runtime-common/core/core-types/definition/null_coalesce.h @@ -5,8 +5,8 @@ #pragma once #include -#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/runtime-core/core-types/definition/string.cpp b/runtime-common/core/core-types/definition/string.cpp similarity index 97% rename from runtime-core/core-types/definition/string.cpp rename to runtime-common/core/core-types/definition/string.cpp index a678261edb..ba8317310e 100644 --- a/runtime-core/core-types/definition/string.cpp +++ b/runtime-common/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/runtime-core/core-types/definition/string.inl b/runtime-common/core/core-types/definition/string.inl similarity index 99% rename from runtime-core/core-types/definition/string.inl rename to runtime-common/core/core-types/definition/string.inl index d2d3ed4bec..56f57cf586 100644 --- a/runtime-core/core-types/definition/string.inl +++ b/runtime-common/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/runtime-core/core-types/definition/string_buffer.cpp b/runtime-common/core/core-types/definition/string_buffer.cpp similarity index 91% rename from runtime-core/core-types/definition/string_buffer.cpp rename to runtime-common/core/core-types/definition/string_buffer.cpp index 3d4c4c121a..a25413859d 100644 --- a/runtime-core/core-types/definition/string_buffer.cpp +++ b/runtime-common/core/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(RuntimeAllocator::current().alloc_global_memory(buffer_len))), diff --git a/runtime-core/core-types/definition/string_buffer.inl b/runtime-common/core/core-types/definition/string_buffer.inl similarity index 100% rename from runtime-core/core-types/definition/string_buffer.inl rename to runtime-common/core/core-types/definition/string_buffer.inl diff --git a/runtime-core/core-types/definition/string_cache.cpp b/runtime-common/core/core-types/definition/string_cache.cpp similarity index 94% rename from runtime-core/core-types/definition/string_cache.cpp rename to runtime-common/core/core-types/definition/string_cache.cpp index 19e62b700f..b215200e7b 100644 --- a/runtime-core/core-types/definition/string_cache.cpp +++ b/runtime-common/core/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{}); diff --git a/runtime-core/core-types/definition/string_cache.h b/runtime-common/core/core-types/definition/string_cache.h similarity index 98% rename from runtime-core/core-types/definition/string_cache.h rename to runtime-common/core/core-types/definition/string_cache.h index 66d5e289d9..6541a0ab05 100644 --- a/runtime-core/core-types/definition/string_cache.h +++ b/runtime-common/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 b/runtime-common/core/core-types/kphp_type_traits.h similarity index 92% rename from runtime-core/core-types/kphp_type_traits.h rename to runtime-common/core/core-types/kphp_type_traits.h index 4ef0223afe..8766c536dd 100644 --- a/runtime-core/core-types/kphp_type_traits.h +++ b/runtime-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 struct is_array : std::false_type { diff --git a/runtime-common/core/core.cmake b/runtime-common/core/core.cmake new file mode 100644 index 0000000000..3e42221b8f --- /dev/null +++ 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 b/runtime-common/core/include.h similarity index 82% rename from runtime-core/include.h rename to runtime-common/core/include.h index 3c0070b6dd..267cdc1f91 100644 --- a/runtime-core/include.h +++ b/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/runtime-core/memory-resource/details/memory_chunk_list.h b/runtime-common/core/memory-resource/details/memory_chunk_list.h similarity index 94% rename from runtime-core/memory-resource/details/memory_chunk_list.h rename to runtime-common/core/memory-resource/details/memory_chunk_list.h index 721499097a..566a8aae6c 100644 --- a/runtime-core/memory-resource/details/memory_chunk_list.h +++ b/runtime-common/core/memory-resource/details/memory_chunk_list.h @@ -6,7 +6,7 @@ #include -#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/runtime-core/memory-resource/details/memory_chunk_tree.cpp b/runtime-common/core/memory-resource/details/memory_chunk_tree.cpp similarity index 98% rename from runtime-core/memory-resource/details/memory_chunk_tree.cpp rename to runtime-common/core/memory-resource/details/memory_chunk_tree.cpp index e20383ee7a..3009600eed 100644 --- a/runtime-core/memory-resource/details/memory_chunk_tree.cpp +++ b/runtime-common/core/memory-resource/details/memory_chunk_tree.cpp @@ -7,8 +7,8 @@ #include #include -#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/runtime-core/memory-resource/details/memory_chunk_tree.h b/runtime-common/core/memory-resource/details/memory_chunk_tree.h similarity index 95% rename from runtime-core/memory-resource/details/memory_chunk_tree.h rename to runtime-common/core/memory-resource/details/memory_chunk_tree.h index bc14e58108..c1a0ef1665 100644 --- a/runtime-core/memory-resource/details/memory_chunk_tree.h +++ b/runtime-common/core/memory-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/runtime-core/memory-resource/details/memory_ordered_chunk_list.cpp b/runtime-common/core/memory-resource/details/memory_ordered_chunk_list.cpp similarity index 97% rename from runtime-core/memory-resource/details/memory_ordered_chunk_list.cpp rename to runtime-common/core/memory-resource/details/memory_ordered_chunk_list.cpp index 954208acfa..d2988f2947 100644 --- a/runtime-core/memory-resource/details/memory_ordered_chunk_list.cpp +++ b/runtime-common/core/memory-resource/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 #include diff --git a/runtime-core/memory-resource/details/memory_ordered_chunk_list.h b/runtime-common/core/memory-resource/details/memory_ordered_chunk_list.h similarity index 94% rename from runtime-core/memory-resource/details/memory_ordered_chunk_list.h rename to runtime-common/core/memory-resource/details/memory_ordered_chunk_list.h index 0694a22488..c2010089c7 100644 --- a/runtime-core/memory-resource/details/memory_ordered_chunk_list.h +++ b/runtime-common/core/memory-resource/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/runtime-core/memory-resource/details/universal_reallocate.h b/runtime-common/core/memory-resource/details/universal_reallocate.h similarity index 92% rename from runtime-core/memory-resource/details/universal_reallocate.h rename to runtime-common/core/memory-resource/details/universal_reallocate.h index 96cb13639f..d5dad8b917 100644 --- a/runtime-core/memory-resource/details/universal_reallocate.h +++ b/runtime-common/core/memory-resource/details/universal_reallocate.h @@ -6,7 +6,7 @@ #include -#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/runtime-core/memory-resource/extra-memory-pool.h b/runtime-common/core/memory-resource/extra-memory-pool.h similarity index 100% rename from runtime-core/memory-resource/extra-memory-pool.h rename to runtime-common/core/memory-resource/extra-memory-pool.h diff --git a/runtime-core/memory-resource/memory_resource.h b/runtime-common/core/memory-resource/memory_resource.h similarity index 100% rename from runtime-core/memory-resource/memory_resource.h rename to runtime-common/core/memory-resource/memory_resource.h diff --git a/runtime-core/memory-resource/monotonic_buffer_resource.cpp b/runtime-common/core/memory-resource/monotonic_buffer_resource.cpp similarity index 87% rename from runtime-core/memory-resource/monotonic_buffer_resource.cpp rename to runtime-common/core/memory-resource/monotonic_buffer_resource.cpp index bbc5370659..7a6792a171 100644 --- a/runtime-core/memory-resource/monotonic_buffer_resource.cpp +++ b/runtime-common/core/memory-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/runtime-core/memory-resource/monotonic_buffer_resource.h b/runtime-common/core/memory-resource/monotonic_buffer_resource.h similarity index 95% rename from runtime-core/memory-resource/monotonic_buffer_resource.h rename to runtime-common/core/memory-resource/monotonic_buffer_resource.h index a3e1c2a779..fb4f2b3089 100644 --- a/runtime-core/memory-resource/monotonic_buffer_resource.h +++ b/runtime-common/core/memory-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 { diff --git a/runtime-core/memory-resource/resource_allocator.h b/runtime-common/core/memory-resource/resource_allocator.h similarity index 98% rename from runtime-core/memory-resource/resource_allocator.h rename to runtime-common/core/memory-resource/resource_allocator.h index 1028040558..500ac71579 100644 --- a/runtime-core/memory-resource/resource_allocator.h +++ b/runtime-common/core/memory-resource/resource_allocator.h @@ -12,7 +12,7 @@ #include #include "common/wrappers/likely.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" namespace memory_resource { diff --git a/runtime-core/memory-resource/unsynchronized_pool_resource.cpp b/runtime-common/core/memory-resource/unsynchronized_pool_resource.cpp similarity index 96% rename from runtime-core/memory-resource/unsynchronized_pool_resource.cpp rename to runtime-common/core/memory-resource/unsynchronized_pool_resource.cpp index da5ba3b24e..100f4b5e25 100644 --- a/runtime-core/memory-resource/unsynchronized_pool_resource.cpp +++ b/runtime-common/core/memory-resource/unsynchronized_pool_resource.cpp @@ -2,11 +2,11 @@ // Copyright (c) 2020 LLC «V Kontakte» // Distributed under the GPL v3 License, see LICENSE.notice.txt -#include "runtime-core/memory-resource/unsynchronized_pool_resource.h" +#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h" #include "common/wrappers/likely.h" -#include "runtime-core/memory-resource/details/memory_ordered_chunk_list.h" +#include "runtime-common/core/memory-resource/details/memory_ordered_chunk_list.h" namespace memory_resource { diff --git a/runtime-core/memory-resource/unsynchronized_pool_resource.h b/runtime-common/core/memory-resource/unsynchronized_pool_resource.h similarity index 91% rename from runtime-core/memory-resource/unsynchronized_pool_resource.h rename to runtime-common/core/memory-resource/unsynchronized_pool_resource.h index 434dbca671..b958c85fb3 100644 --- a/runtime-core/memory-resource/unsynchronized_pool_resource.h +++ b/runtime-common/core/memory-resource/unsynchronized_pool_resource.h @@ -7,13 +7,13 @@ #include #include -#include "runtime-core/memory-resource/extra-memory-pool.h" -#include "runtime-core/memory-resource/details/memory_chunk_list.h" -#include "runtime-core/memory-resource/details/memory_chunk_tree.h" -#include "runtime-core/memory-resource/details/universal_reallocate.h" -#include "runtime-core/memory-resource/monotonic_buffer_resource.h" -#include "runtime-core/memory-resource/resource_allocator.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/memory-resource/extra-memory-pool.h" +#include "runtime-common/core/memory-resource/details/memory_chunk_list.h" +#include "runtime-common/core/memory-resource/details/memory_chunk_tree.h" +#include "runtime-common/core/memory-resource/details/universal_reallocate.h" +#include "runtime-common/core/memory-resource/monotonic_buffer_resource.h" +#include "runtime-common/core/memory-resource/resource_allocator.h" +#include "runtime-common/core/utils/kphp-assert-core.h" namespace memory_resource { diff --git a/runtime-core/runtime-core-context.h b/runtime-common/core/runtime-core-context.h similarity index 100% rename from runtime-core/runtime-core-context.h rename to runtime-common/core/runtime-core-context.h diff --git a/runtime-core/runtime-core.h b/runtime-common/core/runtime-core.h similarity index 97% rename from runtime-core/runtime-core.h rename to runtime-common/core/runtime-core.h index dccb788f19..39efe42780 100644 --- a/runtime-core/runtime-core.h +++ b/runtime-common/core/runtime-core.h @@ -18,30 +18,30 @@ #include "common/sanitizer.h" #include "common/type_traits/list_of_types.h" -#include "runtime-core/include.h" -#include "runtime-core/core-types/kphp_type_traits.h" -#include "runtime-core/core-types/decl/shape.h" +#include "runtime-common/core/include.h" +#include "runtime-common/core/core-types/kphp_type_traits.h" +#include "runtime-common/core/core-types/decl/shape.h" // order of includes below matters, be careful #define INCLUDED_FROM_KPHP_CORE -#include "runtime-core/core-types/decl/string_decl.inl" -#include "runtime-core/core-types/decl/array_decl.inl" -#include "runtime-core/class-instance/class-instance-decl.inl" -#include "runtime-core/core-types/decl/mixed_decl.inl" -#include "runtime-core/core-types/decl/string_buffer_decl.inl" - -#include "runtime-core/allocator/runtime-allocator.h" -#include "runtime-core/runtime-core-context.h" - -#include "runtime-core/core-types/definition/string.inl" -#include "runtime-core/core-types/definition/array.inl" -#include "runtime-core/class-instance/class-instance.inl" -#include "runtime-core/core-types/definition/mixed.inl" -#include "runtime-core/core-types/definition/string_buffer.inl" -#include "runtime-core/core-types/conversions_types.inl" -#include "runtime-core/core-types/comparison_operators.inl" +#include "runtime-common/core/core-types/decl/string_decl.inl" +#include "runtime-common/core/core-types/decl/array_decl.inl" +#include "runtime-common/core/class-instance/class-instance-decl.inl" +#include "runtime-common/core/core-types/decl/mixed_decl.inl" +#include "runtime-common/core/core-types/decl/string_buffer_decl.inl" + +#include "runtime-common/core/allocator/runtime-allocator.h" +#include "runtime-common/core/runtime-core-context.h" + +#include "runtime-common/core/core-types/definition/string.inl" +#include "runtime-common/core/core-types/definition/array.inl" +#include "runtime-common/core/class-instance/class-instance.inl" +#include "runtime-common/core/core-types/definition/mixed.inl" +#include "runtime-common/core/core-types/definition/string_buffer.inl" +#include "runtime-common/core/core-types/conversions_types.inl" +#include "runtime-common/core/core-types/comparison_operators.inl" #undef INCLUDED_FROM_KPHP_CORE diff --git a/runtime-core/utils/hash.h b/runtime-common/core/utils/hash.h similarity index 100% rename from runtime-core/utils/hash.h rename to runtime-common/core/utils/hash.h diff --git a/runtime-core/utils/kphp-assert-core.h b/runtime-common/core/utils/kphp-assert-core.h similarity index 100% rename from runtime-core/utils/kphp-assert-core.h rename to runtime-common/core/utils/kphp-assert-core.h diff --git a/runtime-core/utils/migration-php8.cpp b/runtime-common/core/utils/migration-php8.cpp similarity index 81% rename from runtime-core/utils/migration-php8.cpp rename to runtime-common/core/utils/migration-php8.cpp index c003c519a9..ab3dd76e97 100644 --- a/runtime-core/utils/migration-php8.cpp +++ b/runtime-common/core/utils/migration-php8.cpp @@ -2,8 +2,8 @@ // Copyright (c) 2021 LLC «V Kontakte» // Distributed under the GPL v3 License, see LICENSE.notice.txt -#include "runtime-core/utils/migration-php8.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/utils/migration-php8.h" +#include "runtime-common/core/runtime-core.h" void f$set_migration_php8_warning(int mask) { KphpCoreContext::current().show_migration_php8_warning = mask; diff --git a/runtime-core/utils/migration-php8.h b/runtime-common/core/utils/migration-php8.h similarity index 100% rename from runtime-core/utils/migration-php8.h rename to runtime-common/core/utils/migration-php8.h diff --git a/runtime-core/utils/small-object-storage.h b/runtime-common/core/utils/small-object-storage.h similarity index 95% rename from runtime-core/utils/small-object-storage.h rename to runtime-common/core/utils/small-object-storage.h index efa7f9ecf6..9c66214124 100644 --- a/runtime-core/utils/small-object-storage.h +++ b/runtime-common/core/utils/small-object-storage.h @@ -9,7 +9,7 @@ #include #include -#include "runtime-core/allocator/runtime-allocator.h" +#include "runtime-common/core/allocator/runtime-allocator.h" template union small_object_storage { diff --git a/runtime-common/runtime-common.cmake b/runtime-common/runtime-common.cmake new file mode 100644 index 0000000000..811e39970d --- /dev/null +++ b/runtime-common/runtime-common.cmake @@ -0,0 +1,16 @@ +include(${RUNTIME_COMMON_DIR}/core/core.cmake) + +set(RUNTIME_COMMON_SRC "${CORE_SRC}") + +if(COMPILE_RUNTIME_LIGHT) + set(RUNTIME_COMMON_SOURCES_FOR_COMP "${RUNTIME_COMMON_SRC}") + configure_file(${BASE_DIR}/compiler/runtime_common_sources.h.in + ${AUTO_DIR}/compiler/runtime_common_sources.h) +endif() + +prepend(RUNTIME_COMMON_SRC ${RUNTIME_COMMON_DIR}/ "${RUNTIME_COMMON_SRC}") +vk_add_library(runtime-common OBJECT ${RUNTIME_COMMON_SRC}) + +if(COMPILE_RUNTIME_LIGHT) + target_compile_options(runtime-common PUBLIC -fPIC) +endif() diff --git a/runtime-core/runtime-core.cmake b/runtime-core/runtime-core.cmake deleted file mode 100644 index 13bee235f3..0000000000 --- a/runtime-core/runtime-core.cmake +++ /dev/null @@ -1,35 +0,0 @@ -prepend(KPHP_CORE_RUNTIME_UTILS utils/ - migration-php8.cpp -) - -prepend(KPHP_CORE_TYPES core-types/definition/ - mixed.cpp - string.cpp - string_buffer.cpp - string_cache.cpp -) - -prepend(KPHP_CORE_MEMORY_RESOURCE memory-resource/ - details/memory_chunk_tree.cpp - details/memory_ordered_chunk_list.cpp - monotonic_buffer_resource.cpp - unsynchronized_pool_resource.cpp -) - -set(KPHP_CORE_SRC - ${KPHP_CORE_RUNTIME_UTILS} - ${KPHP_CORE_TYPES} - ${KPHP_CORE_MEMORY_RESOURCE} -) - -if (COMPILE_RUNTIME_LIGHT) - set(RUNTIME_CORE_SOURCES_FOR_COMP "${KPHP_CORE_SRC}") - configure_file(${BASE_DIR}/compiler/runtime_core_sources.h.in ${AUTO_DIR}/compiler/runtime_core_sources.h) -endif() - -prepend(KPHP_CORE_SRC ${RUNTIME_CORE_DIR}/ "${KPHP_CORE_SRC}") -vk_add_library(runtime-core OBJECT ${KPHP_CORE_SRC}) - -if (COMPILE_RUNTIME_LIGHT) - target_compile_options(runtime-core PUBLIC -fPIC) -endif() diff --git a/runtime-light/allocator/allocator.cmake b/runtime-light/allocator/allocator.cmake index 93e2e9f0c2..85880d002e 100644 --- a/runtime-light/allocator/allocator.cmake +++ b/runtime-light/allocator/allocator.cmake @@ -1 +1 @@ -set(RUNTIME_ALLOCATOR_SRC allocator/runtime-light-allocator.cpp) +set(RUNTIME_LIGHT_ALLOCATOR_SRC allocator/runtime-light-allocator.cpp) diff --git a/runtime-light/allocator/allocator.h b/runtime-light/allocator/allocator.h index ca9d7fa3cb..540b6ae7b5 100644 --- a/runtime-light/allocator/allocator.h +++ b/runtime-light/allocator/allocator.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/allocator/script-allocator-managed.h" +#include "runtime-common/core/allocator/script-allocator-managed.h" template T, typename... Args> requires std::constructible_from auto make_unique_on_script_memory(Args &&...args) noexcept { diff --git a/runtime-light/allocator/runtime-light-allocator.cpp b/runtime-light/allocator/runtime-light-allocator.cpp index 6895e1a1e2..e9a8596fb4 100644 --- a/runtime-light/allocator/runtime-light-allocator.cpp +++ b/runtime-light/allocator/runtime-light-allocator.cpp @@ -5,7 +5,7 @@ #include #include -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/component/component.h" namespace { diff --git a/runtime-light/component/component.cmake b/runtime-light/component/component.cmake index 01c9c5ede4..ebd0d8e5ab 100644 --- a/runtime-light/component/component.cmake +++ b/runtime-light/component/component.cmake @@ -1 +1 @@ -prepend(RUNTIME_COMPONENT_SRC component/ component.cpp init-functions.cpp) +prepend(RUNTIME_LIGHT_COMPONENT_SRC component/ component.cpp init-functions.cpp) diff --git a/runtime-light/component/component.cpp b/runtime-light/component/component.cpp index 34f864eb57..fa041b275a 100644 --- a/runtime-light/component/component.cpp +++ b/runtime-light/component/component.cpp @@ -11,8 +11,8 @@ #include #include -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/component/init-functions.h" #include "runtime-light/core/globals/php-init-scripts.h" #include "runtime-light/core/globals/php-script-globals.h" diff --git a/runtime-light/component/component.h b/runtime-light/component/component.h index aee1bc1299..c89f692f31 100644 --- a/runtime-light/component/component.h +++ b/runtime-light/component/component.h @@ -10,9 +10,9 @@ #include #include -#include "runtime-core/memory-resource/resource_allocator.h" -#include "runtime-core/memory-resource/unsynchronized_pool_resource.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/memory-resource/resource_allocator.h" +#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/core/globals/php-script-globals.h" #include "runtime-light/coroutine/task.h" #include "runtime-light/header.h" diff --git a/runtime-light/component/init-functions.cpp b/runtime-light/component/init-functions.cpp index 87a785d19e..33fc911a50 100644 --- a/runtime-light/component/init-functions.cpp +++ b/runtime-light/component/init-functions.cpp @@ -6,7 +6,7 @@ #include -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/component/component.h" #include "runtime-light/coroutine/awaitable.h" #include "runtime-light/coroutine/task.h" diff --git a/runtime-light/core/core.cmake b/runtime-light/core/core.cmake index bd8ff645da..a5b26f29ae 100644 --- a/runtime-light/core/core.cmake +++ b/runtime-light/core/core.cmake @@ -1,9 +1,7 @@ -prepend(RUNTIME_LANGUAGE_SRC core/globals/ - php-script-globals.cpp) +prepend(RUNTIME_LANGUAGE_SRC core/globals/ php-script-globals.cpp) prepend(RUNTIME_KPHP_CORE_CONTEXT_SRC core/kphp-core-impl/ kphp-core-context.cpp) - -set(RUNTIME_CORE_SRC ${RUNTIME_LANGUAGE_SRC} - ${RUNTIME_KPHP_CORE_CONTEXT_SRC}) \ No newline at end of file +set(RUNTIME_LIGHT_CORE_SRC ${RUNTIME_LANGUAGE_SRC} + ${RUNTIME_KPHP_CORE_CONTEXT_SRC}) diff --git a/runtime-light/core/globals/php-script-globals.h b/runtime-light/core/globals/php-script-globals.h index 305d5c7f2f..355f5f97b7 100644 --- a/runtime-light/core/globals/php-script-globals.h +++ b/runtime-light/core/globals/php-script-globals.h @@ -4,9 +4,9 @@ #pragma once -#include "runtime-core/memory-resource/resource_allocator.h" -#include "runtime-core/memory-resource/unsynchronized_pool_resource.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/memory-resource/resource_allocator.h" +#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h" +#include "runtime-common/core/runtime-core.h" namespace PhpServerSuperGlobalIndices { diff --git a/runtime-light/core/kphp-core-impl/kphp-core-context.cpp b/runtime-light/core/kphp-core-impl/kphp-core-context.cpp index 01fa1afd7b..dfda6b038c 100644 --- a/runtime-light/core/kphp-core-impl/kphp-core-context.cpp +++ b/runtime-light/core/kphp-core-impl/kphp-core-context.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2024 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" #include "runtime-light/component/component.h" #include "runtime-light/utils/context.h" diff --git a/runtime-light/coroutine/awaitable.h b/runtime-light/coroutine/awaitable.h index 17d4e7cad4..45b8ba95cc 100644 --- a/runtime-light/coroutine/awaitable.h +++ b/runtime-light/coroutine/awaitable.h @@ -13,7 +13,7 @@ #include #include -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/component/component.h" #include "runtime-light/coroutine/task.h" #include "runtime-light/header.h" diff --git a/runtime-light/coroutine/task.h b/runtime-light/coroutine/task.h index 5751936c48..85920b3133 100644 --- a/runtime-light/coroutine/task.h +++ b/runtime-light/coroutine/task.h @@ -12,7 +12,7 @@ #include #include "common/containers/final_action.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/utils/context.h" #if __clang_major__ > 7 diff --git a/runtime-light/memory-resource-impl/memory-resource-impl.cmake b/runtime-light/memory-resource-impl/memory-resource-impl.cmake index d4cd6fc842..3a4af8bca9 100644 --- a/runtime-light/memory-resource-impl/memory-resource-impl.cmake +++ b/runtime-light/memory-resource-impl/memory-resource-impl.cmake @@ -1 +1,2 @@ -prepend(RUNTIME_MEMORY_RESOURCE_IMPL_SRC memory-resource-impl/ monotonic-light-buffer-resource.cpp) +prepend(RUNTIME_LIGHT_MEMORY_RESOURCE_IMPL_SRC memory-resource-impl/ + monotonic-light-buffer-resource.cpp) diff --git a/runtime-light/memory-resource-impl/monotonic-light-buffer-resource.cpp b/runtime-light/memory-resource-impl/monotonic-light-buffer-resource.cpp index d466778f7f..dfb877fb2a 100644 --- a/runtime-light/memory-resource-impl/monotonic-light-buffer-resource.cpp +++ b/runtime-light/memory-resource-impl/monotonic-light-buffer-resource.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2024 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 { // todo:k2 How it should work in k2? diff --git a/runtime-light/runtime-light.cmake b/runtime-light/runtime-light.cmake index 39a82b2ca2..6e953688fd 100644 --- a/runtime-light/runtime-light.cmake +++ b/runtime-light/runtime-light.cmake @@ -10,18 +10,17 @@ include(${RUNTIME_LIGHT_DIR}/component/component.cmake) include(${RUNTIME_LIGHT_DIR}/memory-resource-impl/memory-resource-impl.cmake) set(RUNTIME_LIGHT_SRC - ${RUNTIME_CORE_SRC} - ${RUNTIME_STDLIB_SRC} - ${RUNTIME_SCHEDULER_SRC} - ${RUNTIME_SERVER_SRC} - ${RUNTIME_ALLOCATOR_SRC} - ${RUNTIME_COROUTINE_SRC} - ${RUNTIME_COMPONENT_SRC} - ${RUNTIME_STREAMS_SRC} - ${RUNTIME_TL_SRC} - ${RUNTIME_UTILS_SRC} - ${RUNTIME_LANGUAGE_SRC} - ${RUNTIME_MEMORY_RESOURCE_IMPL_SRC} + ${RUNTIME_LIGHT_CORE_SRC} + ${RUNTIME_LIGHT_STDLIB_SRC} + ${RUNTIME_LIGHT_SCHEDULER_SRC} + ${RUNTIME_LIGHT_SERVER_SRC} + ${RUNTIME_LIGHT_ALLOCATOR_SRC} + ${RUNTIME_LIGHT_COROUTINE_SRC} + ${RUNTIME_LIGHT_COMPONENT_SRC} + ${RUNTIME_LIGHT_STREAMS_SRC} + ${RUNTIME_LIGHT_TL_SRC} + ${RUNTIME_LIGHT_UTILS_SRC} + ${RUNTIME_LIGHT_MEMORY_RESOURCE_IMPL_SRC} runtime-light.cpp) set(RUNTIME_SOURCES_FOR_COMP "${RUNTIME_LIGHT_SRC}") @@ -40,7 +39,8 @@ target_compile_options(runtime-light PUBLIC -fPIC) vk_add_library(kphp-light-runtime STATIC) target_link_libraries( - kphp-light-runtime PUBLIC vk::light_common vk::runtime-light vk::runtime-core) + kphp-light-runtime PUBLIC vk::light_common vk::runtime-light + vk::runtime-common) set_target_properties(kphp-light-runtime PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${OBJS_DIR}) diff --git a/runtime-light/runtime-light.cpp b/runtime-light/runtime-light.cpp index 9ffc1a2bf9..2ff5ebf2ff 100644 --- a/runtime-light/runtime-light.cpp +++ b/runtime-light/runtime-light.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2024 LLC «V Kontakte» // Distributed under the GPL v3 License, see LICENSE.notice.txt -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/component/component.h" #include "runtime-light/component/image.h" #include "runtime-light/core/globals/php-init-scripts.h" diff --git a/runtime-light/scheduler/scheduler.cmake b/runtime-light/scheduler/scheduler.cmake index fab00a2389..f3984733a7 100644 --- a/runtime-light/scheduler/scheduler.cmake +++ b/runtime-light/scheduler/scheduler.cmake @@ -1 +1 @@ -prepend(RUNTIME_SCHEDULER_SRC scheduler/ scheduler.cpp) +prepend(RUNTIME_LIGHT_SCHEDULER_SRC scheduler/ scheduler.cpp) diff --git a/runtime-light/scheduler/scheduler.h b/runtime-light/scheduler/scheduler.h index 89b96cba16..ada3330feb 100644 --- a/runtime-light/scheduler/scheduler.h +++ b/runtime-light/scheduler/scheduler.h @@ -12,9 +12,9 @@ #include #include -#include "runtime-core/memory-resource/resource_allocator.h" -#include "runtime-core/memory-resource/unsynchronized_pool_resource.h" -#include "runtime-core/utils/hash.h" +#include "runtime-common/core/memory-resource/resource_allocator.h" +#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h" +#include "runtime-common/core/utils/hash.h" #include "runtime-light/utils/concepts.h" /** diff --git a/runtime-light/server/http/init-functions.cpp b/runtime-light/server/http/init-functions.cpp index 8489264642..99e42e8106 100644 --- a/runtime-light/server/http/init-functions.cpp +++ b/runtime-light/server/http/init-functions.cpp @@ -13,8 +13,8 @@ #include #include -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/component/component.h" #include "runtime-light/core/globals/php-script-globals.h" #include "runtime-light/server/http/http-server-context.h" diff --git a/runtime-light/server/job-worker/job-worker-server-context.h b/runtime-light/server/job-worker/job-worker-server-context.h index fcb87f5763..fe972c22b0 100644 --- a/runtime-light/server/job-worker/job-worker-server-context.h +++ b/runtime-light/server/job-worker/job-worker-server-context.h @@ -7,7 +7,7 @@ #include #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/stdlib/job-worker/job-worker.h" struct JobWorkerServerComponentContext final : private vk::not_copyable { diff --git a/runtime-light/server/server.cmake b/runtime-light/server/server.cmake index 5e43e0780f..6325fdfa06 100644 --- a/runtime-light/server/server.cmake +++ b/runtime-light/server/server.cmake @@ -1,2 +1,2 @@ -prepend(RUNTIME_SERVER_SRC server/ http/init-functions.cpp +prepend(RUNTIME_LIGHT_SERVER_SRC server/ http/init-functions.cpp http/http-server-context.cpp job-worker/job-worker-server-context.cpp) diff --git a/runtime-light/stdlib/array/array-functions.h b/runtime-light/stdlib/array/array-functions.h index 34f0edcc64..2b381f0194 100644 --- a/runtime-light/stdlib/array/array-functions.h +++ b/runtime-light/stdlib/array/array-functions.h @@ -8,7 +8,7 @@ #include #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/coroutine/task.h" inline constexpr int64_t SORT_REGULAR = 0; diff --git a/runtime-light/stdlib/component/component-api.cpp b/runtime-light/stdlib/component/component-api.cpp index e1e046bcb5..f4f95b05e8 100644 --- a/runtime-light/stdlib/component/component-api.cpp +++ b/runtime-light/stdlib/component/component-api.cpp @@ -6,8 +6,8 @@ #include -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/component/component.h" #include "runtime-light/coroutine/awaitable.h" #include "runtime-light/coroutine/task.h" diff --git a/runtime-light/stdlib/component/component-api.h b/runtime-light/stdlib/component/component-api.h index 5cf5ffd86c..8b5135ab07 100644 --- a/runtime-light/stdlib/component/component-api.h +++ b/runtime-light/stdlib/component/component-api.h @@ -8,8 +8,8 @@ #include #include -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/component/component.h" #include "runtime-light/coroutine/task.h" #include "runtime-light/utils/context.h" diff --git a/runtime-light/stdlib/confdata/confdata-functions.cpp b/runtime-light/stdlib/confdata/confdata-functions.cpp index 205f98e28c..d7398245dc 100644 --- a/runtime-light/stdlib/confdata/confdata-functions.cpp +++ b/runtime-light/stdlib/confdata/confdata-functions.cpp @@ -10,8 +10,8 @@ #include #include -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/component/component.h" #include "runtime-light/coroutine/task.h" #include "runtime-light/stdlib/component/component-api.h" diff --git a/runtime-light/stdlib/confdata/confdata-functions.h b/runtime-light/stdlib/confdata/confdata-functions.h index 453414b800..c8cc97f938 100644 --- a/runtime-light/stdlib/confdata/confdata-functions.h +++ b/runtime-light/stdlib/confdata/confdata-functions.h @@ -4,8 +4,8 @@ #pragma once -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/coroutine/task.h" bool f$is_confdata_loaded() noexcept; diff --git a/runtime-light/stdlib/crypto/crypto-functions.h b/runtime-light/stdlib/crypto/crypto-functions.h index 0973906623..4ae42dc02a 100644 --- a/runtime-light/stdlib/crypto/crypto-functions.h +++ b/runtime-light/stdlib/crypto/crypto-functions.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/coroutine/task.h" #include "runtime-light/tl/tl-types.h" diff --git a/runtime-light/stdlib/curl/curl-functions.h b/runtime-light/stdlib/curl/curl-functions.h index 3618779984..012b327228 100644 --- a/runtime-light/stdlib/curl/curl-functions.h +++ b/runtime-light/stdlib/curl/curl-functions.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/stdlib/curl/curl-context.h" inline Optional> f$curl_multi_info_read(int64_t, int64_t & = CurlComponentContext::get().curl_multi_info_read_msgs_in_queue_stub) { diff --git a/runtime-light/stdlib/exception/exception-functions.h b/runtime-light/stdlib/exception/exception-functions.h index 3b93f85c62..63d39a7d6d 100644 --- a/runtime-light/stdlib/exception/exception-functions.h +++ b/runtime-light/stdlib/exception/exception-functions.h @@ -5,7 +5,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #define THROW_EXCEPTION(e) {php_critical_error("Exceptions unsupported");} diff --git a/runtime-light/stdlib/exit/exit-functions.h b/runtime-light/stdlib/exit/exit-functions.h index 90ecab5a0a..554f74a206 100644 --- a/runtime-light/stdlib/exit/exit-functions.h +++ b/runtime-light/stdlib/exit/exit-functions.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/coroutine/task.h" task_t shutdown_script() noexcept; diff --git a/runtime-light/stdlib/file/file-stream-context.h b/runtime-light/stdlib/file/file-stream-context.h index 7648c61cae..0a6327444d 100644 --- a/runtime-light/stdlib/file/file-stream-context.h +++ b/runtime-light/stdlib/file/file-stream-context.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" struct FileStreamComponentContext { mixed error_number_dummy; diff --git a/runtime-light/stdlib/fork/fork-context.h b/runtime-light/stdlib/fork/fork-context.h index abe33ae4d3..b9fde8c1c2 100644 --- a/runtime-light/stdlib/fork/fork-context.h +++ b/runtime-light/stdlib/fork/fork-context.h @@ -7,8 +7,8 @@ #include #include -#include "runtime-core/memory-resource/unsynchronized_pool_resource.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/coroutine/task.h" #include "runtime-light/utils/concepts.h" diff --git a/runtime-light/stdlib/fork/fork-functions.h b/runtime-light/stdlib/fork/fork-functions.h index 348b4471cc..ea44db1e42 100644 --- a/runtime-light/stdlib/fork/fork-functions.h +++ b/runtime-light/stdlib/fork/fork-functions.h @@ -8,9 +8,9 @@ #include #include -#include "runtime-core/core-types/decl/optional.h" -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/core-types/decl/optional.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/coroutine/awaitable.h" #include "runtime-light/coroutine/task.h" #include "runtime-light/stdlib/fork/fork-context.h" diff --git a/runtime-light/stdlib/hash/hash-functions.h b/runtime-light/stdlib/hash/hash-functions.h index 14e331f129..7d8301aa7a 100644 --- a/runtime-light/stdlib/hash/hash-functions.h +++ b/runtime-light/stdlib/hash/hash-functions.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" string f$base64_encode(const string &s); Optional f$base64_decode(const string &s, bool strict); diff --git a/runtime-light/stdlib/instance-cache/instance-cache.h b/runtime-light/stdlib/instance-cache/instance-cache.h index f7599ee04a..dcff53d1fe 100644 --- a/runtime-light/stdlib/instance-cache/instance-cache.h +++ b/runtime-light/stdlib/instance-cache/instance-cache.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" template bool f$instance_cache_store(const string &key, const ClassInstanceType &instance, int64_t ttl = 0) { diff --git a/runtime-light/stdlib/job-worker/job-worker-api.cpp b/runtime-light/stdlib/job-worker/job-worker-api.cpp index 7edb18affa..b81f4399e3 100644 --- a/runtime-light/stdlib/job-worker/job-worker-api.cpp +++ b/runtime-light/stdlib/job-worker/job-worker-api.cpp @@ -10,8 +10,8 @@ #include #include -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/component/component.h" #include "runtime-light/coroutine/awaitable.h" #include "runtime-light/coroutine/task.h" diff --git a/runtime-light/stdlib/job-worker/job-worker-api.h b/runtime-light/stdlib/job-worker/job-worker-api.h index 47b21973c6..11527fba76 100644 --- a/runtime-light/stdlib/job-worker/job-worker-api.h +++ b/runtime-light/stdlib/job-worker/job-worker-api.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/component/component.h" #include "runtime-light/coroutine/task.h" #include "runtime-light/utils/context.h" diff --git a/runtime-light/stdlib/job-worker/job-worker.h b/runtime-light/stdlib/job-worker/job-worker.h index e356d71132..a8862557b1 100644 --- a/runtime-light/stdlib/job-worker/job-worker.h +++ b/runtime-light/stdlib/job-worker/job-worker.h @@ -9,8 +9,8 @@ #include #include -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" inline constexpr int64_t JOB_WORKER_VALID_JOB_ID_RANGE_START = 0; inline constexpr int64_t JOB_WORKER_INVALID_JOB_ID = -1; diff --git a/runtime-light/stdlib/math/math.h b/runtime-light/stdlib/math/math.h index 7184131376..039a0bf567 100644 --- a/runtime-light/stdlib/math/math.h +++ b/runtime-light/stdlib/math/math.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" template T f$min(const array &a) { diff --git a/runtime-light/stdlib/output/http-functions.h b/runtime-light/stdlib/output/http-functions.h index 797204fbaa..0c43c9f2b1 100644 --- a/runtime-light/stdlib/output/http-functions.h +++ b/runtime-light/stdlib/output/http-functions.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" template string f$http_build_query(const array &a, const string &numeric_prefix = {}, const string &arg_separator = string(), int64_t enc_type = 1) { diff --git a/runtime-light/stdlib/output/output-buffer.h b/runtime-light/stdlib/output/output-buffer.h index f1052edd15..3a57fbdc30 100644 --- a/runtime-light/stdlib/output/output-buffer.h +++ b/runtime-light/stdlib/output/output-buffer.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" struct Response { static constexpr int32_t ob_max_buffers{50}; diff --git a/runtime-light/stdlib/output/print-functions.cpp b/runtime-light/stdlib/output/print-functions.cpp index 01f386014a..d08b8bfce1 100644 --- a/runtime-light/stdlib/output/print-functions.cpp +++ b/runtime-light/stdlib/output/print-functions.cpp @@ -6,8 +6,8 @@ #include -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/component/component.h" #include "runtime-light/stdlib/output/output-buffer.h" #include "runtime-light/utils/context.h" diff --git a/runtime-light/stdlib/output/print-functions.h b/runtime-light/stdlib/output/print-functions.h index 2275eeedd0..048cbdda4a 100644 --- a/runtime-light/stdlib/output/print-functions.h +++ b/runtime-light/stdlib/output/print-functions.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/component/component.h" #include "runtime-light/utils/context.h" diff --git a/runtime-light/stdlib/regex/regex-functions.h b/runtime-light/stdlib/regex/regex-functions.h index 7f28cf729c..63a35dd2fa 100644 --- a/runtime-light/stdlib/regex/regex-functions.h +++ b/runtime-light/stdlib/regex/regex-functions.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/stdlib/regex/regex-context.h" class regexp final : private vk::not_copyable { diff --git a/runtime-light/stdlib/rpc/rpc-api.cpp b/runtime-light/stdlib/rpc/rpc-api.cpp index a334a4991b..c3c3be32e2 100644 --- a/runtime-light/stdlib/rpc/rpc-api.cpp +++ b/runtime-light/stdlib/rpc/rpc-api.cpp @@ -13,8 +13,8 @@ #include "common/algorithms/find.h" #include "common/rpc-error-codes.h" -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/allocator/allocator.h" #include "runtime-light/coroutine/awaitable.h" #include "runtime-light/coroutine/task.h" diff --git a/runtime-light/stdlib/rpc/rpc-api.h b/runtime-light/stdlib/rpc/rpc-api.h index 1fedd4208a..01137289ab 100644 --- a/runtime-light/stdlib/rpc/rpc-api.h +++ b/runtime-light/stdlib/rpc/rpc-api.h @@ -7,7 +7,7 @@ #include #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/coroutine/task.h" #include "runtime-light/stdlib/rpc/rpc-extra-info.h" #include "runtime-light/stdlib/rpc/rpc-tl-error.h" diff --git a/runtime-light/stdlib/rpc/rpc-context.h b/runtime-light/stdlib/rpc/rpc-context.h index a2fcd7e962..f2dc80b0e7 100644 --- a/runtime-light/stdlib/rpc/rpc-context.h +++ b/runtime-light/stdlib/rpc/rpc-context.h @@ -8,8 +8,8 @@ #include #include "common/mixin/not_copyable.h" -#include "runtime-core/memory-resource/resource_allocator.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/memory-resource/resource_allocator.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/stdlib/rpc/rpc-extra-info.h" #include "runtime-light/stdlib/rpc/rpc-tl-defs.h" #include "runtime-light/stdlib/rpc/rpc-tl-query.h" diff --git a/runtime-light/stdlib/rpc/rpc-extra-headers.cpp b/runtime-light/stdlib/rpc/rpc-extra-headers.cpp index b50c9334b0..6c35e07a5a 100644 --- a/runtime-light/stdlib/rpc/rpc-extra-headers.cpp +++ b/runtime-light/stdlib/rpc/rpc-extra-headers.cpp @@ -8,7 +8,7 @@ #include "common/algorithms/find.h" #include "common/tl/constants/common.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" namespace { diff --git a/runtime-light/stdlib/rpc/rpc-extra-info.h b/runtime-light/stdlib/rpc/rpc-extra-info.h index 32fa5e3527..6d1fe82261 100644 --- a/runtime-light/stdlib/rpc/rpc-extra-info.h +++ b/runtime-light/stdlib/rpc/rpc-extra-info.h @@ -7,8 +7,8 @@ #include #include -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" using rpc_request_extra_info_t = std::tuple; // tuple(request_size) using rpc_response_extra_info_t = std::tuple; // tuple(response_size, response_time) diff --git a/runtime-light/stdlib/rpc/rpc-tl-defs.h b/runtime-light/stdlib/rpc/rpc-tl-defs.h index b130d5e01f..b695f18f46 100644 --- a/runtime-light/stdlib/rpc/rpc-tl-defs.h +++ b/runtime-light/stdlib/rpc/rpc-tl-defs.h @@ -6,8 +6,8 @@ #include -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/stdlib/rpc/rpc-tl-func-base.h" #include "runtime-light/stdlib/rpc/rpc-tl-function.h" diff --git a/runtime-light/stdlib/rpc/rpc-tl-error.h b/runtime-light/stdlib/rpc/rpc-tl-error.h index f3859156ec..a00aedc70f 100644 --- a/runtime-light/stdlib/rpc/rpc-tl-error.h +++ b/runtime-light/stdlib/rpc/rpc-tl-error.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/stdlib/rpc/rpc-tl-function.h" struct TlRpcError { diff --git a/runtime-light/stdlib/rpc/rpc-tl-func-base.h b/runtime-light/stdlib/rpc/rpc-tl-func-base.h index c5bc0fd537..2e62a41c1d 100644 --- a/runtime-light/stdlib/rpc/rpc-tl-func-base.h +++ b/runtime-light/stdlib/rpc/rpc-tl-func-base.h @@ -4,8 +4,8 @@ #pragma once -#include "runtime-core/allocator/script-allocator-managed.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/allocator/script-allocator-managed.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/stdlib/rpc/rpc-tl-function.h" struct tl_func_base : ScriptAllocatorManaged { diff --git a/runtime-light/stdlib/rpc/rpc-tl-function.h b/runtime-light/stdlib/rpc/rpc-tl-function.h index a02a572934..272633c8a5 100644 --- a/runtime-light/stdlib/rpc/rpc-tl-function.h +++ b/runtime-light/stdlib/rpc/rpc-tl-function.h @@ -8,7 +8,7 @@ #include "common/algorithms/hashes.h" #include "common/wrappers/string_view.h" -#include "runtime-core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" struct tl_func_base; diff --git a/runtime-light/stdlib/rpc/rpc-tl-query.cpp b/runtime-light/stdlib/rpc/rpc-tl-query.cpp index e0bfc90902..d39204c6ef 100644 --- a/runtime-light/stdlib/rpc/rpc-tl-query.cpp +++ b/runtime-light/stdlib/rpc/rpc-tl-query.cpp @@ -6,7 +6,7 @@ #include -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/stdlib/rpc/rpc-context.h" void CurrentTlQuery::reset() noexcept { diff --git a/runtime-light/stdlib/rpc/rpc-tl-query.h b/runtime-light/stdlib/rpc/rpc-tl-query.h index b3659b1c3e..261eeacc5d 100644 --- a/runtime-light/stdlib/rpc/rpc-tl-query.h +++ b/runtime-light/stdlib/rpc/rpc-tl-query.h @@ -7,8 +7,8 @@ #include #include -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/stdlib/rpc/rpc-tl-request.h" struct RpcTlQuery : refcountable_php_classes { diff --git a/runtime-light/stdlib/rpc/rpc-tl-request.cpp b/runtime-light/stdlib/rpc/rpc-tl-request.cpp index aa41e5a589..efce476619 100644 --- a/runtime-light/stdlib/rpc/rpc-tl-request.cpp +++ b/runtime-light/stdlib/rpc/rpc-tl-request.cpp @@ -4,7 +4,7 @@ #include "runtime-light/stdlib/rpc/rpc-tl-request.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" RpcRequestResult::RpcRequestResult(bool is_typed, std::unique_ptr &&result_fetcher) : is_typed(is_typed) diff --git a/runtime-light/stdlib/rpc/rpc-tl-request.h b/runtime-light/stdlib/rpc/rpc-tl-request.h index 7d730a4eed..60d3ad6a71 100644 --- a/runtime-light/stdlib/rpc/rpc-tl-request.h +++ b/runtime-light/stdlib/rpc/rpc-tl-request.h @@ -6,8 +6,8 @@ #include -#include "runtime-core/allocator/script-allocator-managed.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/allocator/script-allocator-managed.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/stdlib/rpc/rpc-tl-func-base.h" #include "runtime-light/stdlib/rpc/rpc-tl-function.h" diff --git a/runtime-light/stdlib/serialization/instance-serialize.h b/runtime-light/stdlib/serialization/instance-serialize.h index ab54777838..cbbfb4da26 100644 --- a/runtime-light/stdlib/serialization/instance-serialize.h +++ b/runtime-light/stdlib/serialization/instance-serialize.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" template diff --git a/runtime-light/stdlib/stdlib.cmake b/runtime-light/stdlib/stdlib.cmake index 6a3c0d366e..206f21b8d3 100644 --- a/runtime-light/stdlib/stdlib.cmake +++ b/runtime-light/stdlib/stdlib.cmake @@ -1,5 +1,5 @@ prepend( - RUNTIME_STDLIB_SRC + RUNTIME_LIGHT_STDLIB_SRC stdlib/ component/component-api.cpp confdata/confdata-functions.cpp diff --git a/runtime-light/stdlib/string/concat.cpp b/runtime-light/stdlib/string/concat.cpp index c2b929ddd6..ae37321157 100644 --- a/runtime-light/stdlib/string/concat.cpp +++ b/runtime-light/stdlib/string/concat.cpp @@ -4,7 +4,7 @@ #include "runtime-light/stdlib/string/concat.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" string str_concat(const string &s1, const string &s2) { // for 2 argument concatenation it's not so uncommon to have at least one empty string argument; diff --git a/runtime-light/stdlib/string/concat.h b/runtime-light/stdlib/string/concat.h index 6d0a2fbd41..d73949dd7f 100644 --- a/runtime-light/stdlib/string/concat.h +++ b/runtime-light/stdlib/string/concat.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" // str_concat_arg generalizes both tmp_string and string arguments; // it can be constructed from both of them, so concat functions can operate diff --git a/runtime-light/stdlib/string/string-context.h b/runtime-light/stdlib/string/string-context.h index 3ebe9ef171..dccb6c38ed 100644 --- a/runtime-light/stdlib/string/string-context.h +++ b/runtime-light/stdlib/string/string-context.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" struct StringComponentContext { int64_t str_replace_count_dummy{}; diff --git a/runtime-light/stdlib/system/system-functions.h b/runtime-light/stdlib/system/system-functions.h index 0e5eb1637e..4705aa82a8 100644 --- a/runtime-light/stdlib/system/system-functions.h +++ b/runtime-light/stdlib/system/system-functions.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" template int64_t f$estimate_memory_usage(const T &) { diff --git a/runtime-light/stdlib/time/timer-functions.h b/runtime-light/stdlib/time/timer-functions.h index e3c96883c7..808c676445 100644 --- a/runtime-light/stdlib/time/timer-functions.h +++ b/runtime-light/stdlib/time/timer-functions.h @@ -9,7 +9,7 @@ #include #include -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/coroutine/awaitable.h" #include "runtime-light/coroutine/task.h" diff --git a/runtime-light/streams/streams.cmake b/runtime-light/streams/streams.cmake index ee1acd1d8c..5295fe489c 100644 --- a/runtime-light/streams/streams.cmake +++ b/runtime-light/streams/streams.cmake @@ -1 +1 @@ -prepend(RUNTIME_STREAMS_SRC streams/ streams.cpp) +prepend(RUNTIME_LIGHT_STREAMS_SRC streams/ streams.cpp) diff --git a/runtime-light/streams/streams.cpp b/runtime-light/streams/streams.cpp index 41147037ce..fa8a9c5350 100644 --- a/runtime-light/streams/streams.cpp +++ b/runtime-light/streams/streams.cpp @@ -9,7 +9,7 @@ #include #include -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/coroutine/awaitable.h" #include "runtime-light/coroutine/task.h" #include "runtime-light/header.h" diff --git a/runtime-light/tl/tl-builtins.h b/runtime-light/tl/tl-builtins.h index a2e037079e..d68deae17b 100644 --- a/runtime-light/tl/tl-builtins.h +++ b/runtime-light/tl/tl-builtins.h @@ -9,8 +9,8 @@ #include "common/php-functions.h" #include "common/tl/constants/common.h" -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/stdlib/rpc/rpc-api.h" #include "runtime-light/stdlib/rpc/rpc-tl-defs.h" diff --git a/runtime-light/tl/tl-core.h b/runtime-light/tl/tl-core.h index 183e54aae7..b489d8f86e 100644 --- a/runtime-light/tl/tl-core.h +++ b/runtime-light/tl/tl-core.h @@ -10,8 +10,8 @@ #include #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/utils/concepts.h" namespace tl { diff --git a/runtime-light/tl/tl-functions.h b/runtime-light/tl/tl-functions.h index c779a61982..4cf3f291b4 100644 --- a/runtime-light/tl/tl-functions.h +++ b/runtime-light/tl/tl-functions.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/tl/tl-core.h" #include "runtime-light/tl/tl-types.h" diff --git a/runtime-light/tl/tl-types.h b/runtime-light/tl/tl-types.h index c3b4f634c1..82c2fa2b0a 100644 --- a/runtime-light/tl/tl-types.h +++ b/runtime-light/tl/tl-types.h @@ -12,10 +12,10 @@ #include #include "common/tl/constants/common.h" -#include "runtime-core/allocator/runtime-allocator.h" -#include "runtime-core/memory-resource/resource_allocator.h" -#include "runtime-core/memory-resource/unsynchronized_pool_resource.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/allocator/runtime-allocator.h" +#include "runtime-common/core/memory-resource/resource_allocator.h" +#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h" +#include "runtime-common/core/runtime-core.h" #include "runtime-light/tl/tl-core.h" namespace tl { diff --git a/runtime-light/tl/tl.cmake b/runtime-light/tl/tl.cmake index 248ed8a18a..c2ead0ddc3 100644 --- a/runtime-light/tl/tl.cmake +++ b/runtime-light/tl/tl.cmake @@ -1,2 +1,2 @@ -prepend(RUNTIME_TL_SRC tl/ tl-builtins.cpp tl-core.cpp tl-functions.cpp +prepend(RUNTIME_LIGHT_TL_SRC tl/ tl-builtins.cpp tl-core.cpp tl-functions.cpp tl-types.cpp) diff --git a/runtime-light/utils/json-functions.h b/runtime-light/utils/json-functions.h index 9f3dc26782..5ed8d3a38b 100644 --- a/runtime-light/utils/json-functions.h +++ b/runtime-light/utils/json-functions.h @@ -7,7 +7,7 @@ #include #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" constexpr int64_t JSON_UNESCAPED_UNICODE = 1; diff --git a/runtime-light/utils/panic.cpp b/runtime-light/utils/panic.cpp index 059db31fd8..bec6d7aa52 100644 --- a/runtime-light/utils/panic.cpp +++ b/runtime-light/utils/panic.cpp @@ -4,7 +4,7 @@ #include -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/component/component.h" #include "runtime-light/header.h" #include "runtime-light/utils/context.h" diff --git a/runtime-light/utils/php_assert.cpp b/runtime-light/utils/php_assert.cpp index 190caca8d3..0b236c5f00 100644 --- a/runtime-light/utils/php_assert.cpp +++ b/runtime-light/utils/php_assert.cpp @@ -13,7 +13,7 @@ #include #include -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime-light/header.h" #include "runtime-light/utils/context.h" #include "runtime-light/utils/logs.h" diff --git a/runtime-light/utils/to-array-processor.h b/runtime-light/utils/to-array-processor.h index 32072472c4..d0d3319b57 100644 --- a/runtime-light/utils/to-array-processor.h +++ b/runtime-light/utils/to-array-processor.h @@ -8,7 +8,7 @@ #include "common/mixin/not_copyable.h" #include "common/smart_ptrs/singleton.h" -#include "runtime-core/core-types/definition/null_coalesce.h" +#include "runtime-common/core/core-types/definition/null_coalesce.h" class ShapeKeyDemangle : vk::not_copyable { public: diff --git a/runtime-light/utils/utils.cmake b/runtime-light/utils/utils.cmake index f74079da0d..3a7e93a054 100644 --- a/runtime-light/utils/utils.cmake +++ b/runtime-light/utils/utils.cmake @@ -1 +1,2 @@ -prepend(RUNTIME_UTILS_SRC utils/ panic.cpp php_assert.cpp json-functions.cpp context.cpp) +prepend(RUNTIME_LIGHT_UTILS_SRC utils/ panic.cpp php_assert.cpp + json-functions.cpp context.cpp) diff --git a/runtime/allocator.h b/runtime/allocator.h index 2ccf785f05..8c8e4a1ddf 100644 --- a/runtime/allocator.h +++ b/runtime/allocator.h @@ -9,7 +9,7 @@ #include #include "common/containers/final_action.h" -#include "runtime-core/memory-resource/memory_resource.h" +#include "runtime-common/core/memory-resource/memory_resource.h" namespace memory_resource { class unsynchronized_pool_resource; diff --git a/runtime/array_functions.h b/runtime/array_functions.h index 11b5b40aff..245139ccd7 100644 --- a/runtime/array_functions.h +++ b/runtime/array_functions.h @@ -10,7 +10,7 @@ #include "common/type_traits/function_traits.h" #include "common/vector-product.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/context/runtime-context.h" #include "runtime/math_functions.h" #include "runtime/string_functions.h" diff --git a/runtime/bcmath.h b/runtime/bcmath.h index 53836e8a4e..d60e79dc24 100644 --- a/runtime/bcmath.h +++ b/runtime/bcmath.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" void f$bcscale(int64_t scale); diff --git a/runtime/common_template_instantiations.h b/runtime/common_template_instantiations.h index 94582cbf82..dc30207375 100644 --- a/runtime/common_template_instantiations.h +++ b/runtime/common_template_instantiations.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" // Use explicit template instantiation to make result binary smaller and force common instantiations to be compiled with -O3 // see https://en.cppreference.com/w/cpp/language/class_template diff --git a/runtime/confdata-functions.h b/runtime/confdata-functions.h index 56b4e7104e..e4124f5cd9 100644 --- a/runtime/confdata-functions.h +++ b/runtime/confdata-functions.h @@ -3,7 +3,7 @@ // Distributed under the GPL v3 License, see LICENSE.notice.txt #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" void init_confdata_functions_lib(); void free_confdata_functions_lib(); diff --git a/runtime/confdata-global-manager.h b/runtime/confdata-global-manager.h index 12e8920eee..c3bd89e0e7 100644 --- a/runtime/confdata-global-manager.h +++ b/runtime/confdata-global-manager.h @@ -9,9 +9,9 @@ #include "common/mixin/not_copyable.h" #include "common/wrappers/string_view.h" -#include "runtime-core/runtime-core.h" -#include "runtime-core/memory-resource/resource_allocator.h" -#include "runtime-core/memory-resource/unsynchronized_pool_resource.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/memory-resource/resource_allocator.h" +#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h" #include "runtime/confdata-keys.h" #include "runtime/inter-process-resource.h" diff --git a/runtime/confdata-keys.h b/runtime/confdata-keys.h index 8cbd9150e4..8c27f0c5f6 100644 --- a/runtime/confdata-keys.h +++ b/runtime/confdata-keys.h @@ -15,7 +15,7 @@ #include "common/wrappers/iterator_range.h" #include "common/wrappers/string_view.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" enum class ConfdataFirstKeyType { simple_key, diff --git a/runtime/context/runtime-context.h b/runtime/context/runtime-context.h index 68e7f110c0..d94a0f802a 100644 --- a/runtime/context/runtime-context.h +++ b/runtime/context/runtime-context.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "common/smart_ptrs/singleton.h" diff --git a/runtime/context/runtime-core-allocator.cpp b/runtime/context/runtime-core-allocator.cpp index 83d661b217..c9002913a4 100644 --- a/runtime/context/runtime-core-allocator.cpp +++ b/runtime/context/runtime-core-allocator.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2024 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" #include "runtime/allocator.h" #include "runtime/context/runtime-context.h" diff --git a/runtime/ctype.h b/runtime/ctype.h index a029767bfd..5939e4f5f6 100644 --- a/runtime/ctype.h +++ b/runtime/ctype.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" bool f$ctype_alnum(const mixed &text) noexcept; bool f$ctype_alpha(const mixed &text) noexcept; diff --git a/runtime/curl-async.h b/runtime/curl-async.h index af1fc37ef9..8bf7492886 100644 --- a/runtime/curl-async.h +++ b/runtime/curl-async.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/curl.h" diff --git a/runtime/curl.h b/runtime/curl.h index 516d8b8724..42c0848558 100644 --- a/runtime/curl.h +++ b/runtime/curl.h @@ -6,7 +6,7 @@ #include "common/smart_ptrs/singleton.h" #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/allocator.h" using curl_easy = int64_t; diff --git a/runtime/datetime/date_interval.h b/runtime/datetime/date_interval.h index c6e753dbbc..bc930b6a79 100644 --- a/runtime/datetime/date_interval.h +++ b/runtime/datetime/date_interval.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" #include "runtime/datetime/timelib_wrapper.h" #include "runtime/dummy-visitor-methods.h" diff --git a/runtime/datetime/datetime.h b/runtime/datetime/datetime.h index f5b8edbdde..ec9911dbd5 100644 --- a/runtime/datetime/datetime.h +++ b/runtime/datetime/datetime.h @@ -4,8 +4,8 @@ #pragma once -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/datetime/datetime_interface.h" #include "runtime/datetime/datetime_zone.h" #include "runtime/dummy-visitor-methods.h" diff --git a/runtime/datetime/datetime_functions.h b/runtime/datetime/datetime_functions.h index 637e5b4b85..e8c7d96bdf 100644 --- a/runtime/datetime/datetime_functions.h +++ b/runtime/datetime/datetime_functions.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" bool f$checkdate(int64_t month, int64_t day, int64_t year); diff --git a/runtime/datetime/datetime_immutable.h b/runtime/datetime/datetime_immutable.h index fb4c877a52..52eb272eb7 100644 --- a/runtime/datetime/datetime_immutable.h +++ b/runtime/datetime/datetime_immutable.h @@ -4,8 +4,8 @@ #pragma once -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/datetime/datetime_interface.h" #include "runtime/datetime/datetime_zone.h" #include "runtime/dummy-visitor-methods.h" diff --git a/runtime/datetime/datetime_interface.h b/runtime/datetime/datetime_interface.h index 5d9222631a..86ecf365bc 100644 --- a/runtime/datetime/datetime_interface.h +++ b/runtime/datetime/datetime_interface.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" #include "runtime/datetime/timelib_wrapper.h" diff --git a/runtime/datetime/datetime_zone.h b/runtime/datetime/datetime_zone.h index fdad631343..4fb9f1b313 100644 --- a/runtime/datetime/datetime_zone.h +++ b/runtime/datetime/datetime_zone.h @@ -4,8 +4,8 @@ #pragma once -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/dummy-visitor-methods.h" struct C$DateTimeZone : public refcountable_php_classes, private DummyVisitorMethods { diff --git a/runtime/datetime/timelib_wrapper.h b/runtime/datetime/timelib_wrapper.h index 5c06638bf5..6c8dda56c7 100644 --- a/runtime/datetime/timelib_wrapper.h +++ b/runtime/datetime/timelib_wrapper.h @@ -2,7 +2,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" // php_timelib wraps the https://github.com/derickr/timelib library // which is used in PHP to implement several datetime lib functions. diff --git a/runtime/env.h b/runtime/env.h index e2ded6ae20..0db89c005a 100644 --- a/runtime/env.h +++ b/runtime/env.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" array f$getenv() noexcept; Optional f$getenv(const string &varname, bool local_only = false) noexcept; diff --git a/runtime/exception.h b/runtime/exception.h index 85b8ebaedd..d7d45587ba 100644 --- a/runtime/exception.h +++ b/runtime/exception.h @@ -8,8 +8,8 @@ #include "common/algorithms/hashes.h" #include "common/wrappers/string_view.h" -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/dummy-visitor-methods.h" #include "runtime/instance-copy-processor.h" #include "runtime/memory_usage.h" diff --git a/runtime/exec.h b/runtime/exec.h index 5539a777f0..4cc46b63a3 100644 --- a/runtime/exec.h +++ b/runtime/exec.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" int64_t &get_dummy_result_code() noexcept; diff --git a/runtime/ffi.h b/runtime/ffi.h index 53ac0fc837..66f7a2bf59 100644 --- a/runtime/ffi.h +++ b/runtime/ffi.h @@ -4,8 +4,8 @@ #pragma once -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/dummy-visitor-methods.h" #include "runtime/memory_usage.h" diff --git a/runtime/files.h b/runtime/files.h index 58654430ed..ac10a71328 100644 --- a/runtime/files.h +++ b/runtime/files.h @@ -8,7 +8,7 @@ #include #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" extern const string LETTER_a; diff --git a/runtime/from-json-processor.h b/runtime/from-json-processor.h index 49dd106529..c31c630bc8 100644 --- a/runtime/from-json-processor.h +++ b/runtime/from-json-processor.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/json-functions.h" #include "runtime/json-processor-utils.h" diff --git a/runtime/instance-cache.cpp b/runtime/instance-cache.cpp index 2bae5d31d9..0724554054 100644 --- a/runtime/instance-cache.cpp +++ b/runtime/instance-cache.cpp @@ -13,8 +13,8 @@ #include "common/kprintf.h" #include "common/wrappers/memory-utils.h" -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/memory-resource/resource_allocator.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/memory-resource/resource_allocator.h" #include "runtime/allocator.h" #include "runtime/critical_section.h" #include "runtime/inter-process-mutex.h" diff --git a/runtime/instance-cache.h b/runtime/instance-cache.h index b9b1706673..c62d4867ff 100644 --- a/runtime/instance-cache.h +++ b/runtime/instance-cache.h @@ -18,7 +18,7 @@ #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/instance-copy-processor.h" #include "runtime/memory_usage.h" #include "server/statshouse/statshouse-manager.h" diff --git a/runtime/instance-copy-processor.h b/runtime/instance-copy-processor.h index eac8457c3e..60337ea57a 100644 --- a/runtime/instance-copy-processor.h +++ b/runtime/instance-copy-processor.h @@ -10,8 +10,8 @@ #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" -#include "runtime-core/memory-resource/unsynchronized_pool_resource.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h" #include "runtime/allocator.h" #include "runtime/critical_section.h" diff --git a/runtime/interface.h b/runtime/interface.h index cd459ddac0..1e5a81bcaa 100644 --- a/runtime/interface.h +++ b/runtime/interface.h @@ -8,7 +8,7 @@ #include "common/wrappers/string_view.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/critical_section.h" #include "runtime/php-script-globals.h" #include "server/php-query-data.h" diff --git a/runtime/job-workers/client-functions.h b/runtime/job-workers/client-functions.h index 9c4730da30..8ff3b0cef6 100644 --- a/runtime/job-workers/client-functions.h +++ b/runtime/job-workers/client-functions.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/job-workers/job-interface.h" void free_job_client_interface_lib() noexcept; diff --git a/runtime/job-workers/job-interface.h b/runtime/job-workers/job-interface.h index 16ef3376b9..b742a58cd8 100644 --- a/runtime/job-workers/job-interface.h +++ b/runtime/job-workers/job-interface.h @@ -7,8 +7,8 @@ #include "common/algorithms/hashes.h" #include "common/wrappers/string_view.h" -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/instance-copy-processor.h" #include "runtime/to-array-processor.h" diff --git a/runtime/job-workers/processing-jobs.h b/runtime/job-workers/processing-jobs.h index bea2ad435b..90ae3c2d9b 100644 --- a/runtime/job-workers/processing-jobs.h +++ b/runtime/job-workers/processing-jobs.h @@ -7,7 +7,7 @@ #include "common/mixin/not_copyable.h" #include "common/smart_ptrs/singleton.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/net_events.h" #include "runtime/job-workers/job-interface.h" diff --git a/runtime/job-workers/server-functions.h b/runtime/job-workers/server-functions.h index 868ec5c377..23a5ccdfe3 100644 --- a/runtime/job-workers/server-functions.h +++ b/runtime/job-workers/server-functions.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/job-workers/job-interface.h" struct job_query_data; diff --git a/runtime/json-functions.h b/runtime/json-functions.h index 8e46c9418d..722c9a7f21 100644 --- a/runtime/json-functions.h +++ b/runtime/json-functions.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/context/runtime-context.h" #include "runtime/exception.h" diff --git a/runtime/json-writer.h b/runtime/json-writer.h index 507716dbf9..83ee72521e 100644 --- a/runtime/json-writer.h +++ b/runtime/json-writer.h @@ -5,7 +5,7 @@ #pragma once #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include diff --git a/runtime/kphp-backtrace.h b/runtime/kphp-backtrace.h index 9c02b3eacc..eb02f6bc03 100644 --- a/runtime/kphp-backtrace.h +++ b/runtime/kphp-backtrace.h @@ -9,7 +9,7 @@ #include "common/wrappers/iterator_range.h" #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" class KphpBacktrace : vk::not_copyable { public: diff --git a/runtime/kphp_ml/kphp_ml.cpp b/runtime/kphp_ml/kphp_ml.cpp index 622083d72a..209483bd27 100644 --- a/runtime/kphp_ml/kphp_ml.cpp +++ b/runtime/kphp_ml/kphp_ml.cpp @@ -7,7 +7,7 @@ // They are almost identical, besides include paths and input types (`array` vs `unordered_map`). #include "runtime/kphp_ml/kphp_ml.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" // for detailed comments about KML, see kphp_ml.h diff --git a/runtime/kphp_ml/kphp_ml_catboost.cpp b/runtime/kphp_ml/kphp_ml_catboost.cpp index dae506e7de..f0fa222eb0 100644 --- a/runtime/kphp_ml/kphp_ml_catboost.cpp +++ b/runtime/kphp_ml/kphp_ml_catboost.cpp @@ -8,7 +8,7 @@ #include "runtime/kphp_ml/kphp_ml_catboost.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/kphp_ml/kphp_ml.h" /* diff --git a/runtime/kphp_ml/kphp_ml_catboost.h b/runtime/kphp_ml/kphp_ml_catboost.h index 94ad2ee35b..79d8151407 100644 --- a/runtime/kphp_ml/kphp_ml_catboost.h +++ b/runtime/kphp_ml/kphp_ml_catboost.h @@ -12,7 +12,7 @@ #include #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" namespace kphp_ml { struct MLModel; } diff --git a/runtime/kphp_ml/kphp_ml_init.h b/runtime/kphp_ml/kphp_ml_init.h index c1648299da..bdb53bf70e 100644 --- a/runtime/kphp_ml/kphp_ml_init.h +++ b/runtime/kphp_ml/kphp_ml_init.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" namespace kphp_ml { struct MLModel; } diff --git a/runtime/kphp_ml/kphp_ml_interface.h b/runtime/kphp_ml/kphp_ml_interface.h index 483732a3e3..338392501b 100644 --- a/runtime/kphp_ml/kphp_ml_interface.h +++ b/runtime/kphp_ml/kphp_ml_interface.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" Optional> f$kml_xgboost_predict_matrix(const string &model_name, const array> &features_map_matrix); diff --git a/runtime/kphp_ml/kphp_ml_xgboost.cpp b/runtime/kphp_ml/kphp_ml_xgboost.cpp index aa87d6f0a4..9a65d50e48 100644 --- a/runtime/kphp_ml/kphp_ml_xgboost.cpp +++ b/runtime/kphp_ml/kphp_ml_xgboost.cpp @@ -10,7 +10,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/kphp_ml/kphp_ml.h" /* diff --git a/runtime/kphp_ml/kphp_ml_xgboost.h b/runtime/kphp_ml/kphp_ml_xgboost.h index bdad91a1ba..fe9e0555c1 100644 --- a/runtime/kphp_ml/kphp_ml_xgboost.h +++ b/runtime/kphp_ml/kphp_ml_xgboost.h @@ -11,7 +11,7 @@ #include #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" /* * For detailed comments about KML, see kphp_ml.h. diff --git a/runtime/kphp_tracing.h b/runtime/kphp_tracing.h index 420fcb33fd..21beb3b687 100644 --- a/runtime/kphp_tracing.h +++ b/runtime/kphp_tracing.h @@ -6,8 +6,8 @@ #include -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/critical_section.h" #include "runtime/dummy-visitor-methods.h" diff --git a/runtime/kphp_tracing_binlog.h b/runtime/kphp_tracing_binlog.h index b1e334ff80..3911fe04c6 100644 --- a/runtime/kphp_tracing_binlog.h +++ b/runtime/kphp_tracing_binlog.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" namespace kphp_tracing { diff --git a/runtime/mail.h b/runtime/mail.h index eb1cabf778..8e2b4cbe2f 100644 --- a/runtime/mail.h +++ b/runtime/mail.h @@ -4,6 +4,6 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" bool f$mail(const string &to, const string &subject, const string &message, string additional_headers = string()); diff --git a/runtime/math_functions.h b/runtime/math_functions.h index 13c02959a4..9102d45fbb 100644 --- a/runtime/math_functions.h +++ b/runtime/math_functions.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" int64_t f$bindec(const string &number) noexcept; diff --git a/runtime/mbstring.h b/runtime/mbstring.h index a6abe3638a..7ef6d72b38 100644 --- a/runtime/mbstring.h +++ b/runtime/mbstring.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/string_functions.h" bool mb_UTF8_check(const char *s); diff --git a/runtime/memcache.cpp b/runtime/memcache.cpp index 59508f0ba1..595b5fd1e6 100644 --- a/runtime/memcache.cpp +++ b/runtime/memcache.cpp @@ -4,7 +4,7 @@ #include "runtime/memcache.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" #include "runtime/array_functions.h" #include "runtime/json-functions.h" #include "runtime/net_events.h" diff --git a/runtime/memcache.h b/runtime/memcache.h index 0f9ff645bd..4eea328e7f 100644 --- a/runtime/memcache.h +++ b/runtime/memcache.h @@ -8,7 +8,7 @@ #include "common/algorithms/hashes.h" #include "common/wrappers/string_view.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/dummy-visitor-methods.h" #include "runtime/memory_usage.h" diff --git a/runtime/memory_resource_impl/dealer.h b/runtime/memory_resource_impl/dealer.h index e08c5b5ab6..50f454715c 100644 --- a/runtime/memory_resource_impl/dealer.h +++ b/runtime/memory_resource_impl/dealer.h @@ -3,7 +3,7 @@ // Distributed under the GPL v3 License, see LICENSE.notice.txt #pragma once -#include "runtime-core/memory-resource/unsynchronized_pool_resource.h" +#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h" #include "runtime/memory_resource_impl/heap_resource.h" namespace memory_resource { diff --git a/runtime/memory_resource_impl/heap_resource.h b/runtime/memory_resource_impl/heap_resource.h index 740b043622..e5c34643da 100644 --- a/runtime/memory_resource_impl/heap_resource.h +++ b/runtime/memory_resource_impl/heap_resource.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/memory-resource/memory_resource.h" +#include "runtime-common/core/memory-resource/memory_resource.h" namespace memory_resource { diff --git a/runtime/memory_resource_impl/memory_resource_stats.h b/runtime/memory_resource_impl/memory_resource_stats.h index dd41b25e12..b8ff22d29f 100644 --- a/runtime/memory_resource_impl/memory_resource_stats.h +++ b/runtime/memory_resource_impl/memory_resource_stats.h @@ -5,6 +5,6 @@ #pragma once #include "common/stats/provider.h" -#include "runtime-core/memory-resource/memory_resource.h" +#include "runtime-common/core/memory-resource/memory_resource.h" void write_memory_stats_to(const memory_resource::MemoryStats & memoryStats, stats_t *stats, const char *prefix) noexcept; diff --git a/runtime/memory_resource_impl/monotonic_runtime_buffer_resource.cpp b/runtime/memory_resource_impl/monotonic_runtime_buffer_resource.cpp index 7051dcc892..89441937b8 100644 --- a/runtime/memory_resource_impl/monotonic_runtime_buffer_resource.cpp +++ b/runtime/memory_resource_impl/monotonic_runtime_buffer_resource.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2024 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" #include diff --git a/runtime/memory_usage.h b/runtime/memory_usage.h index 43888b1aae..706f39dccc 100644 --- a/runtime/memory_usage.h +++ b/runtime/memory_usage.h @@ -13,7 +13,7 @@ #include "common/mixin/not_copyable.h" #include "common/type_traits/list_of_types.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/allocator.h" template diff --git a/runtime/misc.h b/runtime/misc.h index cb7e969bd8..9bba8efaa5 100644 --- a/runtime/misc.h +++ b/runtime/misc.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" string f$uniqid(const string &prefix = string(), bool more_entropy = false); diff --git a/runtime/msgpack-serialization.h b/runtime/msgpack-serialization.h index 37a1f2fee2..ee4010aa5c 100644 --- a/runtime/msgpack-serialization.h +++ b/runtime/msgpack-serialization.h @@ -11,7 +11,7 @@ #include "common/containers/final_action.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/context/runtime-context.h" #include "runtime/critical_section.h" #include "runtime/exception.h" diff --git a/runtime/msgpack/adaptors.h b/runtime/msgpack/adaptors.h index 911347d660..07be90dcd2 100644 --- a/runtime/msgpack/adaptors.h +++ b/runtime/msgpack/adaptors.h @@ -7,7 +7,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/msgpack/adaptor_base.h" #include "runtime/msgpack/check_instance_depth.h" #include "runtime/msgpack/object.h" diff --git a/runtime/msgpack/packer.cpp b/runtime/msgpack/packer.cpp index 914bd10556..8eda25229e 100644 --- a/runtime/msgpack/packer.cpp +++ b/runtime/msgpack/packer.cpp @@ -5,7 +5,7 @@ #include "runtime/msgpack/packer.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/msgpack/sysdep.h" namespace vk::msgpack { diff --git a/runtime/msgpack/unpacker.h b/runtime/msgpack/unpacker.h index 6784ae215e..2e2b8a9c65 100644 --- a/runtime/msgpack/unpacker.h +++ b/runtime/msgpack/unpacker.h @@ -6,7 +6,7 @@ #pragma once #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/msgpack/object.h" #include "runtime/msgpack/zone.h" diff --git a/runtime/mysql.h b/runtime/mysql.h index 4d812ced0f..43961329e9 100644 --- a/runtime/mysql.h +++ b/runtime/mysql.h @@ -4,8 +4,8 @@ #pragma once -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/dummy-visitor-methods.h" #include "runtime/memory_usage.h" diff --git a/runtime/on_kphp_warning_callback.h b/runtime/on_kphp_warning_callback.h index 6896c8f816..6b002e8b2a 100644 --- a/runtime/on_kphp_warning_callback.h +++ b/runtime/on_kphp_warning_callback.h @@ -5,7 +5,7 @@ #pragma once #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/critical_section.h" using on_kphp_warning_callback_type = std::function &)>; diff --git a/runtime/openssl.h b/runtime/openssl.h index 21ffb44d79..01dc705b55 100644 --- a/runtime/openssl.h +++ b/runtime/openssl.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" enum openssl_algo { OPENSSL_ALGO_SHA1 = 1, diff --git a/runtime/pdo/abstract_pdo_driver.h b/runtime/pdo/abstract_pdo_driver.h index 7c574559da..929cb80c9b 100644 --- a/runtime/pdo/abstract_pdo_driver.h +++ b/runtime/pdo/abstract_pdo_driver.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/allocator.h" struct C$PDO; diff --git a/runtime/pdo/abstract_pdo_statement.h b/runtime/pdo/abstract_pdo_statement.h index 26737846dc..08c9a0680e 100644 --- a/runtime/pdo/abstract_pdo_statement.h +++ b/runtime/pdo/abstract_pdo_statement.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/allocator.h" struct C$PDO; diff --git a/runtime/pdo/mysql/mysql_pdo_driver.h b/runtime/pdo/mysql/mysql_pdo_driver.h index f362a69b9e..1d41469a1e 100644 --- a/runtime/pdo/mysql/mysql_pdo_driver.h +++ b/runtime/pdo/mysql/mysql_pdo_driver.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/allocator.h" #include "runtime/pdo/abstract_pdo_driver.h" diff --git a/runtime/pdo/mysql/mysql_pdo_emulated_statement.h b/runtime/pdo/mysql/mysql_pdo_emulated_statement.h index b15121d80f..ccb20f302d 100644 --- a/runtime/pdo/mysql/mysql_pdo_emulated_statement.h +++ b/runtime/pdo/mysql/mysql_pdo_emulated_statement.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/pdo/abstract_pdo_statement.h" namespace database_drivers { diff --git a/runtime/pdo/pdo.h b/runtime/pdo/pdo.h index 46b9f0c022..6692b2b5c7 100644 --- a/runtime/pdo/pdo.h +++ b/runtime/pdo/pdo.h @@ -9,8 +9,8 @@ #include "common/algorithms/hashes.h" #include "common/wrappers/string_view.h" -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/dummy-visitor-methods.h" #include "runtime/memory_usage.h" #include "runtime/pdo/abstract_pdo_driver.h" diff --git a/runtime/pdo/pdo_statement.h b/runtime/pdo/pdo_statement.h index 3243117deb..780ff12e5e 100644 --- a/runtime/pdo/pdo_statement.h +++ b/runtime/pdo/pdo_statement.h @@ -9,8 +9,8 @@ #include "common/algorithms/hashes.h" #include "common/wrappers/string_view.h" -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/dummy-visitor-methods.h" #include "runtime/memory_usage.h" #include "runtime/pdo/abstract_pdo_statement.h" diff --git a/runtime/pdo/pgsql/pgsql_pdo_driver.h b/runtime/pdo/pgsql/pgsql_pdo_driver.h index 8b7d22b0b1..33f7b4e081 100644 --- a/runtime/pdo/pgsql/pgsql_pdo_driver.h +++ b/runtime/pdo/pgsql/pgsql_pdo_driver.h @@ -1,6 +1,6 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/allocator.h" #include "runtime/pdo/abstract_pdo_driver.h" diff --git a/runtime/pdo/pgsql/pgsql_pdo_emulated_statement.cpp b/runtime/pdo/pgsql/pgsql_pdo_emulated_statement.cpp index 46e0a32e7d..859df91da2 100644 --- a/runtime/pdo/pgsql/pgsql_pdo_emulated_statement.cpp +++ b/runtime/pdo/pgsql/pgsql_pdo_emulated_statement.cpp @@ -1,6 +1,6 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/pdo/pdo_statement.h" #include "runtime/pdo/pgsql/pgsql_pdo_emulated_statement.h" #include "runtime/resumable.h" diff --git a/runtime/pdo/pgsql/pgsql_pdo_emulated_statement.h b/runtime/pdo/pgsql/pgsql_pdo_emulated_statement.h index ed130ae27b..3435d1e8e0 100644 --- a/runtime/pdo/pgsql/pgsql_pdo_emulated_statement.h +++ b/runtime/pdo/pgsql/pgsql_pdo_emulated_statement.h @@ -1,6 +1,6 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/pdo/abstract_pdo_statement.h" namespace database_drivers { diff --git a/runtime/php-script-globals.h b/runtime/php-script-globals.h index a81bd03d64..9ccc627d5c 100644 --- a/runtime/php-script-globals.h +++ b/runtime/php-script-globals.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" struct PhpScriptBuiltInSuperGlobals { // variables below are PHP language superglobals diff --git a/runtime/php_assert.h b/runtime/php_assert.h index 6938094f4e..0122ed20e6 100644 --- a/runtime/php_assert.h +++ b/runtime/php_assert.h @@ -11,7 +11,7 @@ #include "common/wrappers/likely.h" #include "common/mixin/not_copyable.h" -#include "runtime-core/utils/kphp-assert-core.h" +#include "runtime-common/core/utils/kphp-assert-core.h" extern int die_on_fail; diff --git a/runtime/profiler.h b/runtime/profiler.h index cb5ae96270..4ebd67d82f 100644 --- a/runtime/profiler.h +++ b/runtime/profiler.h @@ -12,7 +12,7 @@ #include "common/mixin/not_copyable.h" #include "common/wrappers/string_view.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/allocator.h" #include "server/php-queries-stats.h" diff --git a/runtime/regexp.h b/runtime/regexp.h index 1de0260cee..1dd8fe8307 100644 --- a/runtime/regexp.h +++ b/runtime/regexp.h @@ -8,7 +8,7 @@ #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/context/runtime-context.h" #include "runtime/kphp_tracing.h" #include "runtime/mbstring.h" diff --git a/runtime/resumable.h b/runtime/resumable.h index 649e40aaf0..00ff38189f 100644 --- a/runtime/resumable.h +++ b/runtime/resumable.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/allocator.h" #include "runtime/exception.h" #include "runtime/storage.h" diff --git a/runtime/rpc.h b/runtime/rpc.h index 696ae41dc1..ef1adb3c78 100644 --- a/runtime/rpc.h +++ b/runtime/rpc.h @@ -8,7 +8,7 @@ #include "common/algorithms/hashes.h" #include "common/kprintf.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/dummy-visitor-methods.h" #include "runtime/net_events.h" #include "runtime/resumable.h" diff --git a/runtime/rpc_extra_info.h b/runtime/rpc_extra_info.h index 7de8d95af8..1cdd89ea69 100644 --- a/runtime/rpc_extra_info.h +++ b/runtime/rpc_extra_info.h @@ -9,8 +9,8 @@ #include "common/algorithms/hashes.h" #include "common/wrappers/string_view.h" -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/dummy-visitor-methods.h" using rpc_request_extra_info_t = std::tuple; // tuple(request_size) diff --git a/runtime/runtime.cmake b/runtime/runtime.cmake index 0739061987..22f523838e 100644 --- a/runtime/runtime.cmake +++ b/runtime/runtime.cmake @@ -154,7 +154,7 @@ target_include_directories(kphp_runtime PUBLIC ${BASE_DIR} /opt/curl7600/include add_dependencies(kphp_runtime kphp-timelib) prepare_cross_platform_libs(RUNTIME_LIBS yaml-cpp re2 zstd h3) # todo: linking between static libs is no-op, is this redundant? do we need to add mysqlclient here? -set(RUNTIME_LIBS vk::kphp_runtime vk::kphp_server vk::runtime-core vk::popular_common vk::unicode vk::common_src vk::binlog_src vk::net_src ${RUNTIME_LIBS} OpenSSL::Crypto m z pthread) +set(RUNTIME_LIBS vk::kphp_runtime vk::kphp_server vk::runtime-common vk::popular_common vk::unicode vk::common_src vk::binlog_src vk::net_src ${RUNTIME_LIBS} OpenSSL::Crypto m z pthread) vk_add_library(kphp-full-runtime STATIC) target_link_libraries(kphp-full-runtime PUBLIC ${RUNTIME_LIBS}) set_target_properties(kphp-full-runtime PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${OBJS_DIR}) @@ -177,7 +177,7 @@ file(GLOB_RECURSE KPHP_RUNTIME_ALL_HEADERS file(GLOB_RECURSE KPHP_RUNTIME_CORE_ALL_HEADERS RELATIVE ${BASE_DIR} CONFIGURE_DEPENDS - "${BASE_DIR}/runtime-core/*.h") + "${BASE_DIR}/runtime-common/*.h") list(APPEND KPHP_RUNTIME_ALL_HEADERS ${KPHP_RUNTIME_CORE_ALL_HEADERS}) list(TRANSFORM KPHP_RUNTIME_ALL_HEADERS REPLACE "^(.+)$" [[#include "\1"]]) list(JOIN KPHP_RUNTIME_ALL_HEADERS "\n" MERGED_RUNTIME_HEADERS) diff --git a/runtime/serialize-functions.h b/runtime/serialize-functions.h index 9ebb60a5ce..abdb05dda5 100644 --- a/runtime/serialize-functions.h +++ b/runtime/serialize-functions.h @@ -5,7 +5,7 @@ #pragma once #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/context/runtime-context.h" namespace impl_ { diff --git a/runtime/spl/array_iterator.h b/runtime/spl/array_iterator.h index 07d023a680..2cd77c275f 100644 --- a/runtime/spl/array_iterator.h +++ b/runtime/spl/array_iterator.h @@ -7,8 +7,8 @@ #include "common/algorithms/hashes.h" #include "common/wrappers/string_view.h" -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/dummy-visitor-methods.h" // C$ArrayIterator implements SPL ArrayIterator class. diff --git a/runtime/storage.h b/runtime/storage.h index 2f905618ff..853c9c3097 100644 --- a/runtime/storage.h +++ b/runtime/storage.h @@ -6,8 +6,8 @@ #include -#include "runtime-core/runtime-core.h" -#include "runtime-core/utils/small-object-storage.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/utils/small-object-storage.h" #include "runtime/exception.h" extern const char *last_wait_error; diff --git a/runtime/streams.h b/runtime/streams.h index 1ae579423a..3dd3079f52 100644 --- a/runtime/streams.h +++ b/runtime/streams.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" using Stream =mixed; diff --git a/runtime/string-list.h b/runtime/string-list.h index f7af13ce1a..b779929fca 100644 --- a/runtime/string-list.h +++ b/runtime/string-list.h @@ -5,7 +5,7 @@ #pragma once #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/allocator.h" class string_list : vk::not_copyable { diff --git a/runtime/string_functions.h b/runtime/string_functions.h index b7e3cc2995..6e8b75b11f 100644 --- a/runtime/string_functions.h +++ b/runtime/string_functions.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include extern const string COLON; diff --git a/runtime/tcp.h b/runtime/tcp.h index 1772ca7a7b..74343b5c4f 100644 --- a/runtime/tcp.h +++ b/runtime/tcp.h @@ -1,6 +1,6 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" void global_init_tcp_lib(); diff --git a/runtime/tl/rpc_function.h b/runtime/tl/rpc_function.h index a2df8b19e8..31a69d61e4 100644 --- a/runtime/tl/rpc_function.h +++ b/runtime/tl/rpc_function.h @@ -8,7 +8,7 @@ #include "common/algorithms/hashes.h" #include "common/wrappers/string_view.h" -#include "runtime-core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" struct tl_func_base; diff --git a/runtime/tl/rpc_req_error.h b/runtime/tl/rpc_req_error.h index e41918a864..6be9bbb3f9 100644 --- a/runtime/tl/rpc_req_error.h +++ b/runtime/tl/rpc_req_error.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" struct RpcError { int error_code = 0; diff --git a/runtime/tl/rpc_response.h b/runtime/tl/rpc_response.h index c3fb435e4c..8430a893ec 100644 --- a/runtime/tl/rpc_response.h +++ b/runtime/tl/rpc_response.h @@ -4,8 +4,8 @@ #pragma once -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/tl/rpc_function.h" class RpcErrorFactory { diff --git a/runtime/tl/rpc_tl_query.h b/runtime/tl/rpc_tl_query.h index 1d979d8549..85276b072b 100644 --- a/runtime/tl/rpc_tl_query.h +++ b/runtime/tl/rpc_tl_query.h @@ -6,8 +6,8 @@ #include -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" class RpcRequestResult; diff --git a/runtime/tl/tl_builtins.h b/runtime/tl/tl_builtins.h index caf0a927dc..83400e3ae7 100644 --- a/runtime/tl/tl_builtins.h +++ b/runtime/tl/tl_builtins.h @@ -8,7 +8,7 @@ #include #include "common/tl/constants/common.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/rpc.h" #include "runtime/tl/rpc_function.h" #include "runtime/tl/rpc_tl_query.h" diff --git a/runtime/tl/tl_func_base.h b/runtime/tl/tl_func_base.h index 04b73612a8..6b3f63c7ee 100644 --- a/runtime/tl/tl_func_base.h +++ b/runtime/tl/tl_func_base.h @@ -3,7 +3,7 @@ // Distributed under the GPL v3 License, see LICENSE.notice.txt #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/tl/rpc_function.h" #include "runtime/allocator.h" diff --git a/runtime/tl/tl_magics_decoding.h b/runtime/tl/tl_magics_decoding.h index dfdcd1073e..0c72a9bb87 100644 --- a/runtime/tl/tl_magics_decoding.h +++ b/runtime/tl/tl_magics_decoding.h @@ -6,7 +6,7 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" const char *tl_magic_convert_to_name(uint32_t magic) noexcept; array tl_magic_get_all_functions() noexcept; diff --git a/runtime/to-array-processor.h b/runtime/to-array-processor.h index 19ac809395..2eab2ef7e0 100644 --- a/runtime/to-array-processor.h +++ b/runtime/to-array-processor.h @@ -8,7 +8,7 @@ #include "common/mixin/not_copyable.h" #include "common/smart_ptrs/singleton.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" class ShapeKeyDemangle : vk::not_copyable { public: diff --git a/runtime/to-json-processor.h b/runtime/to-json-processor.h index c2d502fb6d..3ba5c7f333 100644 --- a/runtime/to-json-processor.h +++ b/runtime/to-json-processor.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/json-processor-utils.h" #include "runtime/json-writer.h" diff --git a/runtime/typed_rpc.h b/runtime/typed_rpc.h index 88d5beaa59..e6a9a4c09f 100644 --- a/runtime/typed_rpc.h +++ b/runtime/typed_rpc.h @@ -3,7 +3,7 @@ // Distributed under the GPL v3 License, see LICENSE.notice.txt #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/rpc_extra_info.h" #include "runtime/tl/rpc_function.h" #include "runtime/tl/rpc_request.h" diff --git a/runtime/uber-h3.h b/runtime/uber-h3.h index 80145ace52..45a9757424 100644 --- a/runtime/uber-h3.h +++ b/runtime/uber-h3.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" int64_t f$UberH3$$geoToH3(double latitude, double longitude, int64_t resolution) noexcept; std::tuple f$UberH3$$h3ToGeo(int64_t h3_index) noexcept; diff --git a/runtime/udp.h b/runtime/udp.h index f64087b1b2..391b8f067b 100644 --- a/runtime/udp.h +++ b/runtime/udp.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" void global_init_udp_lib(); diff --git a/runtime/url.h b/runtime/url.h index bd4232aaed..a3721f2f3e 100644 --- a/runtime/url.h +++ b/runtime/url.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/context/runtime-context.h" diff --git a/runtime/vkext.h b/runtime/vkext.h index b41e87d71f..c53a8ba6fc 100644 --- a/runtime/vkext.h +++ b/runtime/vkext.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" string f$vk_utf8_to_win(const string &text, int64_t max_len = 0, bool exit_on_error = false); diff --git a/runtime/vkext_stats.h b/runtime/vkext_stats.h index 03c993305b..41073c0008 100644 --- a/runtime/vkext_stats.h +++ b/runtime/vkext_stats.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" Optional f$vk_stats_hll_merge(const array &a); Optional f$vk_stats_hll_count(const string &hll); diff --git a/runtime/zlib.h b/runtime/zlib.h index 7da2742314..6e039357e8 100644 --- a/runtime/zlib.h +++ b/runtime/zlib.h @@ -8,8 +8,8 @@ #include "common/wrappers/string_view.h" -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/dummy-visitor-methods.h" constexpr int64_t ZLIB_ENCODING_RAW = -0x0f; diff --git a/runtime/zstd.h b/runtime/zstd.h index 752eab7410..9c4cb83d38 100644 --- a/runtime/zstd.h +++ b/runtime/zstd.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" constexpr int DEFAULT_COMPRESS_LEVEL = 3; diff --git a/server/confdata-binlog-events.h b/server/confdata-binlog-events.h index 8aef180608..06cececc6d 100644 --- a/server/confdata-binlog-events.h +++ b/server/confdata-binlog-events.h @@ -7,7 +7,7 @@ #include "common/type_traits/list_of_types.h" #include "server/pmemcached-binlog-interface.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/memcache.h" namespace impl_ { diff --git a/server/confdata-binlog-replay.cpp b/server/confdata-binlog-replay.cpp index d7efc8bebe..7d587593d5 100644 --- a/server/confdata-binlog-replay.cpp +++ b/server/confdata-binlog-replay.cpp @@ -27,10 +27,10 @@ #include "common/wrappers/string_view.h" #include "common/kfs/kfs.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/allocator.h" #include "runtime/confdata-global-manager.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "server/confdata-binlog-events.h" #include "server/confdata-stats.h" #include "server/server-log.h" diff --git a/server/database-drivers/adaptor.h b/server/database-drivers/adaptor.h index 3dafb82e79..46a9e5dc59 100644 --- a/server/database-drivers/adaptor.h +++ b/server/database-drivers/adaptor.h @@ -9,7 +9,7 @@ #include "common/mixin/not_copyable.h" #include "common/smart_ptrs/singleton.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "net/net-events.h" #include "runtime/critical_section.h" #include "runtime/signal_safe_hashtable.h" diff --git a/server/database-drivers/mysql/mysql-connector.h b/server/database-drivers/mysql/mysql-connector.h index 47f82a9bf8..c5da2391c5 100644 --- a/server/database-drivers/mysql/mysql-connector.h +++ b/server/database-drivers/mysql/mysql-connector.h @@ -7,7 +7,7 @@ #include #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "server/database-drivers/connector.h" namespace database_drivers { diff --git a/server/database-drivers/mysql/mysql-request.h b/server/database-drivers/mysql/mysql-request.h index deb12a240b..59bfd03a93 100644 --- a/server/database-drivers/mysql/mysql-request.h +++ b/server/database-drivers/mysql/mysql-request.h @@ -4,7 +4,7 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "server/database-drivers/request.h" namespace database_drivers { diff --git a/server/database-drivers/mysql/mysql.h b/server/database-drivers/mysql/mysql.h index 318603d22e..87d7f8f6dd 100644 --- a/server/database-drivers/mysql/mysql.h +++ b/server/database-drivers/mysql/mysql.h @@ -5,7 +5,7 @@ #pragma once #include "common/kprintf.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/allocator.h" #include "runtime/critical_section.h" diff --git a/server/database-drivers/pgsql/pgsql-connector.h b/server/database-drivers/pgsql/pgsql-connector.h index 9d8f288a08..3115af8bea 100644 --- a/server/database-drivers/pgsql/pgsql-connector.h +++ b/server/database-drivers/pgsql/pgsql-connector.h @@ -3,7 +3,7 @@ #include #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "server/database-drivers/connector.h" #include "server/database-drivers/pgsql/pgsql.h" #include "server/database-drivers/pgsql/pgsql-storage.h" diff --git a/server/database-drivers/pgsql/pgsql-request.h b/server/database-drivers/pgsql/pgsql-request.h index 547e1384a2..1720fd410d 100644 --- a/server/database-drivers/pgsql/pgsql-request.h +++ b/server/database-drivers/pgsql/pgsql-request.h @@ -1,6 +1,6 @@ #pragma once -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "server/database-drivers/request.h" namespace database_drivers { diff --git a/server/database-drivers/pgsql/pgsql.h b/server/database-drivers/pgsql/pgsql.h index fae78aecfa..d710178da3 100644 --- a/server/database-drivers/pgsql/pgsql.h +++ b/server/database-drivers/pgsql/pgsql.h @@ -1,7 +1,7 @@ #pragma once #include "common/kprintf.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/allocator.h" #include "runtime/critical_section.h" diff --git a/server/job-workers/job-message.h b/server/job-workers/job-message.h index 8c60491579..26c7ef6b8b 100644 --- a/server/job-workers/job-message.h +++ b/server/job-workers/job-message.h @@ -6,8 +6,8 @@ #include "common/mixin/not_copyable.h" -#include "runtime-core/runtime-core.h" -#include "runtime-core/memory-resource/unsynchronized_pool_resource.h" +#include "runtime-common/core/runtime-core.h" +#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h" #include "runtime/job-workers/job-interface.h" namespace job_workers { diff --git a/server/job-workers/job-stats.cpp b/server/job-workers/job-stats.cpp index cc777bf38e..5d1e219d3a 100644 --- a/server/job-workers/job-stats.cpp +++ b/server/job-workers/job-stats.cpp @@ -5,7 +5,7 @@ #include #include -#include "runtime-core/memory-resource/extra-memory-pool.h" +#include "runtime-common/core/memory-resource/extra-memory-pool.h" #include "server/job-workers/job-stats.h" diff --git a/server/job-workers/shared-memory-manager.h b/server/job-workers/shared-memory-manager.h index 3d80564baf..19602da2eb 100644 --- a/server/job-workers/shared-memory-manager.h +++ b/server/job-workers/shared-memory-manager.h @@ -8,7 +8,7 @@ #include "common/mixin/not_copyable.h" #include "common/smart_ptrs/singleton.h" -#include "runtime-core/memory-resource/extra-memory-pool.h" +#include "runtime-common/core/memory-resource/extra-memory-pool.h" #include "runtime/critical_section.h" #include "server/job-workers/job-stats.h" #include "server/job-workers/job-workers-context.h" diff --git a/server/server-stats.h b/server/server-stats.h index 170459da41..f00baafc02 100644 --- a/server/server-stats.h +++ b/server/server-stats.h @@ -12,7 +12,7 @@ #include "common/smart_ptrs/singleton.h" #include "common/stats/provider.h" -#include "runtime-core/memory-resource/memory_resource.h" +#include "runtime-common/core/memory-resource/memory_resource.h" #include "server/php-runner.h" #include "server/workers-control.h" diff --git a/server/statshouse/statshouse-manager.h b/server/statshouse/statshouse-manager.h index 31f64a3e7f..3f7bde398b 100644 --- a/server/statshouse/statshouse-manager.h +++ b/server/statshouse/statshouse-manager.h @@ -9,7 +9,7 @@ #include "common/dl-utils-lite.h" #include "common/mixin/not_copyable.h" -#include "runtime-core/memory-resource/memory_resource.h" +#include "runtime-common/core/memory-resource/memory_resource.h" #include "server/job-workers/job-stats.h" #include "server/php-queries.h" #include "server/statshouse/statshouse-client.h" diff --git a/tests/cpp/runtime/array-int-string-keys-collision-test.cpp b/tests/cpp/runtime/array-int-string-keys-collision-test.cpp index f0085a9f71..d17913b1c3 100644 --- a/tests/cpp/runtime/array-int-string-keys-collision-test.cpp +++ b/tests/cpp/runtime/array-int-string-keys-collision-test.cpp @@ -1,6 +1,6 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/array_functions.h" class ArrayIntStringKeysCollision : public testing::Test { diff --git a/tests/cpp/runtime/array-test.cpp b/tests/cpp/runtime/array-test.cpp index f2ac66c4e9..fff3bc3fbf 100644 --- a/tests/cpp/runtime/array-test.cpp +++ b/tests/cpp/runtime/array-test.cpp @@ -1,6 +1,6 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" TEST(array_test, find_no_mutate_in_empy_array) { array arr; diff --git a/tests/cpp/runtime/kphp-type-traits-test.cpp b/tests/cpp/runtime/kphp-type-traits-test.cpp index ccec5ea19e..c22d133a5c 100644 --- a/tests/cpp/runtime/kphp-type-traits-test.cpp +++ b/tests/cpp/runtime/kphp-type-traits-test.cpp @@ -1,7 +1,7 @@ #include -#include "runtime-core/class-instance/refcountable-php-classes.h" -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/class-instance/refcountable-php-classes.h" +#include "runtime-common/core/runtime-core.h" struct Stub : refcountable_php_classes { }; diff --git a/tests/cpp/runtime/memory_resource/details/memory_chunk_list-test.cpp b/tests/cpp/runtime/memory_resource/details/memory_chunk_list-test.cpp index 0921607e8f..3c53309e21 100644 --- a/tests/cpp/runtime/memory_resource/details/memory_chunk_list-test.cpp +++ b/tests/cpp/runtime/memory_resource/details/memory_chunk_list-test.cpp @@ -1,6 +1,6 @@ #include -#include "runtime-core/memory-resource/details/memory_chunk_list.h" +#include "runtime-common/core/memory-resource/details/memory_chunk_list.h" TEST(unsynchronized_memory_chunk_list_test, empty) { memory_resource::details::memory_chunk_list mem_chunk_list; diff --git a/tests/cpp/runtime/memory_resource/details/memory_chunk_tree-test.cpp b/tests/cpp/runtime/memory_resource/details/memory_chunk_tree-test.cpp index da5b377700..f8778a01e2 100644 --- a/tests/cpp/runtime/memory_resource/details/memory_chunk_tree-test.cpp +++ b/tests/cpp/runtime/memory_resource/details/memory_chunk_tree-test.cpp @@ -4,8 +4,8 @@ #include #include -#include "runtime-core/memory-resource/details/memory_chunk_tree.h" -#include "runtime-core/memory-resource/details/memory_ordered_chunk_list.h" +#include "runtime-common/core/memory-resource/details/memory_chunk_tree.h" +#include "runtime-common/core/memory-resource/details/memory_ordered_chunk_list.h" #include "tests/cpp/runtime/memory_resource/details/test-helpers.h" TEST(memory_chunk_tree_test, empty) { diff --git a/tests/cpp/runtime/memory_resource/details/memory_ordered_chunk_list-test.cpp b/tests/cpp/runtime/memory_resource/details/memory_ordered_chunk_list-test.cpp index b29acbfb3d..35b2f8b39f 100644 --- a/tests/cpp/runtime/memory_resource/details/memory_ordered_chunk_list-test.cpp +++ b/tests/cpp/runtime/memory_resource/details/memory_ordered_chunk_list-test.cpp @@ -4,8 +4,8 @@ #include #include -#include "runtime-core/memory-resource/details/memory_ordered_chunk_list.h" -#include "runtime-core/memory-resource/monotonic_buffer_resource.h" +#include "runtime-common/core/memory-resource/details/memory_ordered_chunk_list.h" +#include "runtime-common/core/memory-resource/monotonic_buffer_resource.h" #include "tests/cpp/runtime/memory_resource/details/test-helpers.h" TEST(memory_ordered_chunk_list_test, empty) { diff --git a/tests/cpp/runtime/memory_resource/details/test-helpers.h b/tests/cpp/runtime/memory_resource/details/test-helpers.h index cfc69ca9fe..67761d633c 100644 --- a/tests/cpp/runtime/memory_resource/details/test-helpers.h +++ b/tests/cpp/runtime/memory_resource/details/test-helpers.h @@ -2,8 +2,8 @@ #include "common/wrappers/to_array.h" -#include "runtime-core/memory-resource/details/memory_chunk_list.h" -#include "runtime-core/memory-resource/memory_resource.h" +#include "runtime-common/core/memory-resource/details/memory_chunk_list.h" +#include "runtime-common/core/memory-resource/memory_resource.h" template inline auto make_offsets(const std::array &sizes) { diff --git a/tests/cpp/runtime/memory_resource/extra-memory-pool-test.cpp b/tests/cpp/runtime/memory_resource/extra-memory-pool-test.cpp index 92bae2ccb8..2a4748941f 100644 --- a/tests/cpp/runtime/memory_resource/extra-memory-pool-test.cpp +++ b/tests/cpp/runtime/memory_resource/extra-memory-pool-test.cpp @@ -5,7 +5,7 @@ #include #include -#include "runtime-core/memory-resource/extra-memory-pool.h" +#include "runtime-common/core/memory-resource/extra-memory-pool.h" namespace mr = memory_resource; diff --git a/tests/cpp/runtime/memory_resource/unsynchronized_pool_resource-test.cpp b/tests/cpp/runtime/memory_resource/unsynchronized_pool_resource-test.cpp index 969fba48df..4d695b2239 100644 --- a/tests/cpp/runtime/memory_resource/unsynchronized_pool_resource-test.cpp +++ b/tests/cpp/runtime/memory_resource/unsynchronized_pool_resource-test.cpp @@ -1,7 +1,7 @@ #include #include -#include "runtime-core/memory-resource/unsynchronized_pool_resource.h" +#include "runtime-common/core/memory-resource/unsynchronized_pool_resource.h" TEST(unsynchronized_pool_resource_test, uninited_state) { memory_resource::unsynchronized_pool_resource resource; diff --git a/tests/cpp/runtime/msgpack-test.cpp b/tests/cpp/runtime/msgpack-test.cpp index d55072723d..5e748f813f 100644 --- a/tests/cpp/runtime/msgpack-test.cpp +++ b/tests/cpp/runtime/msgpack-test.cpp @@ -1,4 +1,4 @@ -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/msgpack-serialization.h" #include #include diff --git a/tests/cpp/runtime/number-string-comparison.cpp b/tests/cpp/runtime/number-string-comparison.cpp index 995a0dbe68..b406505a9a 100644 --- a/tests/cpp/runtime/number-string-comparison.cpp +++ b/tests/cpp/runtime/number-string-comparison.cpp @@ -1,6 +1,6 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" template struct TestCaseComparison { diff --git a/tests/cpp/runtime/string-test.cpp b/tests/cpp/runtime/string-test.cpp index 90dc4ffda9..ae2177fabc 100644 --- a/tests/cpp/runtime/string-test.cpp +++ b/tests/cpp/runtime/string-test.cpp @@ -1,6 +1,6 @@ #include -#include "runtime-core/runtime-core.h" +#include "runtime-common/core/runtime-core.h" #include "runtime/string_functions.h" TEST(string_test, test_empty) { diff --git a/tests/cpp/server/job-workers/shared-memory-manager-test.cpp b/tests/cpp/server/job-workers/shared-memory-manager-test.cpp index a79c3005b4..e3789f315d 100644 --- a/tests/cpp/server/job-workers/shared-memory-manager-test.cpp +++ b/tests/cpp/server/job-workers/shared-memory-manager-test.cpp @@ -6,7 +6,7 @@ #include "common/macos-ports.h" -#include "runtime-core/memory-resource/extra-memory-pool.h" +#include "runtime-common/core/memory-resource/extra-memory-pool.h" #include "server/job-workers/job-message.h" #include "server/job-workers/job-stats.h" #include "server/job-workers/job-workers-context.h" diff --git a/tests/phpt/warnings/6_disable_warnings.php b/tests/phpt/warnings/6_disable_warnings.php index 15acc5482e..8bfe6281c6 100644 --- a/tests/phpt/warnings/6_disable_warnings.php +++ b/tests/phpt/warnings/6_disable_warnings.php @@ -1,4 +1,4 @@ -@kphp_runtime_should_not_warn ok +@kphp_runtime_should_not_warn ok k2_skip