diff options
| author | 刘畅 <[email protected]> | 2024-04-30 06:18:40 +0000 |
|---|---|---|
| committer | 刘畅 <[email protected]> | 2024-04-30 06:18:40 +0000 |
| commit | a970d705ac6c8783c31e956f73bd6c58a832a60a (patch) | |
| tree | 42abace85d8f68ce90d0c33c457a56aae134a3cf | |
| parent | 830dd2a4a3c799bcb99c3469ae2c9dbe92c62c4b (diff) | |
| parent | 8c0eb8635746aefdc2ad5af42708d8451fb65bf5 (diff) | |
Merge branch 'support_max_thread_num_256-24.02' into 'dev-24.02'v3.1.33(24.02)dev-24.02
support max thread num 256
See merge request tango/shaping-engine!92
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ci/travis.sh | 2 | ||||
| -rw-r--r-- | common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | shaping/include/shaper.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e8f403..684e108 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,8 +67,8 @@ add_library(MESA_prof_load SHARED IMPORTED GLOBAL) set_property(TARGET MESA_prof_load PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libMESA_prof_load.so) set_property(TARGET MESA_prof_load PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) -set(MRZCPD_LIB_DIR /opt/mrzcpd/lib) -set(MRZCPD_INCLUDE_DIR /opt/mrzcpd/include) +set(MRZCPD_LIB_DIR /opt/tsg/mrzcpd/lib) +set(MRZCPD_INCLUDE_DIR /opt/tsg/mrzcpd/include) add_library(mrzcpd SHARED IMPORTED GLOBAL) set_property(TARGET mrzcpd PROPERTY IMPORTED_LOCATION ${MRZCPD_LIB_DIR}/libmarsio.so) diff --git a/ci/travis.sh b/ci/travis.sh index 695b014..a8b7553 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -37,7 +37,7 @@ yum install -y libasan yum install -y systemd-devel yum install -y tsg_master-devel yum install -y framework_env -yum install -y mrzcpd +yum install -y mrzcpd-corei7 yum install -y libfieldstat3-devel yum install -y libmaatframe-devel yum install -y libswarmkv-devel diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 3a39583..622884b 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(common src/log.cpp src/session_table.cpp src/utils.cpp src/addr_tuple4.cpp src/raw_packet.cpp src/mpack.c) target_link_libraries(common PUBLIC MESA_handle_logger) -#target_link_libraries(common PUBLIC mrzcpd) +target_link_libraries(common PUBLIC mrzcpd) target_include_directories(common PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include) add_subdirectory(libavl) diff --git a/shaping/include/shaper.h b/shaping/include/shaper.h index 46bc07f..f0c1039 100644 --- a/shaping/include/shaper.h +++ b/shaping/include/shaper.h @@ -25,7 +25,7 @@ extern "C" { #define CONFIRM_PRIORITY_PKTS 20 -#define SHAPING_WROK_THREAD_NUM_MAX 128 +#define SHAPING_WROK_THREAD_NUM_MAX 256 #define SHAPING_STAT_REFRESH_INTERVAL_SEC 2 #define SHAPING_STAT_REFRESH_MAX_PER_POLLING 5 |