Merge branch 'gsk/add_get_field_any' of github.com:171930433/yalantin…

…glibs into gsk/add_get_field_any

.github/workflows/windows.yml

@@ -9,41 +9,41 @@ on:
   workflow_dispatch:
 
 jobs:
-  windows_msvc:
-    runs-on: windows-latest
+  # windows_msvc:
+  #   runs-on: windows-latest
 
-    strategy:
-      matrix:
-        mode: [ Release ] #[ Release, Debug ] #Debug not support ccache
-        #https://github.com/ccache/ccache/wiki/MS-Visual-Studio
-        #https://github.com/ccache/ccache/issues/1040
-        arch: [ amd64, x86 ] #[ amd64,x86 ]
-        ssl: [ OFF ] #[ ON, OFF ]
+  #   strategy:
+  #     matrix:
+  #       mode: [ Release ] #[ Release, Debug ] #Debug not support ccache
+  #       #https://github.com/ccache/ccache/wiki/MS-Visual-Studio
+  #       #https://github.com/ccache/ccache/issues/1040
+  #       arch: [ amd64, x86 ] #[ amd64,x86 ]
+  #       ssl: [ OFF ] #[ ON, OFF ]
 
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Enable Developer Command Prompt
-        uses: ilammy/[email protected]
-        with:
-          arch: ${{ matrix.arch }}
-      - name: Install ninja-build tool
-        uses: seanmiddleditch/gha-setup-ninja@master
-        with:
-          version: 1.11.1
-      - name: latest ccache
-        run: choco install ccache
-      - name: ccache
-        uses: hendrikmuhs/[email protected]
-        with:
-          key: ${{ github.job }}-${{ matrix.mode}}-ssl( ${{ matrix.ssl}} )-arch-${{ matrix.arch}}
-      - name: Configure CMake
-        run: cmake -B ${{github.workspace}}\build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.mode }} -DYLT_ENABLE_SSL=${{matrix.ssl}} -DUSE_CCACHE=ON
-      - name: Build
-        run: cmake --build ${{github.workspace}}\build
-      - name: Test
-        working-directory: ${{github.workspace}}\build
-        run: ctest -C ${{matrix.mode}} -j 1 -V
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v3
+  #     - name: Enable Developer Command Prompt
+  #       uses: ilammy/[email protected]
+  #       with:
+  #         arch: ${{ matrix.arch }}
+  #     - name: Install ninja-build tool
+  #       uses: seanmiddleditch/gha-setup-ninja@master
+  #       with:
+  #         version: 1.11.1
+  #     - name: latest ccache
+  #       run: choco install ccache
+  #     - name: ccache
+  #       uses: hendrikmuhs/[email protected]
+  #       with:
+  #         key: ${{ github.job }}-${{ matrix.mode}}-ssl( ${{ matrix.ssl}} )-arch-${{ matrix.arch}}
+  #     - name: Configure CMake
+  #       run: cmake -B ${{github.workspace}}\build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.mode }} -DYLT_ENABLE_SSL=${{matrix.ssl}} -DUSE_CCACHE=ON
+  #     - name: Build
+  #       run: cmake --build ${{github.workspace}}\build
+  #     - name: Test
+  #       working-directory: ${{github.workspace}}\build
+  #       run: ctest -C ${{matrix.mode}} -j 1 -V
   windows_msvc_2019:
     runs-on: windows-2019
 

include/ylt/coro_http/coro_http_server.hpp

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #pragma once
-#include "cinatra/uri.hpp"
 #ifdef YLT_ENABLE_SSL
 #define CINATRA_ENABLE_SSL
 #endif

include/ylt/coro_io/io_context_pool.hpp

@@ -22,6 +22,7 @@
 #include <asio/steady_timer.hpp>
 #include <atomic>
 #include <future>
+#include <iostream>
 #include <memory>
 #include <mutex>
 #include <thread>
@@ -117,6 +118,8 @@ class io_context_pool {
       pool_size = 1;  // set default value as 1
     }
 
+    total_thread_num_ += pool_size;
+
     for (std::size_t i = 0; i < pool_size; ++i) {
       io_context_ptr io_context(new asio::io_context(1));
       work_ptr work(new asio::io_context::work(*io_context));
@@ -150,8 +153,11 @@ class io_context_pool {
         cpu_set_t cpuset;
         CPU_ZERO(&cpuset);
         CPU_SET(i, &cpuset);
-        pthread_setaffinity_np(threads.back()->native_handle(),
-                               sizeof(cpu_set_t), &cpuset);
+        int rc = pthread_setaffinity_np(threads.back()->native_handle(),
+                                        sizeof(cpu_set_t), &cpuset);
+        if (rc != 0) {
+          std::cerr << "Error calling pthread_setaffinity_np: " << rc << "\n";
+        }
       }
 #endif
     }
@@ -201,6 +207,8 @@ class io_context_pool {
   template <typename T>
   friend io_context_pool &g_io_context_pool();
 
+  static size_t get_total_thread_num() { return total_thread_num_; }
+
  private:
   using io_context_ptr = std::shared_ptr<asio::io_context>;
   using work_ptr = std::shared_ptr<asio::io_context::work>;
@@ -213,8 +221,13 @@ class io_context_pool {
   std::atomic<bool> has_run_or_stop_ = false;
   std::once_flag flag_;
   bool cpu_affinity_ = false;
+  inline static std::atomic<size_t> total_thread_num_ = 0;
 };
 
+inline size_t get_total_thread_num() {
+  return io_context_pool::get_total_thread_num();
+}
+
 class multithread_context_pool {
  public:
   multithread_context_pool(size_t thd_num = std::thread::hardware_concurrency())
@@ -272,6 +285,18 @@ inline T &g_io_context_pool(
   return *_g_io_context_pool;
 }
 
+template <typename T = io_context_pool>
+inline std::shared_ptr<T> create_io_context_pool(
+    unsigned pool_size = std::thread::hardware_concurrency()) {
+  auto pool = std::make_shared<T>(pool_size);
+  std::thread thrd{[pool] {
+    pool->run();
+  }};
+  thrd.detach();
+
+  return pool;
+}
+
 template <typename T = io_context_pool>
 inline T &g_block_io_context_pool(
     unsigned pool_size = std::thread::hardware_concurrency()) {

include/ylt/easylog.hpp

@@ -288,7 +288,7 @@ inline void add_appender(std::function<void(std::string_view)> fn) {
 #endif
 
 #ifndef MELOG_TRACE
-#define MELOG_TRACE(id) ELOG(INFO, id)
+#define MELOG_TRACE(id) ELOG(TRACE, id)
 #endif
 #ifndef MELOG_DEBUG
 #define MELOG_DEBUG(id) ELOG(DEBUG, id)
@@ -326,4 +326,4 @@ inline void add_appender(std::function<void(std::string_view)> fn) {
 #endif
 #ifndef ELOGF
 #define ELOGF ELOG_FATAL
-#endif
+#endif

include/ylt/metric.hpp

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2024, Alibaba Group Holding Limited;
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#pragma once
+#define CINATRA_ENABLE_METRIC_JSON
+#include "metric/gauge.hpp"
+#include "metric/histogram.hpp"
+#include "metric/summary.hpp"
+#include "metric/system_metric.hpp"
+#include "ylt/struct_json/json_writer.h"