payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.ftp发送优化

Browse Source
This commit is contained in:
payton 2024-02-23 18:05:53 +08:00
parent 9961fd5c69
commit 7b51eac1d4
1 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
code/application/source/sf_app/code/source/4gMng/sf_ftp.c
View File

@ -54,6 +54,7 @@ extern "C" {
#include "curl/curl.h" #include "curl/curl.h"
#include "sf_4G_sms_lpa_cmd.h" #include "sf_4G_sms_lpa_cmd.h"
#include "sf_commu_mcu.h" #include "sf_commu_mcu.h"
#include "sf_otamng.h"
/************************************************************************** /**************************************************************************
* C O N S T A N T S * * C O N S T A N T S *
@ -66,36 +67,7 @@ extern "C" {
/************************************************************************** /**************************************************************************
* D A T A T Y P E S * * D A T A T Y P E S *
**************************************************************************/ **************************************************************************/
#define MODULE_VER "EG"
#define MODULE_VER_FLG1 "FAR"
#define MODULE_VER_FLG2 "GAR"
#define EG91E_MODULE_VER "EG91E"
#define EG91V_MODULE_VER "EG91V"
#define EG91A_MODULE_VER "EG91NA"
#define EC25E_MODULE_VER "EC25E"
#define EC25V_MODULE_VER "EC25V"
#define EC25A_MODULE_VER "EC25A"
#define CAM_OTA_DIR "CAM_OTA_S520_AX"
#define QFIREHOSE_OTA_DIR "QFIREHOSE_OTA_S520_AX"
#define DFOTA_OTA_DIR "DFOTA_S520_AX"
#define OTA_FTP_CFGFILENAME_EG91E "DFOTA_EG91E.CFG"
#define OTA_FTP_UPDATAFILENAME_EG91E "module_EG91E.zip"
#define OTA_FTP_CFGFILENAME_EG91V "DFOTA_EG91V.CFG"
#define OTA_FTP_UPDATAFILENAME_EG91V "module_EG91V.zip"
#define OTA_FTP_CFGFILENAME_EG91A "DFOTA_EG91NA.CFG"
#define OTA_FTP_UPDATAFILENAME_EG91A "module_EG91NA.zip"
#define OTA_FTP_CFGFILENAME_EC25E "DFOTA_E.CFG"
#define OTA_FTP_UPDATAFILENAME_EC25E "module_E.zip"
#define OTA_FTP_CFGFILENAME_EC25V "DFOTA_V.CFG"
#define OTA_FTP_UPDATAFILENAME_EC25V "module_V.zip"
#define OTA_FTP_CFGFILENAME_EC25A "DFOTA_A.CFG"
#define OTA_FTP_UPDATAFILENAME_EC25A "module_A.zip"
/************************************************************************** /**************************************************************************
* G L O B A L D A T A * * G L O B A L D A T A *
**************************************************************************/ **************************************************************************/
@ -1360,7 +1332,10 @@ SINT32 sf_send_file_to_ftp(UINT8 mode)
SF_PDT_PARAM_STATISTICS_S *pSifarPara = sf_statistics_param_get(); SF_PDT_PARAM_STATISTICS_S *pSifarPara = sf_statistics_param_get();
SINT64 sendEndTime = 0; SINT64 sendEndTime = 0;
MLOGD("start\n"); MLOGD("start\n");
if(sf_get_mode_flag())
{
time(&sendStartTime);
}
ssl = ((2 == puiPara->FtpSwitch) ? 1 : 0); ssl = ((2 == puiPara->FtpSwitch) ? 1 : 0);
gprsMode = 0;//puiPara->GprsMode; gprsMode = 0;//puiPara->GprsMode;
// printf("[%s:%d] ssl:%d,GprsMode:%d\n", __FUNCTION__, __LINE__, ssl, gprsMode); // printf("[%s:%d] ssl:%d,GprsMode:%d\n", __FUNCTION__, __LINE__, ssl, gprsMode);
@ -1435,11 +1410,15 @@ SINT32 sf_send_file_to_ftp(UINT8 mode)
//sendEndTime = clock(); //sendEndTime = clock();
time(&sendEndTime); time(&sendEndTime);
double elapsed_time = sf_sys_s_time_get(sendEndTime); double elapsed_time = sf_sys_s_time_get(sendEndTime);
pSifarPara->TotalTransmissionTime += elapsed_time; if(!sf_get_mode_flag())
pSifarPara->ThumbnailTransmissionTime += elapsed_time; {
pSifarPara->TotalTransmissionTime += elapsed_time;
pSifarPara->ThumbnailTransmissionTime += elapsed_time;
pSifarPara->picSendTimeCount +=elapsed_time;
pSifarPara->sendThumbnailTimeCount += elapsed_time;
}
pSifarPara->picSendTimeCount +=elapsed_time;
pSifarPara->sendThumbnailTimeCount += elapsed_time;
MLOGD("SendTime:%d s picSendTimeCount:%d s sendThumbnailTimeCount:%d s\n", elapsed_time, pSifarPara->picSendTimeCount,pSifarPara->sendThumbnailTimeCount); MLOGD("SendTime:%d s picSendTimeCount:%d s sendThumbnailTimeCount:%d s\n", elapsed_time, pSifarPara->picSendTimeCount,pSifarPara->sendThumbnailTimeCount);
time(&sendStartTime); time(&sendStartTime);
} }