From 5c2b6e234c0e346e8e0c8a1e15f47569ad4ef4e8 Mon Sep 17 00:00:00 2001 From: Petr Shumilov Date: Mon, 28 Oct 2024 14:03:14 +0300 Subject: [PATCH] Fix typos Signed-off-by: Petr Shumilov --- common/ucontext/ucontext-portable-test.cpp | 3 +++ server/php-runner.cpp | 2 +- server/signal-handlers.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/ucontext/ucontext-portable-test.cpp b/common/ucontext/ucontext-portable-test.cpp index 4798b13fa6..01c4ed734d 100644 --- a/common/ucontext/ucontext-portable-test.cpp +++ b/common/ucontext/ucontext-portable-test.cpp @@ -54,6 +54,9 @@ TEST(ucontext_portable, swapcontext) { ASSERT_EQ(finished, 1); } +/* + Imitation of `do { i++; } while (i < 10)` +*/ volatile int context_set_cnt {0}; TEST(ucontext_portable, get_and_setcontext) { getcontext_portable(&ctx3); diff --git a/server/php-runner.cpp b/server/php-runner.cpp index 94ffd2efab..9d58501f68 100644 --- a/server/php-runner.cpp +++ b/server/php-runner.cpp @@ -90,7 +90,7 @@ void PhpScript::error(const char *error_message, script_error_t error_type, [[ma stack_end = reinterpret_cast(get_context_stack_ptr_portable(exit_context)) + get_context_stack_size_portable(exit_context); #if defined(__linux__) && defined(__x86_64__) - // The error may be produced in process of signal handling. The default behavior on Linux-based platforms + // The PhpScript::error may be produced in process of signal handling. The default behavior on Linux-based platforms // consider to block a signal during handler execution and unblock after handler ending. // For x86_64 arch we have context replacement implementation where the signals manipulations is omitted by design, // e.g. we do not save signals state in context replacement. diff --git a/server/signal-handlers.cpp b/server/signal-handlers.cpp index ea1b2b4d1d..f9798db348 100644 --- a/server/signal-handlers.cpp +++ b/server/signal-handlers.cpp @@ -112,7 +112,7 @@ void sigusr2_handler(int signum) { void php_assert_handler(int signum) { kwrite_str(2, "in php_assert_handler (SIGRTMIN+1 signal)\n"); if (check_signal_critical_section(signum, "SIGRTMIN+1")) { - perform_error_if_running("php assert error\n", script_error_t::php_assert,signum); + perform_error_if_running("php assert error\n", script_error_t::php_assert, signum); } }