优化日志

Hu Chunming
1 parent 581a68a4
Showing 14 changed files with 61 additions and 34 deletions
jni/VehicleNativeInterface.cpp
src/PicAnalysis.cpp
src/PicAnalysis.h
src/ai_engine_module/HumanAnalysis.cpp
src/ai_engine_module/HumanCarAnalysis.cpp
src/ai_engine_module/MotorPhoneAnalysis.cpp
src/ai_engine_module/MotorRainshedAnalysis.cpp
src/ai_engine_module/RoadSegAnalysis.cpp
src/ai_engine_module/VehicleAnalysis.cpp
src/ai_engine_module/VidClothes.cpp
src/ai_engine_module/include.h
src/common/sy_common.h
src/demo/main.cpp
src/village_inc.h
@@ -129,14 +129,33 @@ JNIEXPORT jint JNICALL Java_com_objecteye_nativeinterface_vehicle_VehicleNativeI
     jfieldID fid_sdk_path = env->GetFieldID(cls_vehcileAnalysisParam, "sdk_path", "Ljava/lang/String;");
     jfieldID fid_gpuid = env->GetFieldID(cls_vehcileAnalysisParam, "gpuId", "I");
  
+    jfieldID fid_aiEngineParam_logLevel = env->GetFieldID(cls_vehcileAnalysisParam, "logLevel", "I");
+    jfieldID fid_aiEngineParam_logPath = env->GetFieldID(cls_vehcileAnalysisParam, "logPath", "Ljava/lang/String;");
+    jfieldID fid_aiEngineParam_logDays = env->GetFieldID(cls_vehcileAnalysisParam, "logDays", "I");
+    jfieldID fid_aiEngineParam_logMem = env->GetFieldID(cls_vehcileAnalysisParam, "logMem", "D");
+
     jstring str_sdk_path = (jstring)env->GetObjectField(vehicleAnalysisParam, fid_sdk_path);
     const char *sdk_path = env->GetStringUTFChars(str_sdk_path, JNI_FALSE);
     jint gpuid = env->GetIntField(vehicleAnalysisParam, fid_gpuid);
  
+    //log
+    jstring str_aiEngineParam_logPath = (jstring)env->GetObjectField(vehicleAnalysisParam, fid_aiEngineParam_logPath);
+    const char* aiEngineParam_logPath = env->GetStringUTFChars(str_aiEngineParam_logPath, JNI_FALSE);
+    jint aiEngineParam_logDays = env->GetIntField(vehicleAnalysisParam, fid_aiEngineParam_logDays);
+    jdouble aiEngineParam_logMem = env->GetDoubleField(vehicleAnalysisParam, fid_aiEngineParam_logMem);
+    jint aiEngineParam_logLevel = env->GetIntField(vehicleAnalysisParam, fid_aiEngineParam_logLevel);
+
     void *vaHandle = NULL;
     VillageParam param;
     param.dev_id = gpuid;
     param.sdk_path = sdk_path;
