qieyuan/yb_arm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_ck_v2.1_feature_enhancement#1334' into 'dev_ck_v2.1'

Browse Source 
修改case4增加oam上行帧头偏移测试+优化log写文件流程Dev ck v2.1 feature enhancement#1334

See merge request ucp/driver/ucp4008_platform_arm!35
This commit is contained in:
Xianfeng Du 2023-11-27 02:19:22 +00:00
commit 6332eb47ef
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
osp/src/ospLog.c
View File

@ -203,7 +203,7 @@ OSP_STATUS osp_update_log(uint32_t len, uint32_t logid, uint32_t msg_type)
char msg_name[10] = {0}; char msg_name[10] = {0};
int32_t file_idx = 0; int32_t file_idx = 0;
uint32_t type = 0; uint32_t type = 0;
//uint32_t ulfreeram = 0; uint32_t fd = 0;
if (logid >= MAX_LOG_CFG_NUM || logid < 0) if (logid >= MAX_LOG_CFG_NUM || logid < 0)
{ {
@ -221,15 +221,11 @@ OSP_STATUS osp_update_log(uint32_t len, uint32_t logid, uint32_t msg_type)
//p_log_file_cfg = &log_file_cfg_table[0][0]; //p_log_file_cfg = &log_file_cfg_table[0][0];
p_log_file_cfg[logid][type].cur_sum_len += len; p_log_file_cfg[logid][type].cur_sum_len += len;
osp_get_current_time();
UCP_PRINT_LOG("osp_update_log logid:%d type:0x%x cur_sum_len:%u max_file_size_M:%u !\n", logid,type, p_log_file_cfg[logid][type].cur_sum_len, p_log_file_cfg[logid][type].max_file_size_M); UCP_PRINT_LOG("osp_update_log logid:%d type:0x%x cur_sum_len:%u max_file_size_M:%u !\n", logid,type, p_log_file_cfg[logid][type].cur_sum_len, p_log_file_cfg[logid][type].max_file_size_M);
/*判断当前系统是否还有足够空间*/ /*判断当前系统是否还有足够空间*/
//ulfreeram = osp_get_freeram();
if(1 == g_ucFflushEnable) if(1 == g_ucFflushEnable)
{ {
//sprintf(name, "rm -rf %s%u-%u-%s.log", p_log_file_cfg[logid][type].logname, (p_log_file_cfg[logid][type].cur_file_idx & 0x7)+1, logid, msg_name);
//system(name);
UCP_PRINT_LOG("osp_update_log line:%d logid:%d type:0x%x g_ucFflushEnable:%u name:%s\n", __LINE__, logid, type, g_ucFflushEnable, name); UCP_PRINT_LOG("osp_update_log line:%d logid:%d type:0x%x g_ucFflushEnable:%u name:%s\n", __LINE__, logid, type, g_ucFflushEnable, name);
osp_log_cfg_reload(); osp_log_cfg_reload();
} }
@ -257,7 +253,12 @@ OSP_STATUS osp_update_log(uint32_t len, uint32_t logid, uint32_t msg_type)
return OSP_ERROR; return OSP_ERROR;
} }
/*内核缓存同步文件，手动清理内核buff*/
fd = fileno(p_log_file_cfg[logid][type].file);
fsync(fd);
fclose(p_log_file_cfg[logid][type].file); fclose(p_log_file_cfg[logid][type].file);
strcpy(name, "echo 1 > /proc/sys/vm/drop_caches");
system(name);
osp_get_file_path(p_log_file_cfg[logid][type].logname, path); osp_get_file_path(p_log_file_cfg[logid][type].logname, path);
@ -1007,9 +1008,11 @@ void osp_log_init(void)
void osp_log_cfg_reload() void osp_log_cfg_reload()
{ {
uint32_t i = 0; uint32_t i = 0;
uint32_t j = 0; uint32_t j = 0;
uint32_t fd = 0;
char cmd[64] = {0};
for (i = 0; i < MAX_LOG_CFG_NUM; i++) for (i = 0; i < MAX_LOG_CFG_NUM; i++)
{ {
for(j = 0; j< 4; j++) for(j = 0; j< 4; j++)
@ -1018,11 +1021,20 @@ void osp_log_cfg_reload()
log_file_cfg_table[i][j].key = 0; log_file_cfg_table[i][j].key = 0;
log_file_cfg_table[i][j].cur_sum_len = 0; log_file_cfg_table[i][j].cur_sum_len = 0;
log_file_cfg_table[i][j].cur_file_idx = 0; log_file_cfg_table[i][j].cur_file_idx = 0;
log_file_cfg_table[i][j].file = NULL; if(NULL != log_file_cfg_table[i][j].file)
{
fd = fileno(log_file_cfg_table[i][j].file);
fsync(fd);
fclose(log_file_cfg_table[i][j].file);
log_file_cfg_table[i][j].file = NULL;
}
} }
} }
strcpy(cmd, "echo 1 > /proc/sys/vm/drop_caches");
system(cmd);
return; return;
} }

7
test/case4/src/testcase.c
View File

@ -67,6 +67,7 @@ typedef struct tSpuOamBaseDelaySetReq {
uint8_t u8rsv[3]; uint8_t u8rsv[3];
uint32_t u32dl_frame_offset; uint32_t u32dl_frame_offset;
uint32_t u32ul_frame_offset; uint32_t u32ul_frame_offset;
uint32_t u32ul_data_frame_offset;
} SpuOamBaseDelaySetReq_t; } SpuOamBaseDelaySetReq_t;
typedef struct tSpuOamBaseDelaySetRsp { typedef struct tSpuOamBaseDelaySetRsp {
@ -86,6 +87,7 @@ typedef struct tSpuOamBaseDelayQryRsp {
uint8_t u8rsv[2]; uint8_t u8rsv[2];
uint32_t u32dl_frame_offset; uint32_t u32dl_frame_offset;
uint32_t u32ul_frame_offset; uint32_t u32ul_frame_offset;
uint32_t u32ul_data_frame_offset;
} SpuOamBaseDelayQryRsp_t; } SpuOamBaseDelayQryRsp_t;
typedef struct tSpuOamFiberDelayQryReq { typedef struct tSpuOamFiberDelayQryReq {
@ -308,8 +310,9 @@ void oam_msg_base_delay_set_test()
stOamMsg.msgLen = size; stOamMsg.msgLen = size;
stOamDelayReq.u8fiber_port = 2; stOamDelayReq.u8fiber_port = 2;
stOamDelayReq.u32dl_frame_offset = 0xab; stOamDelayReq.u32dl_frame_offset = 0xab;
stOamDelayReq.u32ul_frame_offset = 0xcd; stOamDelayReq.u32ul_frame_offset = 0xcd;
stOamDelayReq.u32ul_data_frame_offset = 0xef;
//memset(buf, 0, size); //memset(buf, 0, size);
//memcpy((uint8_t *)stOamMsg.msgData, (uint8_t *)&stOamDelayReq, sizeof(SpuOamBaseDelaySetReq_t)); //memcpy((uint8_t *)stOamMsg.msgData, (uint8_t *)&stOamDelayReq, sizeof(SpuOamBaseDelaySetReq_t));