summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryangwei <[email protected]>2023-08-31 16:47:51 +0800
committeryangwei <[email protected]>2023-08-31 16:47:51 +0800
commitd7c3ab3d21878b51a60612766ab9b22219f25bbe (patch)
tree88e19d78606d763df4e8049bcc6e77d6b34e6469
parentc1105e954ad5b36b3053ad2e470030cdb32a20bd (diff)
🐞 fix(MAX_THREAD_NUM): 更新至128,新增MAX_CORE_NUM,用于定义CPU核心数v4.3.24
-rw-r--r--include/private/plugin.h2
-rw-r--r--include/private/plugin_serial.h2
-rw-r--r--include/public/sapp_limits.h2
-rw-r--r--src/packet_io/under_ddos.cpp12
4 files changed, 11 insertions, 7 deletions
diff --git a/include/private/plugin.h b/include/private/plugin.h
index 2b8af23..e1fe23c 100644
--- a/include/private/plugin.h
+++ b/include/private/plugin.h
@@ -14,7 +14,7 @@ extern "C" {
#ifndef MAX_THREAD_NUM
-#define MAX_THREAD_NUM 128
+#define MAX_THREAD_NUM 256
#endif
#define PLUGTYPE_PROTOCOL 1
diff --git a/include/private/plugin_serial.h b/include/private/plugin_serial.h
index f33be44..1eb9bac 100644
--- a/include/private/plugin_serial.h
+++ b/include/private/plugin_serial.h
@@ -9,7 +9,7 @@ extern "C" {
#ifndef MAX_THREAD_NUM
-#define MAX_THREAD_NUM 128
+#define MAX_THREAD_NUM 256
#endif
#define WY_MAX_PLUG_NUM 64
diff --git a/include/public/sapp_limits.h b/include/public/sapp_limits.h
index f3f8cf2..0d1d295 100644
--- a/include/public/sapp_limits.h
+++ b/include/public/sapp_limits.h
@@ -2,7 +2,7 @@
#define _SAPP_LIMITS_H_ 1
#ifndef MAX_THREAD_NUM
-#define MAX_THREAD_NUM 128
+#define MAX_THREAD_NUM 256
#endif
#define SAPP_MAX_THREADS MAX_THREAD_NUM
diff --git a/src/packet_io/under_ddos.cpp b/src/packet_io/under_ddos.cpp
index c57ac68..5431b73 100644
--- a/src/packet_io/under_ddos.cpp
+++ b/src/packet_io/under_ddos.cpp
@@ -37,11 +37,15 @@ typedef struct
uint64_t tcks[NUM_TCK_TYPES];
} cpu_tck_t;
+#ifndef MAX_CORE_NUM
+#define MAX_CORE_NUM 256
+#endif
+
typedef struct{
- unsigned long long last_create_stream_new_sum[MAX_THREAD_NUM];
- double last_time_cpu_total[MAX_THREAD_NUM];
- double last_time_cpu_idle[MAX_THREAD_NUM];
- cpu_tck_t all_cpu_usage[MAX_THREAD_NUM];
+ unsigned long long last_create_stream_new_sum[MAX_CORE_NUM];
+ double last_time_cpu_total[MAX_CORE_NUM];
+ double last_time_cpu_idle[MAX_CORE_NUM];
+ cpu_tck_t all_cpu_usage[MAX_CORE_NUM];
}under_sapp_user_args_t;