+    param.log_level = aiEngineParam_logLevel;
+    param.log_path = aiEngineParam_logPath;
+    param.log_days = aiEngineParam_logDays;
+    param.log_mem = aiEngineParam_logMem;
+
+    printf("jni dev_id:%d sdk_path:%s_log_level:%d\n", param.dev_id, param.sdk_path.c_str(), param.log_level);
+
     int ret = village_pic_init(&vaHandle, param);
  	if (ret != SUCCESS) {
 		printf("jni info:va_init failed.");
@@ -15,6 +15,14 @@ PicAnalysis::~PicAnalysis()
  
 int PicAnalysis::init(VillageParam param) {
  
+    set_default_logger(LogLevel(param.log_level), "PicAnalysis", param.log_path.c_str(), param.log_mem, param.log_days);
+
+    // 输入参数
+    LOG_INFO("dev_id: {}", param.dev_id);
+    LOG_INFO("sdk_path: {}", param.sdk_path);
+    LOG_INFO("log_level: {}", param.log_level);
+    LOG_INFO("log_days: {}", param.log_days);
+
     int dev_id = param.dev_id;
  
     int ret = SY_FAILED;
@@ -393,12 +401,4 @@ int PicAnalysis::release() {
     aclrtDestroyContext(m_ctx);
  
     return 0;
-}
-
-int PicAnalysis::human_analysis(vector<sy_img> vec_img) {
-    vector<BodyColorInfo> vec_body_color = m_human_algorithm.detect(vec_img);
-}
-
-int PicAnalysis::check_motor_retrograde_motion(vector<sy_img> vec_motor_img) {
-    m_human_car_algorithm.detect(vec_motor_img);
 }
 \ No newline at end of file
@@ -28,13 +28,8 @@ public:
     vector<AnalysisResult> analysis_img(vector<sy_img> vec_img);
  
 private:
-
     int release();
  
-    int human_analysis(vector<sy_img> vec_img);
-
-    int check_motor_retrograde_motion(vector<sy_img> vec_img);
-
     vector<AnalysisResult> va_result2AnalysisResult(va_result* result, int batchsize);
  
 private:
@@ -21,13 +21,13 @@ int HumanAnalysis::init(int devId, std::string sdk_root){
     param.modelNames = (char*)model_path.data();
     param.devId = devId;
  
-    cout << "hp_init start " << endl;
+    LOG_INFO("hp_init start");
     int ret = hp_init(&m_handle, param);
     if (ret != 0) {
         return -1;
 	}
  
-    cout << "hp_init success " << endl;
+    LOG_INFO("hp_init success");
  
     return SY_SUCCESS;
 }
@@ -23,13 +23,13 @@ int HumanCarAnalysis::init(int devId, std::string sdk_root){
     param.modelNames = (char*)model_path.data();
     param.devId = devId;
  
-    cout << "hcp_init start " << endl;
+    LOG_INFO("hcp_init start");
     int ret = hcp_init(&m_handle, param);
     if (ret != 0) {
         return -1;
 	}
  
-    cout << "hcp_init success " << endl;
+    LOG_INFO("hcp_init success");
  
     return SY_SUCCESS;
 }
@@ -20,13 +20,13 @@ int MotorPhoneAnalysis::init(int devId, std::string sdk_root){
     param.thresld = 0.25;
     param.devId = devId;
  
-    cout << "motor_phone_init start " << endl;
+    LOG_INFO("motor_phone_init start");
     int ret = motor_phone_init(&m_handle, param);
     if (ret != 0) {
         return -1;
 	}
  
-    cout << "motor_phone_init success " << endl;
+    LOG_INFO("motor_phone_init success");
  
     return SY_SUCCESS;
 }
@@ -20,13 +20,13 @@ int MotorRainshedAnalysis::init(int devId, std::string sdk_root){
     param.thresld = 0.0;
     param.devId = devId;
  
-    cout << "mrc_init start " << endl;
+    LOG_INFO("mrc_init start");
     int ret = mrc_init(&m_handle, param);
     if (ret != 0) {
         return -1;
 	}
  
-    cout << "mrc_init success " << endl;
+    LOG_INFO("mrc_init success");
  
     return SY_SUCCESS;
 }
@@ -22,13 +22,13 @@ int RoadSegAnalysis::init(int devId, std::string sdk_root){
     param.thresld = 0.25;
     param.devId = devId;
  
-    cout << "rs_init start " << endl;
+    LOG_INFO("rs_init start");
     int ret = rs_init(&m_handle, param);
     if (ret != 0) {
         return -1;
 	}
  
-    cout << "rs_init success " << endl;
+    LOG_INFO("rs_init success");
  
     return SY_SUCCESS;
 }
@@ -58,14 +58,14 @@ int VehicleAnalysis::init(int devId, std::string sdk_root, int max_batch_size) {
 	param.dbPath= (char*)dbPath.data();	
 	param.models_Path= (char*)models_path.data();	//所有模型的地址
  
-    cout << "va_init start " << endl;
+    LOG_INFO("va_init start");
     // 内部有 ctx
     int ret = va_init(&m_handle, param);
     if (ret != 0) {
         return -1;
 	}
  
-    cout << "va_init success " << endl;
+    LOG_INFO("va_init success");
     return 0;
 }
  
@@ -19,13 +19,13 @@ int VidClothes::init(int devId, std::string sdk_root){
     param.thresld = 0.0;
     param.devId = devId;
  
-    cout << "vidclothes_init start " << endl;
+    LOG_INFO("vidclothes_init start");
     int ret = vidclothes_init(&m_handle, param);
     if (ret != 0) {
         return -1;
 	}
  
-    cout << "vidclothes_init success " << endl;
+    LOG_INFO("vidclothes_init success");
  
     return SY_SUCCESS;
 }
@@ -17,6 +17,7 @@
 #include "utils.h"
 #include "dvpp_process.h"
  
+#include "../utils/logger.hpp"
  
 #include <chrono>
 #include <dirent.h>
@@ -21,21 +21,21 @@
 #define ENGINE_TENSORRT 201
  
  
-//针对多功能SDK，用于初始化参数配置，根据该参数可判断所对应的功能模块是否启动运行
+//锟斤拷远喙︼拷锟絊DK锟斤拷锟斤拷锟节筹拷始锟斤拷锟斤拷锟斤拷锟斤拷锟矫ｏ拷锟斤拷锟捷该诧拷锟斤拷锟斤拷锟叫讹拷锟斤拷锟斤拷应锟侥癸拷锟斤拷模锟斤拷锟角凤拷锟斤拷锟斤拷锟斤拷锟斤拷
 #ifndef __SY_COMMAND__
 #define __SY_COMMAND__
-typedef enum sy_command {
-	SY_CONFIG_OPEN,			//该功能启动
-	SY_CONFIG_CLOSE			//该功能不启动
+enum sy_command {
+	SY_CONFIG_OPEN,			//锟矫癸拷锟斤拷锟斤拷锟斤拷
+	SY_CONFIG_CLOSE			//锟矫癸拷锟杰诧拷锟斤拷锟斤拷
 };
 #endif
  
  
-//用于指定输入的图像数据的格式
+//锟斤拷锟斤拷指锟斤拷锟斤拷锟斤拷锟酵硷拷锟斤拷锟斤拷莸母锟绞
 #ifndef __SY_FORMAT__
 #define __SY_FORMAT__
-typedef enum sy_format {
-	SY_FORMAT_BGR888,		//目前只支持该种解码格式
+enum sy_format {
+	SY_FORMAT_BGR888,		//目前只支锟街革拷锟街斤拷锟斤拷锟绞
 	SY_FORMAT_BGRA888,
 	SY_FORMAT_GRAY8,
 	SY_FORMAT_YUV4420P,
@@ -11,6 +11,7 @@ int main() {
     VillageParam param;
     param.dev_id = 0;
     param.sdk_path = ".";
+    param.log_level = 1;
     int ret = village_pic_init(&vaHandle, param);
  
     vector<string> vec_path;
@@ -12,6 +12,17 @@
 struct VillageParam {
     int dev_id;
     std::string sdk_path;
+
+    // AI_LOG_LEVEL_CLOSE = -1,  // 关闭日
+	// AI_LOG_LEVEL_TRACE = 0,   // 跟踪变量
+	// AI_LOG_LEVEL_DEBUG = 1,       // 调试日志
+	// AI_LOG_LEVEL_INFO = 2,        // 普通日志信息 （如：无关紧要的信息输出）
+	// AI_LOG_LEVEL_WARNING = 3,     // 警告日志通知，模块一切正常（如：重要流程通知）
+	// AI_LOG_LEVEL_ERROR = 4,       // 重要日志，如结果和严重错误
+    int log_level{2};
+	int log_days{30};               //日志保存周期
+    std::string log_path{"logs/main.log"};             //日志文件路径
+	unsigned long log_mem{64 * 1024 * 1024};             //每个日志最大大小
 };
  
 typedef struct pendant_info