[k2] implement strtotime (#1318)

This commit also adds __wrap_strdup

Author: apolyakov

builtin-functions/kphp-light/stdlib/time-functions.txt

@@ -7,20 +7,23 @@ function mktime ($h ::: int = PHP_INT_MIN, $m ::: int = PHP_INT_MIN, $s ::: int
 
 function date ($format ::: string, $timestamp ::: int = PHP_INT_MIN) ::: string;
 
+function date_default_timezone_get() ::: string;
+
 function date_default_timezone_set ($s ::: string) ::: bool;
 
 function gmdate ($format ::: string, $timestamp ::: int = PHP_INT_MIN) ::: string;
 
 function time() ::: int;
 
+function strtotime ($time ::: string, $timestamp ::: int = PHP_INT_MIN) ::: int | false;
+
 function microtime ($get_as_float ::: bool = false) ::: mixed;
 
 function hrtime (bool $as_number = false): mixed; // int[]|int
 
 /** @kphp-extern-func-info interruptible */
 function set_timer(int $timeout, callable():void $callback) ::: void;
 
-
 // ===== UNSUPPORTED =====
 
 /** @kphp-generate-stub-class */
@@ -167,8 +170,6 @@ define('DATE_RFC3339', "Y-m-d\TH:i:sP");
 define('DATE_RSS', "D, d M Y H:i:s O");
 define('DATE_W3C', "Y-m-d\TH:i:sP");
 
-/** @kphp-extern-func-info stub generation-required */
-function date_default_timezone_get() ::: string;
 /** @kphp-extern-func-info stub generation-required */
 function getdate ($timestamp ::: int = PHP_INT_MIN) ::: mixed[];
 /** @kphp-extern-func-info stub generation-required */
@@ -178,9 +179,6 @@ function gmmktime ($h ::: int = PHP_INT_MIN, $m ::: int = PHP_INT_MIN, $s ::: in
 function localtime ($timestamp ::: int = PHP_INT_MIN, $is_associative ::: bool = false) ::: mixed[];
 /** @kphp-extern-func-info stub generation-required */
 function strftime ($format ::: string, $timestamp ::: int = PHP_INT_MIN) ::: string;
-/** @kphp-extern-func-info stub generation-required */
-function strtotime ($time ::: string, $timestamp ::: int = PHP_INT_MIN) ::: int | false;
-
 
 /** @kphp-extern-func-info stub generation-required */
 function checkdate ($month ::: int, $day ::: int, $year ::: int) ::: bool;

compiler/make/objs-to-k2-component-target.h

@@ -36,7 +36,7 @@ class Objs2K2ComponentTarget : public Target {
 #if defined(__APPLE__)
     return " -Wl,-undefined,dynamic_lookup ";
 #else
-    return " -Wl,--wrap,malloc -Wl,--wrap,free, -Wl,--wrap,calloc -Wl,--wrap,realloc -static-libgcc ";
+    return " -Wl,--wrap,malloc -Wl,--wrap,free, -Wl,--wrap,calloc -Wl,--wrap,realloc -Wl,--wrap,strdup -static-libgcc ";
 #endif
   }
 

runtime-light/allocator-wrapper/libc-alloc-wrapper.cpp

@@ -3,6 +3,7 @@
 // Distributed under the GPL v3 License, see LICENSE.notice.txt
 
 #include <cstddef>
+#include <cstring>
 
 #include "runtime-common/core/allocator/script-malloc-interface.h"
 #include "runtime-light/allocator/allocator-state.h"
@@ -29,9 +30,17 @@ extern "C" void* __wrap_calloc(size_t nmemb, size_t size) noexcept {
   return kphp::memory::script::calloc(nmemb, size);
 }
 
-extern "C" void* __wrap_realloc([[maybe_unused]] void* ptr, [[maybe_unused]] size_t size) noexcept {
+extern "C" void* __wrap_realloc(void* ptr, size_t size) noexcept {
   if (!AllocatorState::get().libc_alloc_allowed()) [[unlikely]] {
     kphp::log::error("unexpected use of realloc");
   }
   return kphp::memory::script::realloc(ptr, size);
 }
+
+extern "C" char* __wrap_strdup(const char* str1) noexcept {
+  if (!AllocatorState::get().libc_alloc_allowed()) [[unlikely]] {
+    kphp::log::error("unexpected use of strdup");
+  }
+  auto* str2{static_cast<char*>(kphp::memory::script::alloc(std::strlen(str1) + 1))};
+  return std::strcpy(str2, str1);
+}

runtime-light/k2-platform/k2-api.h

@@ -7,7 +7,9 @@
 #include <cerrno>
 #include <cstddef>
 #include <cstdint>
+#include <ctime>
 #include <memory>
+#include <string_view>
 #include <sys/utsname.h>
 #include <utility>
 
@@ -204,6 +206,14 @@ inline auto env_fetch(uint32_t arg_num) noexcept {
                         std::unique_ptr<char, decltype(std::addressof(k2::free))>{value_buffer, k2::free});
 }
 
+inline int32_t set_timezone(std::string_view timezone) noexcept {
+  return k2_set_timezone(timezone.data());
+}
+
+inline struct tm* localtime_r(const time_t* timer, struct tm* result) noexcept {
+  return k2_localtime_r(timer, result);
+}
+
 inline int32_t udp_connect(uint64_t* socket_d, const char* host, size_t host_len) noexcept {
   return k2_udp_connect(socket_d, host, host_len);
 }

runtime-light/runtime-light.cmake

@@ -1,3 +1,4 @@
+include(${THIRD_PARTY_DIR}/timelib-cmake/timelib.cmake)
 include(${THIRD_PARTY_DIR}/pcre2-cmake/pcre2.cmake)
 
 # =================================================================================================
@@ -54,9 +55,9 @@ vk_add_library_pic(runtime-light-pic OBJECT ${RUNTIME_LIGHT_SRC})
 target_compile_options(runtime-light-pic PUBLIC ${RUNTIME_LIGHT_COMPILE_FLAGS})
 target_link_libraries(runtime-light-pic PUBLIC vk::pic::libc-alloc-wrapper) # it's mandatory to have alloc-wrapper first in the list of link libraries since we
                                                                             # want to use its symbols in all other libraries
-target_link_libraries(runtime-light-pic PUBLIC PCRE2::pic::pcre2 ZLIB::pic::zlib) # third parties
+target_link_libraries(runtime-light-pic PUBLIC KPHP_TIMELIB::pic::timelib PCRE2::pic::pcre2 ZLIB::pic::zlib) # third parties
 
-set(RUNTIME_LIGHT_LINK_LIBS "${PCRE2_PIC_LIBRARIES} ${ZLIB_PIC_LIBRARIES}")
+set(RUNTIME_LIGHT_LINK_LIBS "${KPHP_TIMELIB_PIC_LIBRARIES} ${PCRE2_PIC_LIBRARIES} ${ZLIB_PIC_LIBRARIES}")
 
 # =================================================================================================
 

runtime-light/runtime-light.cpp

@@ -16,7 +16,6 @@ ImageState* k2_create_image() {
   auto* image_state_ptr{static_cast<ImageState*>(k2::alloc(sizeof(ImageState)))};
   if (image_state_ptr == nullptr) [[unlikely]] {
     kphp::log::error("can't allocate enough memory for image state");
-    return nullptr;
   }
   kphp::log::debug("finish image state creation");
   return image_state_ptr;
@@ -34,7 +33,6 @@ ComponentState* k2_create_component() {
   auto* component_state_ptr{static_cast<ComponentState*>(k2::alloc(sizeof(ComponentState)))};
   if (component_state_ptr == nullptr) [[unlikely]] {
     kphp::log::error("can't allocate enough memory for component state");
-    return nullptr;
   }
   kphp::log::debug("finish component state creation");
   return component_state_ptr;
@@ -51,7 +49,6 @@ InstanceState* k2_create_instance() {
   auto* instance_state_ptr{static_cast<InstanceState*>(k2::alloc(sizeof(InstanceState)))};
   if (instance_state_ptr == nullptr) [[unlikely]] {
     kphp::log::error("can't allocate enough memory for instance state");
-    return nullptr;
   }
   kphp::log::debug("finish instance state creation");
   return instance_state_ptr;

runtime-light/state/image-state.h

@@ -17,13 +17,13 @@
 #include "runtime-light/stdlib/math/math-state.h"
 #include "runtime-light/stdlib/rpc/rpc-client-state.h"
 #include "runtime-light/stdlib/string/string-state.h"
+#include "runtime-light/stdlib/time/time-state.h"
 #include "runtime-light/stdlib/visitors/shape-visitors.h"
 #include "runtime-light/utils/logs.h"
 
 struct ImageState final : private vk::not_copyable {
   AllocatorState image_allocator_state{INIT_IMAGE_ALLOCATOR_SIZE, 0};
 
-  char* c_linear_mem{nullptr};
   uint32_t pid{k2::getpid()};
   string uname_info_s;
   string uname_info_n;
@@ -34,9 +34,10 @@ struct ImageState final : private vk::not_copyable {
 
   ShapeKeyDemangle shape_key_demangler;
 
-  RpcImageState rpc_image_state;
   StringImageState string_image_state;
+  TimeImageState time_image_state;
   MathImageState math_image_state;
+  RpcImageState rpc_image_state;
 
   ImageState() noexcept {
     utsname uname_info{};

runtime-light/state/instance-state.h

@@ -35,6 +35,7 @@
 #include "runtime-light/stdlib/string/regex-state.h"
 #include "runtime-light/stdlib/string/string-state.h"
 #include "runtime-light/stdlib/system/system-state.h"
+#include "runtime-light/stdlib/time/time-state.h"
 
 // Coroutine scheduler type. Change it here if you want to use another scheduler
 using CoroutineScheduler = SimpleCoroutineScheduler;
@@ -61,10 +62,7 @@ struct InstanceState final : vk::not_copyable {
   template<typename T>
   using list = kphp::stl::list<T, kphp::memory::script_allocator>;
 
-  InstanceState() noexcept
-      : instance_allocator_state(INIT_INSTANCE_ALLOCATOR_SIZE, 0) {}
-
-  ~InstanceState() = default;
+  InstanceState() noexcept = default;
 
   static InstanceState& get() noexcept {
     return *k2::instance_state();
@@ -106,7 +104,7 @@ struct InstanceState final : vk::not_copyable {
   void release_stream(uint64_t) noexcept;
   void release_all_streams() noexcept;
 
-  AllocatorState instance_allocator_state;
+  AllocatorState instance_allocator_state{INIT_INSTANCE_ALLOCATOR_SIZE, 0};
 
   CoroutineScheduler scheduler;
   ForkInstanceState fork_instance_state;
@@ -124,6 +122,7 @@ struct InstanceState final : vk::not_copyable {
   JobWorkerServerInstanceState job_worker_server_instance_state;
   InstanceCacheInstanceState instance_cache_instance_state;
 
+  TimeInstanceState time_instance_state;
   MathInstanceState math_instance_state;
   RandomInstanceState random_instance_state;
   RegexInstanceState regex_instance_state;

runtime-light/stdlib/stdlib.cmake

@@ -34,4 +34,6 @@ prepend(
   file/file-system-state.cpp
   file/resource.cpp
   time/time-functions.cpp
+  time/time-state.cpp
+  time/timelib-functions.cpp
   zlib/zlib-functions.cpp)

runtime-light/stdlib/time/time-functions.cpp

@@ -7,14 +7,14 @@
 #include <array>
 #include <chrono>
 #include <climits>
+#include <cstdint>
 #include <ctime>
 #include <string_view>
 
-#include "runtime-light/utils/logs.h"
+#include "runtime-common/core/runtime-core.h"
+#include "runtime-light/stdlib/time/timelib-constants.h"
 
 namespace {
-constexpr std::string_view PHP_TIMELIB_TZ_MOSCOW = "Europe/Moscow";
-constexpr std::string_view PHP_TIMELIB_TZ_GMT3 = "Etc/GMT-3";
 
 constexpr std::array<std::string_view, 12> PHP_TIMELIB_MON_FULL_NAMES = {"January", "February", "March",     "April",   "May",      "June",
                                                                          "July",    "August",   "September", "October", "November", "December"};
@@ -65,6 +65,21 @@ void iso_week_number(int y, int doy, int weekday, int& iw, int& iy) noexcept {
   }
 }
 
+} // namespace
+
+namespace kphp::time::impl {
+
+int64_t fix_year(int64_t year) noexcept {
+  if (year <= 100U) {
+    if (year <= 69) {
+      year += 2000;
+    } else {
+      year += 1900;
+    }
+  }
+  return year;
+}
+
 string date(const string& format, const tm& t, int64_t timestamp, bool local) noexcept {
   string_buffer& SB{RuntimeContext::get().static_SB};
 
@@ -196,7 +211,7 @@ string date(const string& format, const tm& t, int64_t timestamp, bool local) no
       break;
     case 'e':
       if (local) {
-        SB << PHP_TIMELIB_TZ_MOSCOW.data();
+        SB << kphp::timelib::timezones::MOSCOW.data();
       } else {
         SB << "UTC";
       }
@@ -294,59 +309,4 @@ string date(const string& format, const tm& t, int64_t timestamp, bool local) no
   return SB.str();
 }
 
-int64_t fix_year(int64_t year) noexcept {
-  if (year <= 100U) {
-    if (year <= 69) {
-      year += 2000;
-    } else {
-      year += 1900;
-    }
-  }
-  return year;
-}
-
-} // namespace
-
-int64_t f$mktime(Optional<int64_t> hour, Optional<int64_t> minute, Optional<int64_t> second, Optional<int64_t> month, Optional<int64_t> day,
-                 Optional<int64_t> year) noexcept {
-  namespace chrono = std::chrono;
-  const auto time_since_epoch{chrono::system_clock::now().time_since_epoch()};
-  chrono::year_month_day current_date{chrono::sys_days{duration_cast<chrono::days>(time_since_epoch)}};
-
-  const auto hours{chrono::hours(hour.has_value() ? hour.val() : duration_cast<chrono::hours>(time_since_epoch).count() % 24)};
-  const auto minutes{chrono::minutes(minute.has_value() ? minute.val() : duration_cast<chrono::minutes>(time_since_epoch).count() % 60)};
-  const auto seconds{chrono::seconds(second.has_value() ? second.val() : duration_cast<chrono::seconds>(time_since_epoch).count() % 60)};
-  const auto months{chrono::months(month.has_value() ? month.val() : static_cast<unsigned>(current_date.month()))};
-  const auto days{chrono::days(day.has_value() ? day.val() : static_cast<unsigned>(current_date.day()))};
-  const auto years{chrono::years(year.has_value() ? fix_year(year.val()) : static_cast<int>(current_date.year()) - 1970)};
-
-  const auto result{hours + minutes + seconds + months + days + years};
-  return duration_cast<chrono::seconds>(result).count();
-}
-
-string f$gmdate(const string& format, Optional<int64_t> timestamp) noexcept {
-  namespace chrono = std::chrono;
-
-  const time_t now{timestamp.has_value() ? timestamp.val() : duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count()};
-  struct tm tm {};
-  gmtime_r(&now, &tm);
-  return date(format, tm, now, false);
-}
-
-string f$date(const string& format, Optional<int64_t> timestamp) noexcept {
-  namespace chrono = std::chrono;
-
-  const time_t now{timestamp.has_value() ? timestamp.val() : duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count()};
-  struct tm tm {};
-  localtime_r(&now, &tm);
-  return date(format, tm, now, true);
-}
-
-bool f$date_default_timezone_set(const string& s) noexcept {
-  const std::string_view timezone_view{s.c_str(), s.size()};
-  if (timezone_view != PHP_TIMELIB_TZ_GMT3 && timezone_view != PHP_TIMELIB_TZ_MOSCOW) {
-    kphp::log::warning("unsupported default timezone '{}'", s.c_str());
-    return false;
-  }
-  return true;
-}
+} // namespace kphp::time::impl