From 993bcdb5e2b392933abdfce3d0688152c0d3d70e Mon Sep 17 00:00:00 2001 From: tianfenghan Date: Mon, 8 Apr 2024 11:51:49 +0800 Subject: [PATCH] revert , format --- scripts/make.sh | 1 - src/core/base64.cc | 2 +- src/core/log.cc | 4 ++-- src/core/string.cc | 13 ++++++++++--- src/os/msg_queue.cc | 1 - src/os/process_pool.cc | 2 +- src/os/unix_socket.cc | 5 ++--- src/server/base.cc | 18 ++++++++++-------- src/server/thread.cc | 10 +++++----- 9 files changed, 31 insertions(+), 25 deletions(-) diff --git a/scripts/make.sh b/scripts/make.sh index 2ba131ef928..fd46c8c9d90 100755 --- a/scripts/make.sh +++ b/scripts/make.sh @@ -8,7 +8,6 @@ COMPILE_PARAMS="--enable-openssl \ --enable-cares \ --enable-swoole-pgsql \ --enable-swoole-thread \ ---enable-trace-log \ --with-swoole-odbc=unixODBC,/usr \ --enable-swoole-sqlite" diff --git a/src/core/base64.cc b/src/core/base64.cc index dd9b452b353..0c430bfbf24 100644 --- a/src/core/base64.cc +++ b/src/core/base64.cc @@ -131,4 +131,4 @@ size_t base64_decode(const char *in, size_t inlen, char *out) { return j; } -} +} // namespace swoole diff --git a/src/core/log.cc b/src/core/log.cc index f2a58ef3c4e..987c9725cc7 100644 --- a/src/core/log.cc +++ b/src/core/log.cc @@ -317,11 +317,11 @@ void Logger::put(int level, const char *content, size_t length) { n = sw_snprintf(log_str, SW_LOG_BUFFER_SIZE, - "[%.*s %c%ld.%d]\t%s\t%.*s\n", + "[%.*s %c%d.%d]\t%s\t%.*s\n", static_cast(l_data_str), date_str, process_flag, - pthread_self(), + SwooleG.pid, process_id, level_str, static_cast(length), diff --git a/src/core/string.cc b/src/core/string.cc index fab2edb13df..e6b50065fc0 100644 --- a/src/core/string.cc +++ b/src/core/string.cc @@ -180,7 +180,12 @@ ssize_t String::split(const char *delimiter, size_t delimiter_length, const Stri off_t _offset = offset; size_t ret; - swoole_trace_log(SW_TRACE_EOF_PROTOCOL, "#[0] count=%d, length=%ld, size=%ld, offset=%jd", count, length, size, (intmax_t) offset); + swoole_trace_log(SW_TRACE_EOF_PROTOCOL, + "#[0] count=%d, length=%ld, size=%ld, offset=%jd", + count, + length, + size, + (intmax_t) offset); while (delimiter_addr) { size_t _length = delimiter_addr - start_addr + delimiter_length; @@ -207,9 +212,11 @@ ssize_t String::split(const char *delimiter, size_t delimiter_length, const Stri ret = start_addr - str - _offset; if (ret > 0 && ret < length) { - swoole_trace_log(SW_TRACE_EOF_PROTOCOL, "#[5] count=%d, remaining_length=%zu", count, (size_t) (length - offset)); + swoole_trace_log( + SW_TRACE_EOF_PROTOCOL, "#[5] count=%d, remaining_length=%zu", count, (size_t) (length - offset)); } else if (ret >= length) { - swoole_trace_log(SW_TRACE_EOF_PROTOCOL, "#[3] length=%ld, size=%zu, offset=%jd", length, size, (intmax_t) offset); + swoole_trace_log( + SW_TRACE_EOF_PROTOCOL, "#[3] length=%ld, size=%zu, offset=%jd", length, size, (intmax_t) offset); } return ret; diff --git a/src/os/msg_queue.cc b/src/os/msg_queue.cc index f40e2c1a151..89d98448a07 100644 --- a/src/os/msg_queue.cc +++ b/src/os/msg_queue.cc @@ -86,7 +86,6 @@ bool MsgQueue::push(QueueNode *in, size_t mdata_length) { } swoole_set_last_error(errno); break; - } return false; } diff --git a/src/os/process_pool.cc b/src/os/process_pool.cc index 055eebdd584..7d7b668fd03 100644 --- a/src/os/process_pool.cc +++ b/src/os/process_pool.cc @@ -581,7 +581,7 @@ static int ProcessPool_worker_loop_with_task_protocol(ProcessPool *pool, Worker continue; } - if (n != (ssize_t)(out.buf.info.len + sizeof(out.buf.info))) { + if (n != (ssize_t) (out.buf.info.len + sizeof(out.buf.info))) { swoole_warning("bad task packet, The received data-length[%ld] is inconsistent with the packet-length[%ld]", n, out.buf.info.len + sizeof(out.buf.info)); diff --git a/src/os/unix_socket.cc b/src/os/unix_socket.cc index 08b34422dfb..c1db228dedd 100644 --- a/src/os/unix_socket.cc +++ b/src/os/unix_socket.cc @@ -18,8 +18,7 @@ #include "swoole_socket.h" namespace swoole { -UnixSocket::UnixSocket(bool blocking, int _protocol) : - SocketPair(blocking), protocol_(_protocol) { +UnixSocket::UnixSocket(bool blocking, int _protocol) : SocketPair(blocking), protocol_(_protocol) { if (socketpair(AF_UNIX, protocol_, 0, socks) < 0) { swoole_sys_warning("socketpair() failed"); return; @@ -39,4 +38,4 @@ bool UnixSocket::set_buffer_size(size_t _size) { } return true; } -} +} // namespace swoole diff --git a/src/server/base.cc b/src/server/base.cc index 11995ae07fa..36231fe9d76 100644 --- a/src/server/base.cc +++ b/src/server/base.cc @@ -144,10 +144,11 @@ bool BaseFactory::end(SessionId session_id, int flags) { } if (server_->if_forward_message(session)) { - swoole_trace_log(SW_TRACE_SERVER, "session_id=%ld, fd=%d, session->reactor_id=%d", - session_id, - session->fd, - session->reactor_id); + swoole_trace_log(SW_TRACE_SERVER, + "session_id=%ld, fd=%d, session->reactor_id=%d", + session_id, + session->fd, + session->reactor_id); Worker *worker = server_->get_worker(session->reactor_id); if (worker->pipe_master->send_async((const char *) &_send.info, sizeof(_send.info)) < 0) { swoole_sys_warning("failed to send %lu bytes to pipe_master", sizeof(_send.info)); @@ -215,10 +216,11 @@ bool BaseFactory::finish(SendData *data) { Session *session = server_->get_session(session_id); if (server_->if_forward_message(session)) { - swoole_trace_log(SW_TRACE_SERVER, "session_id=%ld, fd=%d, session->reactor_id=%d", - session_id, - session->fd, - session->reactor_id); + swoole_trace_log(SW_TRACE_SERVER, + "session_id=%ld, fd=%d, session->reactor_id=%d", + session_id, + session->fd, + session->reactor_id); Worker *worker = server_->gs->event_workers.get_worker(session->reactor_id); EventData proxy_msg{}; diff --git a/src/server/thread.cc b/src/server/thread.cc index e08bfd5a30c..b7764f7a055 100644 --- a/src/server/thread.cc +++ b/src/server/thread.cc @@ -78,7 +78,7 @@ void ThreadFactory::spawn_event_worker(int i) { Worker *worker = server_->get_worker(i); g_worker_instance = worker; worker->type = SW_PROCESS_EVENTWORKER; - server_->worker_thread_start([=](void) -> void { Server::reactor_thread_main_loop(server_, i); }); + server_->worker_thread_start([=]() { Server::reactor_thread_main_loop(server_, i); }); at_thread_exit(worker); }); } @@ -91,8 +91,8 @@ void ThreadFactory::spawn_task_worker(int i) { swoole_set_thread_id(i); Worker *worker = server_->get_worker(i); worker->type = SW_PROCESS_TASKWORKER; - server_->worker_thread_start( - [=](void) { server_->gs->task_workers.main_loop(&server_->gs->task_workers, worker); }); + auto pool = &server_->gs->task_workers; + server_->worker_thread_start([=]() { pool->main_loop(pool, worker); }); at_thread_exit(worker); }); } @@ -105,7 +105,7 @@ void ThreadFactory::spawn_user_worker(int i) { swoole_set_process_id(i); swoole_set_thread_id(i); worker->type = SW_PROCESS_USERWORKER; - server_->worker_thread_start([=](void) { server_->onUserWorkerStart(server_, worker); }); + server_->worker_thread_start([=]() { server_->onUserWorkerStart(server_, worker); }); at_thread_exit(worker); }); } @@ -118,7 +118,7 @@ void ThreadFactory::spawn_manager_thread(int i) { swoole_set_thread_id(i); manager.id = i; manager.type = SW_PROCESS_MANAGER; - server_->worker_thread_start([=](void) { + server_->worker_thread_start([=]() { if (server_->onManagerStart) { server_->onManagerStart(server_); }