gfwleak/tango-tsg-service-chaining-engine
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TSG-23386 SCE移除FieldStat2，为适配AArch64做准备

Browse Source
This commit is contained in:
luwenpeng
2024-11-08 15:30:28 +08:00
parent 043f9cbad7
commit 6aa82aeea6
34 changed files with 2030 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/gtest_utils.h
View File

@@ -79,7 +79,7 @@ inline struct gtest_frame *gtest_frame_new(const char *json_file, const char *de
struct thread_ctx *thread_ctx = NULL;
struct gtest_frame *instance = (struct gtest_frame *)calloc(1, sizeof(struct gtest_frame));
system("rm -rf `ls log/* | egrep -v '(*_ok.fs2)'`");
system("rm -rf `ls log/* | egrep -v '(*_expect.fs4)'`");
memset(&cmdline, 0, sizeof(cmdline));
snprintf(cmdline, sizeof(cmdline), "sed -i \"s/json_cfg_file=.*/json_cfg_file=resource\\/%s/\" ./conf/sce.conf", json_file);
@@ -167,18 +167,15 @@ inline void gtest_frame_log(struct gtest_frame *instance)
struct sce_ctx *sce_ctx = instance->sce_ctx;
struct thread_ctx *thread_ctx = &sce_ctx->work_threads[0];
for (int i = 0; i < 10; i++)
{
global_metrics_update(sce_ctx->metrics, &thread_ctx->thread_metrics, thread_ctx->thread_index);
global_metrics_dump(sce_ctx->metrics);
usleep(1);
}
global_metrics_sync(sce_ctx->metrics, &thread_ctx->thread_metrics, thread_ctx->thread_index);
global_metrics_flush(sce_ctx->metrics);
sleep(2);
memset(&cmdline, 0, sizeof(cmdline));
snprintf(cmdline, sizeof(cmdline), "cp log/sce.fs2 log/test_%s.fs2", instance->desc);
snprintf(cmdline, sizeof(cmdline), "cat log/sce.fs4 | jq >> log/test_%s.fs4", instance->desc);
system(cmdline);
memset(&cmdline, 0, sizeof(cmdline));
snprintf(cmdline, sizeof(cmdline), "diff -I '===' log/test_%s.fs2 log/test_%s_ok.fs2 > log/test_%s.diff", instance->desc, instance->desc, instance->desc);
snprintf(cmdline, sizeof(cmdline), "diff -I 'timestamp_ms' log/test_%s.fs4 log/test_%s_expect.fs4 > log/test_%s.diff", instance->desc, instance->desc, instance->desc);
int ret = system(cmdline);
printf("exec %s, return: %d\n", cmdline, ret);