diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/spdlog/pattern_formatter-inl.h b/spdlog/pattern_formatter-inl.h new file mode 100644 index 0000000..01afbe6 --- /dev/null +++ b/spdlog/pattern_formatter-inl.h @@ -0,0 +1,1436 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace spdlog { +namespace details { + +/////////////////////////////////////////////////////////////////////// +// name & level pattern appender +/////////////////////////////////////////////////////////////////////// + +class scoped_padder +{ +public: + scoped_padder(size_t wrapped_size, const padding_info &padinfo, memory_buf_t &dest) + : padinfo_(padinfo) + , dest_(dest) + { + remaining_pad_ = static_cast(padinfo.width_) - static_cast(wrapped_size); + if (remaining_pad_ <= 0) + { + return; + } + + if (padinfo_.side_ == padding_info::pad_side::left) + { + pad_it(remaining_pad_); + remaining_pad_ = 0; + } + else if (padinfo_.side_ == padding_info::pad_side::center) + { + auto half_pad = remaining_pad_ / 2; + auto reminder = remaining_pad_ & 1; + pad_it(half_pad); + remaining_pad_ = half_pad + reminder; // for the right side + } + } + + template + static unsigned int count_digits(T n) + { + return fmt_helper::count_digits(n); + } + + ~scoped_padder() + { + if (remaining_pad_ >= 0) + { + pad_it(remaining_pad_); + } + else if (padinfo_.truncate_) + { + long new_size = static_cast(dest_.size()) + remaining_pad_; + dest_.resize(static_cast(new_size)); + } + } + +private: + void pad_it(long count) + { + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); + } + + const padding_info &padinfo_; + memory_buf_t &dest_; + long remaining_pad_; + string_view_t spaces_{" ", 64}; +}; + +struct null_scoped_padder +{ + null_scoped_padder(size_t /*wrapped_size*/, const padding_info & /*padinfo*/, memory_buf_t & /*dest*/) {} + + template + static unsigned int count_digits(T /* number */) + { + return 0; + } +}; + +template +class name_formatter final : public flag_formatter +{ +public: + explicit name_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.logger_name.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.logger_name, dest); + } +}; + +// log level appender +template +class level_formatter final : public flag_formatter +{ +public: + explicit level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const string_view_t &level_name = level::to_string_view(msg.level); + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +// short log level appender +template +class short_level_formatter final : public flag_formatter +{ +public: + explicit short_level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + string_view_t level_name{level::to_short_c_str(msg.level)}; + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +/////////////////////////////////////////////////////////////////////// +// Date time pattern appenders +/////////////////////////////////////////////////////////////////////// + +static const char *ampm(const tm &t) +{ + return t.tm_hour >= 12 ? "PM" : "AM"; +} + +static int to12h(const tm &t) +{ + return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour; +} + +// Abbreviated weekday name +static std::array days{{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}}; + +template +class a_formatter final : public flag_formatter +{ +public: + explicit a_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full weekday name +static std::array full_days{{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}}; + +template +class A_formatter : public flag_formatter +{ +public: + explicit A_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Abbreviated month +static const std::array months{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}}; + +template +class b_formatter final : public flag_formatter +{ +public: + explicit b_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full month name +static const std::array full_months{ + {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}}; + +template +class B_formatter final : public flag_formatter +{ +public: + explicit B_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Date and time representation (Thu Aug 23 15:35:46 2014) +template +class c_formatter final : public flag_formatter +{ +public: + explicit c_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 24; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::append_string_view(days[static_cast(tm_time.tm_wday)], dest); + dest.push_back(' '); + fmt_helper::append_string_view(months[static_cast(tm_time.tm_mon)], dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_mday, dest); + dest.push_back(' '); + // time + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// year - 2 digit +template +class C_formatter final : public flag_formatter +{ +public: + explicit C_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01 +template +class D_formatter final : public flag_formatter +{ +public: + explicit D_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_mday, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// year - 4 digit +template +class Y_formatter final : public flag_formatter +{ +public: + explicit Y_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 4; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// month 1-12 +template +class m_formatter final : public flag_formatter +{ +public: + explicit m_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + } +}; + +// day of month 1-31 +template +class d_formatter final : public flag_formatter +{ +public: + explicit d_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mday, dest); + } +}; + +// hours in 24 format 0-23 +template +class H_formatter final : public flag_formatter +{ +public: + explicit H_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_hour, dest); + } +}; + +// hours in 12 format 1-12 +template +class I_formatter final : public flag_formatter +{ +public: + explicit I_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(to12h(tm_time), dest); + } +}; + +// minutes 0-59 +template +class M_formatter final : public flag_formatter +{ +public: + explicit M_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// seconds 0-59 +template +class S_formatter final : public flag_formatter +{ +public: + explicit S_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// milliseconds +template +class e_formatter final : public flag_formatter +{ +public: + explicit e_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto millis = fmt_helper::time_fraction(msg.time); + const size_t field_size = 3; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad3(static_cast(millis.count()), dest); + } +}; + +// microseconds +template +class f_formatter final : public flag_formatter +{ +public: + explicit f_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto micros = fmt_helper::time_fraction(msg.time); + + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad6(static_cast(micros.count()), dest); + } +}; + +// nanoseconds +template +class F_formatter final : public flag_formatter +{ +public: + explicit F_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto ns = fmt_helper::time_fraction(msg.time); + const size_t field_size = 9; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad9(static_cast(ns.count()), dest); + } +}; + +// seconds since epoch +template +class E_formatter final : public flag_formatter +{ +public: + explicit E_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + auto duration = msg.time.time_since_epoch(); + auto seconds = std::chrono::duration_cast(duration).count(); + fmt_helper::append_int(seconds, dest); + } +}; + +// AM/PM +template +class p_formatter final : public flag_formatter +{ +public: + explicit p_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 12 hour clock 02:55:02 pm +template +class r_formatter final : public flag_formatter +{ +public: + explicit r_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 11; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(to12h(tm_time), dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 24-hour HH:MM time, equivalent to %H:%M +template +class R_formatter final : public flag_formatter +{ +public: + explicit R_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 5; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S +template +class T_formatter final : public flag_formatter +{ +public: + explicit T_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// ISO 8601 offset from UTC in timezone (+-HH:MM) +template +class z_formatter final : public flag_formatter +{ +public: + explicit z_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + z_formatter() = default; + z_formatter(const z_formatter &) = delete; + z_formatter &operator=(const z_formatter &) = delete; + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + + auto total_minutes = get_cached_offset(msg, tm_time); + bool is_negative = total_minutes < 0; + if (is_negative) + { + total_minutes = -total_minutes; + dest.push_back('-'); + } + else + { + dest.push_back('+'); + } + + fmt_helper::pad2(total_minutes / 60, dest); // hours + dest.push_back(':'); + fmt_helper::pad2(total_minutes % 60, dest); // minutes + } + +private: + log_clock::time_point last_update_{std::chrono::seconds(0)}; + int offset_minutes_{0}; + + int get_cached_offset(const log_msg &msg, const std::tm &tm_time) + { + // refresh every 10 seconds + if (msg.time - last_update_ >= std::chrono::seconds(10)) + { + offset_minutes_ = os::utc_minutes_offset(tm_time); + last_update_ = msg.time; + } + return offset_minutes_; + } +}; + +// Thread id +template +class t_formatter final : public flag_formatter +{ +public: + explicit t_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const auto field_size = ScopedPadder::count_digits(msg.thread_id); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.thread_id, dest); + } +}; + +// Current pid +template +class pid_formatter final : public flag_formatter +{ +public: + explicit pid_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + const auto pid = static_cast(details::os::pid()); + auto field_size = ScopedPadder::count_digits(pid); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(pid, dest); + } +}; + +template +class v_formatter final : public flag_formatter +{ +public: + explicit v_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.payload.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.payload, dest); + } +}; + +class ch_formatter final : public flag_formatter +{ +public: + explicit ch_formatter(char ch) + : ch_(ch) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + dest.push_back(ch_); + } + +private: + char ch_; +}; + +// aggregate user chars to display as is +class aggregate_formatter final : public flag_formatter +{ +public: + aggregate_formatter() = default; + + void add_ch(char ch) + { + str_ += ch; + } + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + fmt_helper::append_string_view(str_, dest); + } + +private: + std::string str_; +}; + +// mark the color range. expect it to be in the form of "%^colored text%$" +class color_start_formatter final : public flag_formatter +{ +public: + explicit color_start_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_start = dest.size(); + } +}; + +class color_stop_formatter final : public flag_formatter +{ +public: + explicit color_stop_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_end = dest.size(); + } +}; + +// print source location +template +class source_location_formatter final : public flag_formatter +{ +public: + explicit source_location_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + size_t text_size; + if (padinfo_.enabled()) + { + // calc text size for padding based on "filename:line" + text_size = std::char_traits::length(msg.source.filename) + ScopedPadder::count_digits(msg.source.line) + 1; + } + else + { + text_size = 0; + } + + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source filename +template +class source_filename_formatter final : public flag_formatter +{ +public: + explicit source_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + } +}; + +template +class short_filename_formatter final : public flag_formatter +{ +public: + explicit short_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4127) // consider using 'if constexpr' instead +#endif // _MSC_VER + static const char *basename(const char *filename) + { + // if the size is 2 (1 character + null terminator) we can use the more efficient strrchr + // the branch will be elided by optimizations + if (sizeof(os::folder_seps) == 2) + { + const char *rv = std::strrchr(filename, os::folder_seps[0]); + return rv != nullptr ? rv + 1 : filename; + } + else + { + const std::reverse_iterator begin(filename + std::strlen(filename)); + const std::reverse_iterator end(filename); + + const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1); + return it != end ? it.base() : filename; + } + } +#ifdef _MSC_VER +# pragma warning(pop) +#endif // _MSC_VER + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + auto filename = basename(msg.source.filename); + size_t text_size = padinfo_.enabled() ? std::char_traits::length(filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(filename, dest); + } +}; + +template +class source_linenum_formatter final : public flag_formatter +{ +public: + explicit source_linenum_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + auto field_size = ScopedPadder::count_digits(msg.source.line); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source funcname +template +class source_funcname_formatter final : public flag_formatter +{ +public: + explicit source_funcname_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.funcname) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.funcname, dest); + } +}; + +// print elapsed time since last message +template +class elapsed_formatter final : public flag_formatter +{ +public: + using DurationUnits = Units; + + explicit elapsed_formatter(padding_info padinfo) + : flag_formatter(padinfo) + , last_message_time_(log_clock::now()) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta_units = std::chrono::duration_cast(delta); + last_message_time_ = msg.time; + auto delta_count = static_cast(delta_units.count()); + auto n_digits = static_cast(ScopedPadder::count_digits(delta_count)); + ScopedPadder p(n_digits, padinfo_, dest); + fmt_helper::append_int(delta_count, dest); + } + +private: + log_clock::time_point last_message_time_; +}; + +// Full info formatter +// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v +class full_formatter final : public flag_formatter +{ +public: + explicit full_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + using std::chrono::duration_cast; + using std::chrono::milliseconds; + using std::chrono::seconds; + + // cache the date/time part for the next second. + auto duration = msg.time.time_since_epoch(); + auto secs = duration_cast(duration); + + if (cache_timestamp_ != secs || cached_datetime_.size() == 0) + { + cached_datetime_.clear(); + cached_datetime_.push_back('['); + fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mday, cached_datetime_); + cached_datetime_.push_back(' '); + + fmt_helper::pad2(tm_time.tm_hour, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_min, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_sec, cached_datetime_); + cached_datetime_.push_back('.'); + + cache_timestamp_ = secs; + } + dest.append(cached_datetime_.begin(), cached_datetime_.end()); + + auto millis = fmt_helper::time_fraction(msg.time); + fmt_helper::pad3(static_cast(millis.count()), dest); + dest.push_back(']'); + dest.push_back(' '); + + // append logger name if exists + if (msg.logger_name.size() > 0) + { + dest.push_back('['); + fmt_helper::append_string_view(msg.logger_name, dest); + dest.push_back(']'); + dest.push_back(' '); + } + + dest.push_back('['); + // wrap the level name with color + msg.color_range_start = dest.size(); + // fmt_helper::append_string_view(level::to_c_str(msg.level), dest); + fmt_helper::append_string_view(level::to_string_view(msg.level), dest); + msg.color_range_end = dest.size(); + dest.push_back(']'); + dest.push_back(' '); + + // add source location if present + if (!msg.source.empty()) + { + dest.push_back('['); + const char *filename = details::short_filename_formatter::basename(msg.source.filename); + fmt_helper::append_string_view(filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + dest.push_back(']'); + dest.push_back(' '); + } + // fmt_helper::append_string_view(msg.msg(), dest); + fmt_helper::append_string_view(msg.payload, dest); + } + +private: + std::chrono::seconds cache_timestamp_{0}; + memory_buf_t cached_datetime_; +}; + +} // namespace details + +SPDLOG_INLINE pattern_formatter::pattern_formatter( + std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags) + : pattern_(std::move(pattern)) + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(false) + , last_log_secs_(0) + , custom_handlers_(std::move(custom_user_flags)) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + compile_pattern_(pattern_); +} + +// use by default full formatter for if pattern is not given +SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + : pattern_("%+") + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(true) + , last_log_secs_(0) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + formatters_.push_back(details::make_unique(details::padding_info{})); +} + +SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const +{ + custom_flags cloned_custom_formatters; + for (auto &it : custom_handlers_) + { + cloned_custom_formatters[it.first] = it.second->clone(); + } + auto cloned = details::make_unique(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters)); + cloned->need_localtime(need_localtime_); +#if defined(__GNUC__) && __GNUC__ < 5 + return std::move(cloned); +#else + return cloned; +#endif +} + +SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest) +{ + if (need_localtime_) + { + const auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); + if (secs != last_log_secs_) + { + cached_tm_ = get_time_(msg); + last_log_secs_ = secs; + } + } + + for (auto &f : formatters_) + { + f->format(msg, cached_tm_, dest); + } + // write eol + details::fmt_helper::append_string_view(eol_, dest); +} + +SPDLOG_INLINE void pattern_formatter::set_pattern(std::string pattern) +{ + pattern_ = std::move(pattern); + need_localtime_ = false; + compile_pattern_(pattern_); +} + +SPDLOG_INLINE void pattern_formatter::need_localtime(bool need) +{ + need_localtime_ = need; +} + +SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) +{ + if (pattern_time_type_ == pattern_time_type::local) + { + return details::os::localtime(log_clock::to_time_t(msg.time)); + } + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} + +template +SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) +{ + // process custom flags + auto it = custom_handlers_.find(flag); + if (it != custom_handlers_.end()) + { + auto custom_handler = it->second->clone(); + custom_handler->set_padding_info(padding); + formatters_.push_back(std::move(custom_handler)); + return; + } + + // process built-in flags + switch (flag) + { + case ('+'): // default formatter + formatters_.push_back(details::make_unique(padding)); + need_localtime_ = true; + break; + + case 'n': // logger name + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'l': // level + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'L': // short level + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('t'): // thread id + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('v'): // the message text + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('a'): // weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('A'): // short weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('b'): + case ('h'): // month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('B'): // short month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('c'): // datetime + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('C'): // year 2 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('Y'): // year 4 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('D'): + case ('x'): // datetime MM/DD/YY + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('m'): // month 1-12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('d'): // day of month 1-31 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('H'): // hours 24 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('I'): // hours 12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('M'): // minutes + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('S'): // seconds + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('e'): // milliseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('f'): // microseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('F'): // nanoseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('E'): // seconds since epoch + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('p'): // am/pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('r'): // 12 hour clock 02:55:02 pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('R'): // 24-hour HH:MM time + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('T'): + case ('X'): // ISO 8601 time format (HH:MM:SS) + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('z'): // timezone + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('P'): // pid + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('^'): // color range start + formatters_.push_back(details::make_unique(padding)); + break; + + case ('$'): // color range end + formatters_.push_back(details::make_unique(padding)); + break; + + case ('@'): // source location (filename:filenumber) + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('s'): // short source filename - without directory name + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('g'): // full source filename + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('#'): // source line number + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('!'): // source funcname + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('%'): // % char + formatters_.push_back(details::make_unique('%')); + break; + + case ('u'): // elapsed time since last log message in nanos + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('i'): // elapsed time since last log message in micros + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('o'): // elapsed time since last log message in millis + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('O'): // elapsed time since last log message in seconds + formatters_.push_back(details::make_unique>(padding)); + break; + + default: // Unknown flag appears as is + auto unknown_flag = details::make_unique(); + + if (!padding.truncate_) + { + unknown_flag->add_ch('%'); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + // fix issue #1617 (prev char was '!' and should have been treated as funcname flag instead of truncating flag) + // spdlog::set_pattern("[%10!] %v") => "[ main] some message" + // spdlog::set_pattern("[%3!!] %v") => "[mai] some message" + else + { + padding.truncate_ = false; + formatters_.push_back(details::make_unique>(padding)); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + + break; + } +} + +// Extract given pad spec (e.g. %8X, %=8X, %-8!X, %8!X, %=8!X, %-8!X, %+8!X) +// Advance the given it pass the end of the padding spec found (if any) +// Return padding. +SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) +{ + using details::padding_info; + using details::scoped_padder; + const size_t max_width = 64; + if (it == end) + { + return padding_info{}; + } + + padding_info::pad_side side; + switch (*it) + { + case '-': + side = padding_info::pad_side::right; + ++it; + break; + case '=': + side = padding_info::pad_side::center; + ++it; + break; + default: + side = details::padding_info::pad_side::left; + break; + } + + if (it == end || !std::isdigit(static_cast(*it))) + { + return padding_info{}; // no padding if no digit found here + } + + auto width = static_cast(*it) - '0'; + for (++it; it != end && std::isdigit(static_cast(*it)); ++it) + { + auto digit = static_cast(*it) - '0'; + width = width * 10 + digit; + } + + // search for the optional truncate marker '!' + bool truncate; + if (it != end && *it == '!') + { + truncate = true; + ++it; + } + else + { + truncate = false; + } + return details::padding_info{std::min(width, max_width), side, truncate}; +} + +SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) +{ + auto end = pattern.end(); + std::unique_ptr user_chars; + formatters_.clear(); + for (auto it = pattern.begin(); it != end; ++it) + { + if (*it == '%') + { + if (user_chars) // append user chars found so far + { + formatters_.push_back(std::move(user_chars)); + } + + auto padding = handle_padspec_(++it, end); + + if (it != end) + { + if (padding.enabled()) + { + handle_flag_(*it, padding); + } + else + { + handle_flag_(*it, padding); + } + } + else + { + break; + } + } + else // chars not following the % sign should be displayed as is + { + if (!user_chars) + { + user_chars = details::make_unique(); + } + user_chars->add_ch(*it); + } + } + if (user_chars) // append raw chars found so far + { + formatters_.push_back(std::move(user_chars)); + } +} +} // namespace spdlog diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/spdlog/pattern_formatter-inl.h b/spdlog/pattern_formatter-inl.h new file mode 100644 index 0000000..01afbe6 --- /dev/null +++ b/spdlog/pattern_formatter-inl.h @@ -0,0 +1,1436 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace spdlog { +namespace details { + +/////////////////////////////////////////////////////////////////////// +// name & level pattern appender +/////////////////////////////////////////////////////////////////////// + +class scoped_padder +{ +public: + scoped_padder(size_t wrapped_size, const padding_info &padinfo, memory_buf_t &dest) + : padinfo_(padinfo) + , dest_(dest) + { + remaining_pad_ = static_cast(padinfo.width_) - static_cast(wrapped_size); + if (remaining_pad_ <= 0) + { + return; + } + + if (padinfo_.side_ == padding_info::pad_side::left) + { + pad_it(remaining_pad_); + remaining_pad_ = 0; + } + else if (padinfo_.side_ == padding_info::pad_side::center) + { + auto half_pad = remaining_pad_ / 2; + auto reminder = remaining_pad_ & 1; + pad_it(half_pad); + remaining_pad_ = half_pad + reminder; // for the right side + } + } + + template + static unsigned int count_digits(T n) + { + return fmt_helper::count_digits(n); + } + + ~scoped_padder() + { + if (remaining_pad_ >= 0) + { + pad_it(remaining_pad_); + } + else if (padinfo_.truncate_) + { + long new_size = static_cast(dest_.size()) + remaining_pad_; + dest_.resize(static_cast(new_size)); + } + } + +private: + void pad_it(long count) + { + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); + } + + const padding_info &padinfo_; + memory_buf_t &dest_; + long remaining_pad_; + string_view_t spaces_{" ", 64}; +}; + +struct null_scoped_padder +{ + null_scoped_padder(size_t /*wrapped_size*/, const padding_info & /*padinfo*/, memory_buf_t & /*dest*/) {} + + template + static unsigned int count_digits(T /* number */) + { + return 0; + } +}; + +template +class name_formatter final : public flag_formatter +{ +public: + explicit name_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.logger_name.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.logger_name, dest); + } +}; + +// log level appender +template +class level_formatter final : public flag_formatter +{ +public: + explicit level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const string_view_t &level_name = level::to_string_view(msg.level); + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +// short log level appender +template +class short_level_formatter final : public flag_formatter +{ +public: + explicit short_level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + string_view_t level_name{level::to_short_c_str(msg.level)}; + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +/////////////////////////////////////////////////////////////////////// +// Date time pattern appenders +/////////////////////////////////////////////////////////////////////// + +static const char *ampm(const tm &t) +{ + return t.tm_hour >= 12 ? "PM" : "AM"; +} + +static int to12h(const tm &t) +{ + return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour; +} + +// Abbreviated weekday name +static std::array days{{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}}; + +template +class a_formatter final : public flag_formatter +{ +public: + explicit a_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full weekday name +static std::array full_days{{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}}; + +template +class A_formatter : public flag_formatter +{ +public: + explicit A_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Abbreviated month +static const std::array months{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}}; + +template +class b_formatter final : public flag_formatter +{ +public: + explicit b_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full month name +static const std::array full_months{ + {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}}; + +template +class B_formatter final : public flag_formatter +{ +public: + explicit B_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Date and time representation (Thu Aug 23 15:35:46 2014) +template +class c_formatter final : public flag_formatter +{ +public: + explicit c_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 24; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::append_string_view(days[static_cast(tm_time.tm_wday)], dest); + dest.push_back(' '); + fmt_helper::append_string_view(months[static_cast(tm_time.tm_mon)], dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_mday, dest); + dest.push_back(' '); + // time + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// year - 2 digit +template +class C_formatter final : public flag_formatter +{ +public: + explicit C_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01 +template +class D_formatter final : public flag_formatter +{ +public: + explicit D_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_mday, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// year - 4 digit +template +class Y_formatter final : public flag_formatter +{ +public: + explicit Y_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 4; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// month 1-12 +template +class m_formatter final : public flag_formatter +{ +public: + explicit m_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + } +}; + +// day of month 1-31 +template +class d_formatter final : public flag_formatter +{ +public: + explicit d_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mday, dest); + } +}; + +// hours in 24 format 0-23 +template +class H_formatter final : public flag_formatter +{ +public: + explicit H_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_hour, dest); + } +}; + +// hours in 12 format 1-12 +template +class I_formatter final : public flag_formatter +{ +public: + explicit I_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(to12h(tm_time), dest); + } +}; + +// minutes 0-59 +template +class M_formatter final : public flag_formatter +{ +public: + explicit M_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// seconds 0-59 +template +class S_formatter final : public flag_formatter +{ +public: + explicit S_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// milliseconds +template +class e_formatter final : public flag_formatter +{ +public: + explicit e_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto millis = fmt_helper::time_fraction(msg.time); + const size_t field_size = 3; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad3(static_cast(millis.count()), dest); + } +}; + +// microseconds +template +class f_formatter final : public flag_formatter +{ +public: + explicit f_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto micros = fmt_helper::time_fraction(msg.time); + + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad6(static_cast(micros.count()), dest); + } +}; + +// nanoseconds +template +class F_formatter final : public flag_formatter +{ +public: + explicit F_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto ns = fmt_helper::time_fraction(msg.time); + const size_t field_size = 9; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad9(static_cast(ns.count()), dest); + } +}; + +// seconds since epoch +template +class E_formatter final : public flag_formatter +{ +public: + explicit E_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + auto duration = msg.time.time_since_epoch(); + auto seconds = std::chrono::duration_cast(duration).count(); + fmt_helper::append_int(seconds, dest); + } +}; + +// AM/PM +template +class p_formatter final : public flag_formatter +{ +public: + explicit p_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 12 hour clock 02:55:02 pm +template +class r_formatter final : public flag_formatter +{ +public: + explicit r_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 11; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(to12h(tm_time), dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 24-hour HH:MM time, equivalent to %H:%M +template +class R_formatter final : public flag_formatter +{ +public: + explicit R_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 5; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S +template +class T_formatter final : public flag_formatter +{ +public: + explicit T_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// ISO 8601 offset from UTC in timezone (+-HH:MM) +template +class z_formatter final : public flag_formatter +{ +public: + explicit z_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + z_formatter() = default; + z_formatter(const z_formatter &) = delete; + z_formatter &operator=(const z_formatter &) = delete; + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + + auto total_minutes = get_cached_offset(msg, tm_time); + bool is_negative = total_minutes < 0; + if (is_negative) + { + total_minutes = -total_minutes; + dest.push_back('-'); + } + else + { + dest.push_back('+'); + } + + fmt_helper::pad2(total_minutes / 60, dest); // hours + dest.push_back(':'); + fmt_helper::pad2(total_minutes % 60, dest); // minutes + } + +private: + log_clock::time_point last_update_{std::chrono::seconds(0)}; + int offset_minutes_{0}; + + int get_cached_offset(const log_msg &msg, const std::tm &tm_time) + { + // refresh every 10 seconds + if (msg.time - last_update_ >= std::chrono::seconds(10)) + { + offset_minutes_ = os::utc_minutes_offset(tm_time); + last_update_ = msg.time; + } + return offset_minutes_; + } +}; + +// Thread id +template +class t_formatter final : public flag_formatter +{ +public: + explicit t_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const auto field_size = ScopedPadder::count_digits(msg.thread_id); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.thread_id, dest); + } +}; + +// Current pid +template +class pid_formatter final : public flag_formatter +{ +public: + explicit pid_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + const auto pid = static_cast(details::os::pid()); + auto field_size = ScopedPadder::count_digits(pid); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(pid, dest); + } +}; + +template +class v_formatter final : public flag_formatter +{ +public: + explicit v_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.payload.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.payload, dest); + } +}; + +class ch_formatter final : public flag_formatter +{ +public: + explicit ch_formatter(char ch) + : ch_(ch) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + dest.push_back(ch_); + } + +private: + char ch_; +}; + +// aggregate user chars to display as is +class aggregate_formatter final : public flag_formatter +{ +public: + aggregate_formatter() = default; + + void add_ch(char ch) + { + str_ += ch; + } + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + fmt_helper::append_string_view(str_, dest); + } + +private: + std::string str_; +}; + +// mark the color range. expect it to be in the form of "%^colored text%$" +class color_start_formatter final : public flag_formatter +{ +public: + explicit color_start_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_start = dest.size(); + } +}; + +class color_stop_formatter final : public flag_formatter +{ +public: + explicit color_stop_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_end = dest.size(); + } +}; + +// print source location +template +class source_location_formatter final : public flag_formatter +{ +public: + explicit source_location_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + size_t text_size; + if (padinfo_.enabled()) + { + // calc text size for padding based on "filename:line" + text_size = std::char_traits::length(msg.source.filename) + ScopedPadder::count_digits(msg.source.line) + 1; + } + else + { + text_size = 0; + } + + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source filename +template +class source_filename_formatter final : public flag_formatter +{ +public: + explicit source_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + } +}; + +template +class short_filename_formatter final : public flag_formatter +{ +public: + explicit short_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4127) // consider using 'if constexpr' instead +#endif // _MSC_VER + static const char *basename(const char *filename) + { + // if the size is 2 (1 character + null terminator) we can use the more efficient strrchr + // the branch will be elided by optimizations + if (sizeof(os::folder_seps) == 2) + { + const char *rv = std::strrchr(filename, os::folder_seps[0]); + return rv != nullptr ? rv + 1 : filename; + } + else + { + const std::reverse_iterator begin(filename + std::strlen(filename)); + const std::reverse_iterator end(filename); + + const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1); + return it != end ? it.base() : filename; + } + } +#ifdef _MSC_VER +# pragma warning(pop) +#endif // _MSC_VER + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + auto filename = basename(msg.source.filename); + size_t text_size = padinfo_.enabled() ? std::char_traits::length(filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(filename, dest); + } +}; + +template +class source_linenum_formatter final : public flag_formatter +{ +public: + explicit source_linenum_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + auto field_size = ScopedPadder::count_digits(msg.source.line); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source funcname +template +class source_funcname_formatter final : public flag_formatter +{ +public: + explicit source_funcname_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.funcname) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.funcname, dest); + } +}; + +// print elapsed time since last message +template +class elapsed_formatter final : public flag_formatter +{ +public: + using DurationUnits = Units; + + explicit elapsed_formatter(padding_info padinfo) + : flag_formatter(padinfo) + , last_message_time_(log_clock::now()) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta_units = std::chrono::duration_cast(delta); + last_message_time_ = msg.time; + auto delta_count = static_cast(delta_units.count()); + auto n_digits = static_cast(ScopedPadder::count_digits(delta_count)); + ScopedPadder p(n_digits, padinfo_, dest); + fmt_helper::append_int(delta_count, dest); + } + +private: + log_clock::time_point last_message_time_; +}; + +// Full info formatter +// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v +class full_formatter final : public flag_formatter +{ +public: + explicit full_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + using std::chrono::duration_cast; + using std::chrono::milliseconds; + using std::chrono::seconds; + + // cache the date/time part for the next second. + auto duration = msg.time.time_since_epoch(); + auto secs = duration_cast(duration); + + if (cache_timestamp_ != secs || cached_datetime_.size() == 0) + { + cached_datetime_.clear(); + cached_datetime_.push_back('['); + fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mday, cached_datetime_); + cached_datetime_.push_back(' '); + + fmt_helper::pad2(tm_time.tm_hour, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_min, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_sec, cached_datetime_); + cached_datetime_.push_back('.'); + + cache_timestamp_ = secs; + } + dest.append(cached_datetime_.begin(), cached_datetime_.end()); + + auto millis = fmt_helper::time_fraction(msg.time); + fmt_helper::pad3(static_cast(millis.count()), dest); + dest.push_back(']'); + dest.push_back(' '); + + // append logger name if exists + if (msg.logger_name.size() > 0) + { + dest.push_back('['); + fmt_helper::append_string_view(msg.logger_name, dest); + dest.push_back(']'); + dest.push_back(' '); + } + + dest.push_back('['); + // wrap the level name with color + msg.color_range_start = dest.size(); + // fmt_helper::append_string_view(level::to_c_str(msg.level), dest); + fmt_helper::append_string_view(level::to_string_view(msg.level), dest); + msg.color_range_end = dest.size(); + dest.push_back(']'); + dest.push_back(' '); + + // add source location if present + if (!msg.source.empty()) + { + dest.push_back('['); + const char *filename = details::short_filename_formatter::basename(msg.source.filename); + fmt_helper::append_string_view(filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + dest.push_back(']'); + dest.push_back(' '); + } + // fmt_helper::append_string_view(msg.msg(), dest); + fmt_helper::append_string_view(msg.payload, dest); + } + +private: + std::chrono::seconds cache_timestamp_{0}; + memory_buf_t cached_datetime_; +}; + +} // namespace details + +SPDLOG_INLINE pattern_formatter::pattern_formatter( + std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags) + : pattern_(std::move(pattern)) + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(false) + , last_log_secs_(0) + , custom_handlers_(std::move(custom_user_flags)) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + compile_pattern_(pattern_); +} + +// use by default full formatter for if pattern is not given +SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + : pattern_("%+") + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(true) + , last_log_secs_(0) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + formatters_.push_back(details::make_unique(details::padding_info{})); +} + +SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const +{ + custom_flags cloned_custom_formatters; + for (auto &it : custom_handlers_) + { + cloned_custom_formatters[it.first] = it.second->clone(); + } + auto cloned = details::make_unique(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters)); + cloned->need_localtime(need_localtime_); +#if defined(__GNUC__) && __GNUC__ < 5 + return std::move(cloned); +#else + return cloned; +#endif +} + +SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest) +{ + if (need_localtime_) + { + const auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); + if (secs != last_log_secs_) + { + cached_tm_ = get_time_(msg); + last_log_secs_ = secs; + } + } + + for (auto &f : formatters_) + { + f->format(msg, cached_tm_, dest); + } + // write eol + details::fmt_helper::append_string_view(eol_, dest); +} + +SPDLOG_INLINE void pattern_formatter::set_pattern(std::string pattern) +{ + pattern_ = std::move(pattern); + need_localtime_ = false; + compile_pattern_(pattern_); +} + +SPDLOG_INLINE void pattern_formatter::need_localtime(bool need) +{ + need_localtime_ = need; +} + +SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) +{ + if (pattern_time_type_ == pattern_time_type::local) + { + return details::os::localtime(log_clock::to_time_t(msg.time)); + } + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} + +template +SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) +{ + // process custom flags + auto it = custom_handlers_.find(flag); + if (it != custom_handlers_.end()) + { + auto custom_handler = it->second->clone(); + custom_handler->set_padding_info(padding); + formatters_.push_back(std::move(custom_handler)); + return; + } + + // process built-in flags + switch (flag) + { + case ('+'): // default formatter + formatters_.push_back(details::make_unique(padding)); + need_localtime_ = true; + break; + + case 'n': // logger name + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'l': // level + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'L': // short level + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('t'): // thread id + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('v'): // the message text + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('a'): // weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('A'): // short weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('b'): + case ('h'): // month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('B'): // short month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('c'): // datetime + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('C'): // year 2 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('Y'): // year 4 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('D'): + case ('x'): // datetime MM/DD/YY + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('m'): // month 1-12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('d'): // day of month 1-31 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('H'): // hours 24 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('I'): // hours 12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('M'): // minutes + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('S'): // seconds + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('e'): // milliseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('f'): // microseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('F'): // nanoseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('E'): // seconds since epoch + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('p'): // am/pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('r'): // 12 hour clock 02:55:02 pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('R'): // 24-hour HH:MM time + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('T'): + case ('X'): // ISO 8601 time format (HH:MM:SS) + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('z'): // timezone + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('P'): // pid + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('^'): // color range start + formatters_.push_back(details::make_unique(padding)); + break; + + case ('$'): // color range end + formatters_.push_back(details::make_unique(padding)); + break; + + case ('@'): // source location (filename:filenumber) + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('s'): // short source filename - without directory name + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('g'): // full source filename + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('#'): // source line number + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('!'): // source funcname + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('%'): // % char + formatters_.push_back(details::make_unique('%')); + break; + + case ('u'): // elapsed time since last log message in nanos + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('i'): // elapsed time since last log message in micros + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('o'): // elapsed time since last log message in millis + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('O'): // elapsed time since last log message in seconds + formatters_.push_back(details::make_unique>(padding)); + break; + + default: // Unknown flag appears as is + auto unknown_flag = details::make_unique(); + + if (!padding.truncate_) + { + unknown_flag->add_ch('%'); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + // fix issue #1617 (prev char was '!' and should have been treated as funcname flag instead of truncating flag) + // spdlog::set_pattern("[%10!] %v") => "[ main] some message" + // spdlog::set_pattern("[%3!!] %v") => "[mai] some message" + else + { + padding.truncate_ = false; + formatters_.push_back(details::make_unique>(padding)); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + + break; + } +} + +// Extract given pad spec (e.g. %8X, %=8X, %-8!X, %8!X, %=8!X, %-8!X, %+8!X) +// Advance the given it pass the end of the padding spec found (if any) +// Return padding. +SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) +{ + using details::padding_info; + using details::scoped_padder; + const size_t max_width = 64; + if (it == end) + { + return padding_info{}; + } + + padding_info::pad_side side; + switch (*it) + { + case '-': + side = padding_info::pad_side::right; + ++it; + break; + case '=': + side = padding_info::pad_side::center; + ++it; + break; + default: + side = details::padding_info::pad_side::left; + break; + } + + if (it == end || !std::isdigit(static_cast(*it))) + { + return padding_info{}; // no padding if no digit found here + } + + auto width = static_cast(*it) - '0'; + for (++it; it != end && std::isdigit(static_cast(*it)); ++it) + { + auto digit = static_cast(*it) - '0'; + width = width * 10 + digit; + } + + // search for the optional truncate marker '!' + bool truncate; + if (it != end && *it == '!') + { + truncate = true; + ++it; + } + else + { + truncate = false; + } + return details::padding_info{std::min(width, max_width), side, truncate}; +} + +SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) +{ + auto end = pattern.end(); + std::unique_ptr user_chars; + formatters_.clear(); + for (auto it = pattern.begin(); it != end; ++it) + { + if (*it == '%') + { + if (user_chars) // append user chars found so far + { + formatters_.push_back(std::move(user_chars)); + } + + auto padding = handle_padspec_(++it, end); + + if (it != end) + { + if (padding.enabled()) + { + handle_flag_(*it, padding); + } + else + { + handle_flag_(*it, padding); + } + } + else + { + break; + } + } + else // chars not following the % sign should be displayed as is + { + if (!user_chars) + { + user_chars = details::make_unique(); + } + user_chars->add_ch(*it); + } + } + if (user_chars) // append raw chars found so far + { + formatters_.push_back(std::move(user_chars)); + } +} +} // namespace spdlog diff --git a/spdlog/pattern_formatter.h b/spdlog/pattern_formatter.h new file mode 100644 index 0000000..acf1c53 --- /dev/null +++ b/spdlog/pattern_formatter.h @@ -0,0 +1,128 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { +namespace details { + +// padding information. +struct padding_info +{ + enum class pad_side + { + left, + right, + center + }; + + padding_info() = default; + padding_info(size_t width, padding_info::pad_side side, bool truncate) + : width_(width) + , side_(side) + , truncate_(truncate) + , enabled_(true) + {} + + bool enabled() const + { + return enabled_; + } + size_t width_ = 0; + pad_side side_ = pad_side::left; + bool truncate_ = false; + bool enabled_ = false; +}; + +class SPDLOG_API flag_formatter +{ +public: + explicit flag_formatter(padding_info padinfo) + : padinfo_(padinfo) + {} + flag_formatter() = default; + virtual ~flag_formatter() = default; + virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0; + +protected: + padding_info padinfo_; +}; + +} // namespace details + +class SPDLOG_API custom_flag_formatter : public details::flag_formatter +{ +public: + virtual std::unique_ptr clone() const = 0; + + void set_padding_info(const details::padding_info &padding) + { + flag_formatter::padinfo_ = padding; + } +}; + +class SPDLOG_API pattern_formatter final : public formatter +{ +public: + using custom_flags = std::unordered_map>; + + explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local, + std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags()); + + // use default pattern is not given + explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol); + + pattern_formatter(const pattern_formatter &other) = delete; + pattern_formatter &operator=(const pattern_formatter &other) = delete; + + std::unique_ptr clone() const override; + void format(const details::log_msg &msg, memory_buf_t &dest) override; + + template + pattern_formatter &add_flag(char flag, Args &&... args) + { + custom_handlers_[flag] = details::make_unique(std::forward(args)...); + return *this; + } + void set_pattern(std::string pattern); + void need_localtime(bool need = true); + +private: + std::string pattern_; + std::string eol_; + pattern_time_type pattern_time_type_; + bool need_localtime_; + std::tm cached_tm_; + std::chrono::seconds last_log_secs_; + std::vector> formatters_; + custom_flags custom_handlers_; + + std::tm get_time_(const details::log_msg &msg); + template + void handle_flag_(char flag, details::padding_info padding); + + // Extract given pad spec (e.g. %8X) + // Advance the given it pass the end of the padding spec found (if any) + // Return padding. + static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end); + + void compile_pattern_(const std::string &pattern); +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "pattern_formatter-inl.h" +#endif diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/spdlog/pattern_formatter-inl.h b/spdlog/pattern_formatter-inl.h new file mode 100644 index 0000000..01afbe6 --- /dev/null +++ b/spdlog/pattern_formatter-inl.h @@ -0,0 +1,1436 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace spdlog { +namespace details { + +/////////////////////////////////////////////////////////////////////// +// name & level pattern appender +/////////////////////////////////////////////////////////////////////// + +class scoped_padder +{ +public: + scoped_padder(size_t wrapped_size, const padding_info &padinfo, memory_buf_t &dest) + : padinfo_(padinfo) + , dest_(dest) + { + remaining_pad_ = static_cast(padinfo.width_) - static_cast(wrapped_size); + if (remaining_pad_ <= 0) + { + return; + } + + if (padinfo_.side_ == padding_info::pad_side::left) + { + pad_it(remaining_pad_); + remaining_pad_ = 0; + } + else if (padinfo_.side_ == padding_info::pad_side::center) + { + auto half_pad = remaining_pad_ / 2; + auto reminder = remaining_pad_ & 1; + pad_it(half_pad); + remaining_pad_ = half_pad + reminder; // for the right side + } + } + + template + static unsigned int count_digits(T n) + { + return fmt_helper::count_digits(n); + } + + ~scoped_padder() + { + if (remaining_pad_ >= 0) + { + pad_it(remaining_pad_); + } + else if (padinfo_.truncate_) + { + long new_size = static_cast(dest_.size()) + remaining_pad_; + dest_.resize(static_cast(new_size)); + } + } + +private: + void pad_it(long count) + { + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); + } + + const padding_info &padinfo_; + memory_buf_t &dest_; + long remaining_pad_; + string_view_t spaces_{" ", 64}; +}; + +struct null_scoped_padder +{ + null_scoped_padder(size_t /*wrapped_size*/, const padding_info & /*padinfo*/, memory_buf_t & /*dest*/) {} + + template + static unsigned int count_digits(T /* number */) + { + return 0; + } +}; + +template +class name_formatter final : public flag_formatter +{ +public: + explicit name_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.logger_name.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.logger_name, dest); + } +}; + +// log level appender +template +class level_formatter final : public flag_formatter +{ +public: + explicit level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const string_view_t &level_name = level::to_string_view(msg.level); + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +// short log level appender +template +class short_level_formatter final : public flag_formatter +{ +public: + explicit short_level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + string_view_t level_name{level::to_short_c_str(msg.level)}; + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +/////////////////////////////////////////////////////////////////////// +// Date time pattern appenders +/////////////////////////////////////////////////////////////////////// + +static const char *ampm(const tm &t) +{ + return t.tm_hour >= 12 ? "PM" : "AM"; +} + +static int to12h(const tm &t) +{ + return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour; +} + +// Abbreviated weekday name +static std::array days{{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}}; + +template +class a_formatter final : public flag_formatter +{ +public: + explicit a_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full weekday name +static std::array full_days{{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}}; + +template +class A_formatter : public flag_formatter +{ +public: + explicit A_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Abbreviated month +static const std::array months{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}}; + +template +class b_formatter final : public flag_formatter +{ +public: + explicit b_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full month name +static const std::array full_months{ + {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}}; + +template +class B_formatter final : public flag_formatter +{ +public: + explicit B_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Date and time representation (Thu Aug 23 15:35:46 2014) +template +class c_formatter final : public flag_formatter +{ +public: + explicit c_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 24; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::append_string_view(days[static_cast(tm_time.tm_wday)], dest); + dest.push_back(' '); + fmt_helper::append_string_view(months[static_cast(tm_time.tm_mon)], dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_mday, dest); + dest.push_back(' '); + // time + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// year - 2 digit +template +class C_formatter final : public flag_formatter +{ +public: + explicit C_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01 +template +class D_formatter final : public flag_formatter +{ +public: + explicit D_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_mday, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// year - 4 digit +template +class Y_formatter final : public flag_formatter +{ +public: + explicit Y_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 4; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// month 1-12 +template +class m_formatter final : public flag_formatter +{ +public: + explicit m_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + } +}; + +// day of month 1-31 +template +class d_formatter final : public flag_formatter +{ +public: + explicit d_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mday, dest); + } +}; + +// hours in 24 format 0-23 +template +class H_formatter final : public flag_formatter +{ +public: + explicit H_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_hour, dest); + } +}; + +// hours in 12 format 1-12 +template +class I_formatter final : public flag_formatter +{ +public: + explicit I_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(to12h(tm_time), dest); + } +}; + +// minutes 0-59 +template +class M_formatter final : public flag_formatter +{ +public: + explicit M_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// seconds 0-59 +template +class S_formatter final : public flag_formatter +{ +public: + explicit S_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// milliseconds +template +class e_formatter final : public flag_formatter +{ +public: + explicit e_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto millis = fmt_helper::time_fraction(msg.time); + const size_t field_size = 3; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad3(static_cast(millis.count()), dest); + } +}; + +// microseconds +template +class f_formatter final : public flag_formatter +{ +public: + explicit f_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto micros = fmt_helper::time_fraction(msg.time); + + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad6(static_cast(micros.count()), dest); + } +}; + +// nanoseconds +template +class F_formatter final : public flag_formatter +{ +public: + explicit F_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto ns = fmt_helper::time_fraction(msg.time); + const size_t field_size = 9; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad9(static_cast(ns.count()), dest); + } +}; + +// seconds since epoch +template +class E_formatter final : public flag_formatter +{ +public: + explicit E_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + auto duration = msg.time.time_since_epoch(); + auto seconds = std::chrono::duration_cast(duration).count(); + fmt_helper::append_int(seconds, dest); + } +}; + +// AM/PM +template +class p_formatter final : public flag_formatter +{ +public: + explicit p_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 12 hour clock 02:55:02 pm +template +class r_formatter final : public flag_formatter +{ +public: + explicit r_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 11; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(to12h(tm_time), dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 24-hour HH:MM time, equivalent to %H:%M +template +class R_formatter final : public flag_formatter +{ +public: + explicit R_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 5; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S +template +class T_formatter final : public flag_formatter +{ +public: + explicit T_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// ISO 8601 offset from UTC in timezone (+-HH:MM) +template +class z_formatter final : public flag_formatter +{ +public: + explicit z_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + z_formatter() = default; + z_formatter(const z_formatter &) = delete; + z_formatter &operator=(const z_formatter &) = delete; + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + + auto total_minutes = get_cached_offset(msg, tm_time); + bool is_negative = total_minutes < 0; + if (is_negative) + { + total_minutes = -total_minutes; + dest.push_back('-'); + } + else + { + dest.push_back('+'); + } + + fmt_helper::pad2(total_minutes / 60, dest); // hours + dest.push_back(':'); + fmt_helper::pad2(total_minutes % 60, dest); // minutes + } + +private: + log_clock::time_point last_update_{std::chrono::seconds(0)}; + int offset_minutes_{0}; + + int get_cached_offset(const log_msg &msg, const std::tm &tm_time) + { + // refresh every 10 seconds + if (msg.time - last_update_ >= std::chrono::seconds(10)) + { + offset_minutes_ = os::utc_minutes_offset(tm_time); + last_update_ = msg.time; + } + return offset_minutes_; + } +}; + +// Thread id +template +class t_formatter final : public flag_formatter +{ +public: + explicit t_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const auto field_size = ScopedPadder::count_digits(msg.thread_id); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.thread_id, dest); + } +}; + +// Current pid +template +class pid_formatter final : public flag_formatter +{ +public: + explicit pid_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + const auto pid = static_cast(details::os::pid()); + auto field_size = ScopedPadder::count_digits(pid); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(pid, dest); + } +}; + +template +class v_formatter final : public flag_formatter +{ +public: + explicit v_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.payload.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.payload, dest); + } +}; + +class ch_formatter final : public flag_formatter +{ +public: + explicit ch_formatter(char ch) + : ch_(ch) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + dest.push_back(ch_); + } + +private: + char ch_; +}; + +// aggregate user chars to display as is +class aggregate_formatter final : public flag_formatter +{ +public: + aggregate_formatter() = default; + + void add_ch(char ch) + { + str_ += ch; + } + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + fmt_helper::append_string_view(str_, dest); + } + +private: + std::string str_; +}; + +// mark the color range. expect it to be in the form of "%^colored text%$" +class color_start_formatter final : public flag_formatter +{ +public: + explicit color_start_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_start = dest.size(); + } +}; + +class color_stop_formatter final : public flag_formatter +{ +public: + explicit color_stop_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_end = dest.size(); + } +}; + +// print source location +template +class source_location_formatter final : public flag_formatter +{ +public: + explicit source_location_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + size_t text_size; + if (padinfo_.enabled()) + { + // calc text size for padding based on "filename:line" + text_size = std::char_traits::length(msg.source.filename) + ScopedPadder::count_digits(msg.source.line) + 1; + } + else + { + text_size = 0; + } + + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source filename +template +class source_filename_formatter final : public flag_formatter +{ +public: + explicit source_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + } +}; + +template +class short_filename_formatter final : public flag_formatter +{ +public: + explicit short_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4127) // consider using 'if constexpr' instead +#endif // _MSC_VER + static const char *basename(const char *filename) + { + // if the size is 2 (1 character + null terminator) we can use the more efficient strrchr + // the branch will be elided by optimizations + if (sizeof(os::folder_seps) == 2) + { + const char *rv = std::strrchr(filename, os::folder_seps[0]); + return rv != nullptr ? rv + 1 : filename; + } + else + { + const std::reverse_iterator begin(filename + std::strlen(filename)); + const std::reverse_iterator end(filename); + + const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1); + return it != end ? it.base() : filename; + } + } +#ifdef _MSC_VER +# pragma warning(pop) +#endif // _MSC_VER + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + auto filename = basename(msg.source.filename); + size_t text_size = padinfo_.enabled() ? std::char_traits::length(filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(filename, dest); + } +}; + +template +class source_linenum_formatter final : public flag_formatter +{ +public: + explicit source_linenum_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + auto field_size = ScopedPadder::count_digits(msg.source.line); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source funcname +template +class source_funcname_formatter final : public flag_formatter +{ +public: + explicit source_funcname_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.funcname) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.funcname, dest); + } +}; + +// print elapsed time since last message +template +class elapsed_formatter final : public flag_formatter +{ +public: + using DurationUnits = Units; + + explicit elapsed_formatter(padding_info padinfo) + : flag_formatter(padinfo) + , last_message_time_(log_clock::now()) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta_units = std::chrono::duration_cast(delta); + last_message_time_ = msg.time; + auto delta_count = static_cast(delta_units.count()); + auto n_digits = static_cast(ScopedPadder::count_digits(delta_count)); + ScopedPadder p(n_digits, padinfo_, dest); + fmt_helper::append_int(delta_count, dest); + } + +private: + log_clock::time_point last_message_time_; +}; + +// Full info formatter +// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v +class full_formatter final : public flag_formatter +{ +public: + explicit full_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + using std::chrono::duration_cast; + using std::chrono::milliseconds; + using std::chrono::seconds; + + // cache the date/time part for the next second. + auto duration = msg.time.time_since_epoch(); + auto secs = duration_cast(duration); + + if (cache_timestamp_ != secs || cached_datetime_.size() == 0) + { + cached_datetime_.clear(); + cached_datetime_.push_back('['); + fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mday, cached_datetime_); + cached_datetime_.push_back(' '); + + fmt_helper::pad2(tm_time.tm_hour, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_min, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_sec, cached_datetime_); + cached_datetime_.push_back('.'); + + cache_timestamp_ = secs; + } + dest.append(cached_datetime_.begin(), cached_datetime_.end()); + + auto millis = fmt_helper::time_fraction(msg.time); + fmt_helper::pad3(static_cast(millis.count()), dest); + dest.push_back(']'); + dest.push_back(' '); + + // append logger name if exists + if (msg.logger_name.size() > 0) + { + dest.push_back('['); + fmt_helper::append_string_view(msg.logger_name, dest); + dest.push_back(']'); + dest.push_back(' '); + } + + dest.push_back('['); + // wrap the level name with color + msg.color_range_start = dest.size(); + // fmt_helper::append_string_view(level::to_c_str(msg.level), dest); + fmt_helper::append_string_view(level::to_string_view(msg.level), dest); + msg.color_range_end = dest.size(); + dest.push_back(']'); + dest.push_back(' '); + + // add source location if present + if (!msg.source.empty()) + { + dest.push_back('['); + const char *filename = details::short_filename_formatter::basename(msg.source.filename); + fmt_helper::append_string_view(filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + dest.push_back(']'); + dest.push_back(' '); + } + // fmt_helper::append_string_view(msg.msg(), dest); + fmt_helper::append_string_view(msg.payload, dest); + } + +private: + std::chrono::seconds cache_timestamp_{0}; + memory_buf_t cached_datetime_; +}; + +} // namespace details + +SPDLOG_INLINE pattern_formatter::pattern_formatter( + std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags) + : pattern_(std::move(pattern)) + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(false) + , last_log_secs_(0) + , custom_handlers_(std::move(custom_user_flags)) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + compile_pattern_(pattern_); +} + +// use by default full formatter for if pattern is not given +SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + : pattern_("%+") + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(true) + , last_log_secs_(0) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + formatters_.push_back(details::make_unique(details::padding_info{})); +} + +SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const +{ + custom_flags cloned_custom_formatters; + for (auto &it : custom_handlers_) + { + cloned_custom_formatters[it.first] = it.second->clone(); + } + auto cloned = details::make_unique(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters)); + cloned->need_localtime(need_localtime_); +#if defined(__GNUC__) && __GNUC__ < 5 + return std::move(cloned); +#else + return cloned; +#endif +} + +SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest) +{ + if (need_localtime_) + { + const auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); + if (secs != last_log_secs_) + { + cached_tm_ = get_time_(msg); + last_log_secs_ = secs; + } + } + + for (auto &f : formatters_) + { + f->format(msg, cached_tm_, dest); + } + // write eol + details::fmt_helper::append_string_view(eol_, dest); +} + +SPDLOG_INLINE void pattern_formatter::set_pattern(std::string pattern) +{ + pattern_ = std::move(pattern); + need_localtime_ = false; + compile_pattern_(pattern_); +} + +SPDLOG_INLINE void pattern_formatter::need_localtime(bool need) +{ + need_localtime_ = need; +} + +SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) +{ + if (pattern_time_type_ == pattern_time_type::local) + { + return details::os::localtime(log_clock::to_time_t(msg.time)); + } + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} + +template +SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) +{ + // process custom flags + auto it = custom_handlers_.find(flag); + if (it != custom_handlers_.end()) + { + auto custom_handler = it->second->clone(); + custom_handler->set_padding_info(padding); + formatters_.push_back(std::move(custom_handler)); + return; + } + + // process built-in flags + switch (flag) + { + case ('+'): // default formatter + formatters_.push_back(details::make_unique(padding)); + need_localtime_ = true; + break; + + case 'n': // logger name + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'l': // level + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'L': // short level + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('t'): // thread id + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('v'): // the message text + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('a'): // weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('A'): // short weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('b'): + case ('h'): // month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('B'): // short month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('c'): // datetime + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('C'): // year 2 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('Y'): // year 4 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('D'): + case ('x'): // datetime MM/DD/YY + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('m'): // month 1-12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('d'): // day of month 1-31 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('H'): // hours 24 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('I'): // hours 12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('M'): // minutes + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('S'): // seconds + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('e'): // milliseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('f'): // microseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('F'): // nanoseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('E'): // seconds since epoch + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('p'): // am/pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('r'): // 12 hour clock 02:55:02 pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('R'): // 24-hour HH:MM time + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('T'): + case ('X'): // ISO 8601 time format (HH:MM:SS) + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('z'): // timezone + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('P'): // pid + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('^'): // color range start + formatters_.push_back(details::make_unique(padding)); + break; + + case ('$'): // color range end + formatters_.push_back(details::make_unique(padding)); + break; + + case ('@'): // source location (filename:filenumber) + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('s'): // short source filename - without directory name + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('g'): // full source filename + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('#'): // source line number + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('!'): // source funcname + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('%'): // % char + formatters_.push_back(details::make_unique('%')); + break; + + case ('u'): // elapsed time since last log message in nanos + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('i'): // elapsed time since last log message in micros + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('o'): // elapsed time since last log message in millis + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('O'): // elapsed time since last log message in seconds + formatters_.push_back(details::make_unique>(padding)); + break; + + default: // Unknown flag appears as is + auto unknown_flag = details::make_unique(); + + if (!padding.truncate_) + { + unknown_flag->add_ch('%'); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + // fix issue #1617 (prev char was '!' and should have been treated as funcname flag instead of truncating flag) + // spdlog::set_pattern("[%10!] %v") => "[ main] some message" + // spdlog::set_pattern("[%3!!] %v") => "[mai] some message" + else + { + padding.truncate_ = false; + formatters_.push_back(details::make_unique>(padding)); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + + break; + } +} + +// Extract given pad spec (e.g. %8X, %=8X, %-8!X, %8!X, %=8!X, %-8!X, %+8!X) +// Advance the given it pass the end of the padding spec found (if any) +// Return padding. +SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) +{ + using details::padding_info; + using details::scoped_padder; + const size_t max_width = 64; + if (it == end) + { + return padding_info{}; + } + + padding_info::pad_side side; + switch (*it) + { + case '-': + side = padding_info::pad_side::right; + ++it; + break; + case '=': + side = padding_info::pad_side::center; + ++it; + break; + default: + side = details::padding_info::pad_side::left; + break; + } + + if (it == end || !std::isdigit(static_cast(*it))) + { + return padding_info{}; // no padding if no digit found here + } + + auto width = static_cast(*it) - '0'; + for (++it; it != end && std::isdigit(static_cast(*it)); ++it) + { + auto digit = static_cast(*it) - '0'; + width = width * 10 + digit; + } + + // search for the optional truncate marker '!' + bool truncate; + if (it != end && *it == '!') + { + truncate = true; + ++it; + } + else + { + truncate = false; + } + return details::padding_info{std::min(width, max_width), side, truncate}; +} + +SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) +{ + auto end = pattern.end(); + std::unique_ptr user_chars; + formatters_.clear(); + for (auto it = pattern.begin(); it != end; ++it) + { + if (*it == '%') + { + if (user_chars) // append user chars found so far + { + formatters_.push_back(std::move(user_chars)); + } + + auto padding = handle_padspec_(++it, end); + + if (it != end) + { + if (padding.enabled()) + { + handle_flag_(*it, padding); + } + else + { + handle_flag_(*it, padding); + } + } + else + { + break; + } + } + else // chars not following the % sign should be displayed as is + { + if (!user_chars) + { + user_chars = details::make_unique(); + } + user_chars->add_ch(*it); + } + } + if (user_chars) // append raw chars found so far + { + formatters_.push_back(std::move(user_chars)); + } +} +} // namespace spdlog diff --git a/spdlog/pattern_formatter.h b/spdlog/pattern_formatter.h new file mode 100644 index 0000000..acf1c53 --- /dev/null +++ b/spdlog/pattern_formatter.h @@ -0,0 +1,128 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { +namespace details { + +// padding information. +struct padding_info +{ + enum class pad_side + { + left, + right, + center + }; + + padding_info() = default; + padding_info(size_t width, padding_info::pad_side side, bool truncate) + : width_(width) + , side_(side) + , truncate_(truncate) + , enabled_(true) + {} + + bool enabled() const + { + return enabled_; + } + size_t width_ = 0; + pad_side side_ = pad_side::left; + bool truncate_ = false; + bool enabled_ = false; +}; + +class SPDLOG_API flag_formatter +{ +public: + explicit flag_formatter(padding_info padinfo) + : padinfo_(padinfo) + {} + flag_formatter() = default; + virtual ~flag_formatter() = default; + virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0; + +protected: + padding_info padinfo_; +}; + +} // namespace details + +class SPDLOG_API custom_flag_formatter : public details::flag_formatter +{ +public: + virtual std::unique_ptr clone() const = 0; + + void set_padding_info(const details::padding_info &padding) + { + flag_formatter::padinfo_ = padding; + } +}; + +class SPDLOG_API pattern_formatter final : public formatter +{ +public: + using custom_flags = std::unordered_map>; + + explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local, + std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags()); + + // use default pattern is not given + explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol); + + pattern_formatter(const pattern_formatter &other) = delete; + pattern_formatter &operator=(const pattern_formatter &other) = delete; + + std::unique_ptr clone() const override; + void format(const details::log_msg &msg, memory_buf_t &dest) override; + + template + pattern_formatter &add_flag(char flag, Args &&... args) + { + custom_handlers_[flag] = details::make_unique(std::forward(args)...); + return *this; + } + void set_pattern(std::string pattern); + void need_localtime(bool need = true); + +private: + std::string pattern_; + std::string eol_; + pattern_time_type pattern_time_type_; + bool need_localtime_; + std::tm cached_tm_; + std::chrono::seconds last_log_secs_; + std::vector> formatters_; + custom_flags custom_handlers_; + + std::tm get_time_(const details::log_msg &msg); + template + void handle_flag_(char flag, details::padding_info padding); + + // Extract given pad spec (e.g. %8X) + // Advance the given it pass the end of the padding spec found (if any) + // Return padding. + static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end); + + void compile_pattern_(const std::string &pattern); +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "pattern_formatter-inl.h" +#endif diff --git a/spdlog/spdlog-inl.h b/spdlog/spdlog-inl.h new file mode 100644 index 0000000..708399c --- /dev/null +++ b/spdlog/spdlog-inl.h @@ -0,0 +1,120 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { + +SPDLOG_INLINE void initialize_logger(std::shared_ptr logger) +{ + details::registry::instance().initialize_logger(std::move(logger)); +} + +SPDLOG_INLINE std::shared_ptr get(const std::string &name) +{ + return details::registry::instance().get(name); +} + +SPDLOG_INLINE void set_formatter(std::unique_ptr formatter) +{ + details::registry::instance().set_formatter(std::move(formatter)); +} + +SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type) +{ + set_formatter(std::unique_ptr(new pattern_formatter(std::move(pattern), time_type))); +} + +SPDLOG_INLINE void enable_backtrace(size_t n_messages) +{ + details::registry::instance().enable_backtrace(n_messages); +} + +SPDLOG_INLINE void disable_backtrace() +{ + details::registry::instance().disable_backtrace(); +} + +SPDLOG_INLINE void dump_backtrace() +{ + default_logger_raw()->dump_backtrace(); +} + +SPDLOG_INLINE level::level_enum get_level() +{ + return default_logger_raw()->level(); +} + +SPDLOG_INLINE bool should_log(level::level_enum log_level) +{ + return default_logger_raw()->should_log(log_level); +} + +SPDLOG_INLINE void set_level(level::level_enum log_level) +{ + details::registry::instance().set_level(log_level); +} + +SPDLOG_INLINE void flush_on(level::level_enum log_level) +{ + details::registry::instance().flush_on(log_level); +} + +SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg)) +{ + details::registry::instance().set_error_handler(handler); +} + +SPDLOG_INLINE void register_logger(std::shared_ptr logger) +{ + details::registry::instance().register_logger(std::move(logger)); +} + +SPDLOG_INLINE void apply_all(const std::function)> &fun) +{ + details::registry::instance().apply_all(fun); +} + +SPDLOG_INLINE void drop(const std::string &name) +{ + details::registry::instance().drop(name); +} + +SPDLOG_INLINE void drop_all() +{ + details::registry::instance().drop_all(); +} + +SPDLOG_INLINE void shutdown() +{ + details::registry::instance().shutdown(); +} + +SPDLOG_INLINE void set_automatic_registration(bool automatic_registration) +{ + details::registry::instance().set_automatic_registration(automatic_registration); +} + +SPDLOG_INLINE std::shared_ptr default_logger() +{ + return details::registry::instance().default_logger(); +} + +SPDLOG_INLINE spdlog::logger *default_logger_raw() +{ + return details::registry::instance().get_default_raw(); +} + +SPDLOG_INLINE void set_default_logger(std::shared_ptr default_logger) +{ + details::registry::instance().set_default_logger(std::move(default_logger)); +} + +} // namespace spdlog diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/spdlog/pattern_formatter-inl.h b/spdlog/pattern_formatter-inl.h new file mode 100644 index 0000000..01afbe6 --- /dev/null +++ b/spdlog/pattern_formatter-inl.h @@ -0,0 +1,1436 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace spdlog { +namespace details { + +/////////////////////////////////////////////////////////////////////// +// name & level pattern appender +/////////////////////////////////////////////////////////////////////// + +class scoped_padder +{ +public: + scoped_padder(size_t wrapped_size, const padding_info &padinfo, memory_buf_t &dest) + : padinfo_(padinfo) + , dest_(dest) + { + remaining_pad_ = static_cast(padinfo.width_) - static_cast(wrapped_size); + if (remaining_pad_ <= 0) + { + return; + } + + if (padinfo_.side_ == padding_info::pad_side::left) + { + pad_it(remaining_pad_); + remaining_pad_ = 0; + } + else if (padinfo_.side_ == padding_info::pad_side::center) + { + auto half_pad = remaining_pad_ / 2; + auto reminder = remaining_pad_ & 1; + pad_it(half_pad); + remaining_pad_ = half_pad + reminder; // for the right side + } + } + + template + static unsigned int count_digits(T n) + { + return fmt_helper::count_digits(n); + } + + ~scoped_padder() + { + if (remaining_pad_ >= 0) + { + pad_it(remaining_pad_); + } + else if (padinfo_.truncate_) + { + long new_size = static_cast(dest_.size()) + remaining_pad_; + dest_.resize(static_cast(new_size)); + } + } + +private: + void pad_it(long count) + { + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); + } + + const padding_info &padinfo_; + memory_buf_t &dest_; + long remaining_pad_; + string_view_t spaces_{" ", 64}; +}; + +struct null_scoped_padder +{ + null_scoped_padder(size_t /*wrapped_size*/, const padding_info & /*padinfo*/, memory_buf_t & /*dest*/) {} + + template + static unsigned int count_digits(T /* number */) + { + return 0; + } +}; + +template +class name_formatter final : public flag_formatter +{ +public: + explicit name_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.logger_name.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.logger_name, dest); + } +}; + +// log level appender +template +class level_formatter final : public flag_formatter +{ +public: + explicit level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const string_view_t &level_name = level::to_string_view(msg.level); + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +// short log level appender +template +class short_level_formatter final : public flag_formatter +{ +public: + explicit short_level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + string_view_t level_name{level::to_short_c_str(msg.level)}; + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +/////////////////////////////////////////////////////////////////////// +// Date time pattern appenders +/////////////////////////////////////////////////////////////////////// + +static const char *ampm(const tm &t) +{ + return t.tm_hour >= 12 ? "PM" : "AM"; +} + +static int to12h(const tm &t) +{ + return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour; +} + +// Abbreviated weekday name +static std::array days{{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}}; + +template +class a_formatter final : public flag_formatter +{ +public: + explicit a_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full weekday name +static std::array full_days{{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}}; + +template +class A_formatter : public flag_formatter +{ +public: + explicit A_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Abbreviated month +static const std::array months{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}}; + +template +class b_formatter final : public flag_formatter +{ +public: + explicit b_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full month name +static const std::array full_months{ + {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}}; + +template +class B_formatter final : public flag_formatter +{ +public: + explicit B_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Date and time representation (Thu Aug 23 15:35:46 2014) +template +class c_formatter final : public flag_formatter +{ +public: + explicit c_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 24; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::append_string_view(days[static_cast(tm_time.tm_wday)], dest); + dest.push_back(' '); + fmt_helper::append_string_view(months[static_cast(tm_time.tm_mon)], dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_mday, dest); + dest.push_back(' '); + // time + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// year - 2 digit +template +class C_formatter final : public flag_formatter +{ +public: + explicit C_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01 +template +class D_formatter final : public flag_formatter +{ +public: + explicit D_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_mday, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// year - 4 digit +template +class Y_formatter final : public flag_formatter +{ +public: + explicit Y_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 4; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// month 1-12 +template +class m_formatter final : public flag_formatter +{ +public: + explicit m_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + } +}; + +// day of month 1-31 +template +class d_formatter final : public flag_formatter +{ +public: + explicit d_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mday, dest); + } +}; + +// hours in 24 format 0-23 +template +class H_formatter final : public flag_formatter +{ +public: + explicit H_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_hour, dest); + } +}; + +// hours in 12 format 1-12 +template +class I_formatter final : public flag_formatter +{ +public: + explicit I_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(to12h(tm_time), dest); + } +}; + +// minutes 0-59 +template +class M_formatter final : public flag_formatter +{ +public: + explicit M_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// seconds 0-59 +template +class S_formatter final : public flag_formatter +{ +public: + explicit S_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// milliseconds +template +class e_formatter final : public flag_formatter +{ +public: + explicit e_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto millis = fmt_helper::time_fraction(msg.time); + const size_t field_size = 3; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad3(static_cast(millis.count()), dest); + } +}; + +// microseconds +template +class f_formatter final : public flag_formatter +{ +public: + explicit f_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto micros = fmt_helper::time_fraction(msg.time); + + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad6(static_cast(micros.count()), dest); + } +}; + +// nanoseconds +template +class F_formatter final : public flag_formatter +{ +public: + explicit F_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto ns = fmt_helper::time_fraction(msg.time); + const size_t field_size = 9; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad9(static_cast(ns.count()), dest); + } +}; + +// seconds since epoch +template +class E_formatter final : public flag_formatter +{ +public: + explicit E_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + auto duration = msg.time.time_since_epoch(); + auto seconds = std::chrono::duration_cast(duration).count(); + fmt_helper::append_int(seconds, dest); + } +}; + +// AM/PM +template +class p_formatter final : public flag_formatter +{ +public: + explicit p_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 12 hour clock 02:55:02 pm +template +class r_formatter final : public flag_formatter +{ +public: + explicit r_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 11; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(to12h(tm_time), dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 24-hour HH:MM time, equivalent to %H:%M +template +class R_formatter final : public flag_formatter +{ +public: + explicit R_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 5; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S +template +class T_formatter final : public flag_formatter +{ +public: + explicit T_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// ISO 8601 offset from UTC in timezone (+-HH:MM) +template +class z_formatter final : public flag_formatter +{ +public: + explicit z_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + z_formatter() = default; + z_formatter(const z_formatter &) = delete; + z_formatter &operator=(const z_formatter &) = delete; + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + + auto total_minutes = get_cached_offset(msg, tm_time); + bool is_negative = total_minutes < 0; + if (is_negative) + { + total_minutes = -total_minutes; + dest.push_back('-'); + } + else + { + dest.push_back('+'); + } + + fmt_helper::pad2(total_minutes / 60, dest); // hours + dest.push_back(':'); + fmt_helper::pad2(total_minutes % 60, dest); // minutes + } + +private: + log_clock::time_point last_update_{std::chrono::seconds(0)}; + int offset_minutes_{0}; + + int get_cached_offset(const log_msg &msg, const std::tm &tm_time) + { + // refresh every 10 seconds + if (msg.time - last_update_ >= std::chrono::seconds(10)) + { + offset_minutes_ = os::utc_minutes_offset(tm_time); + last_update_ = msg.time; + } + return offset_minutes_; + } +}; + +// Thread id +template +class t_formatter final : public flag_formatter +{ +public: + explicit t_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const auto field_size = ScopedPadder::count_digits(msg.thread_id); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.thread_id, dest); + } +}; + +// Current pid +template +class pid_formatter final : public flag_formatter +{ +public: + explicit pid_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + const auto pid = static_cast(details::os::pid()); + auto field_size = ScopedPadder::count_digits(pid); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(pid, dest); + } +}; + +template +class v_formatter final : public flag_formatter +{ +public: + explicit v_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.payload.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.payload, dest); + } +}; + +class ch_formatter final : public flag_formatter +{ +public: + explicit ch_formatter(char ch) + : ch_(ch) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + dest.push_back(ch_); + } + +private: + char ch_; +}; + +// aggregate user chars to display as is +class aggregate_formatter final : public flag_formatter +{ +public: + aggregate_formatter() = default; + + void add_ch(char ch) + { + str_ += ch; + } + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + fmt_helper::append_string_view(str_, dest); + } + +private: + std::string str_; +}; + +// mark the color range. expect it to be in the form of "%^colored text%$" +class color_start_formatter final : public flag_formatter +{ +public: + explicit color_start_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_start = dest.size(); + } +}; + +class color_stop_formatter final : public flag_formatter +{ +public: + explicit color_stop_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_end = dest.size(); + } +}; + +// print source location +template +class source_location_formatter final : public flag_formatter +{ +public: + explicit source_location_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + size_t text_size; + if (padinfo_.enabled()) + { + // calc text size for padding based on "filename:line" + text_size = std::char_traits::length(msg.source.filename) + ScopedPadder::count_digits(msg.source.line) + 1; + } + else + { + text_size = 0; + } + + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source filename +template +class source_filename_formatter final : public flag_formatter +{ +public: + explicit source_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + } +}; + +template +class short_filename_formatter final : public flag_formatter +{ +public: + explicit short_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4127) // consider using 'if constexpr' instead +#endif // _MSC_VER + static const char *basename(const char *filename) + { + // if the size is 2 (1 character + null terminator) we can use the more efficient strrchr + // the branch will be elided by optimizations + if (sizeof(os::folder_seps) == 2) + { + const char *rv = std::strrchr(filename, os::folder_seps[0]); + return rv != nullptr ? rv + 1 : filename; + } + else + { + const std::reverse_iterator begin(filename + std::strlen(filename)); + const std::reverse_iterator end(filename); + + const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1); + return it != end ? it.base() : filename; + } + } +#ifdef _MSC_VER +# pragma warning(pop) +#endif // _MSC_VER + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + auto filename = basename(msg.source.filename); + size_t text_size = padinfo_.enabled() ? std::char_traits::length(filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(filename, dest); + } +}; + +template +class source_linenum_formatter final : public flag_formatter +{ +public: + explicit source_linenum_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + auto field_size = ScopedPadder::count_digits(msg.source.line); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source funcname +template +class source_funcname_formatter final : public flag_formatter +{ +public: + explicit source_funcname_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.funcname) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.funcname, dest); + } +}; + +// print elapsed time since last message +template +class elapsed_formatter final : public flag_formatter +{ +public: + using DurationUnits = Units; + + explicit elapsed_formatter(padding_info padinfo) + : flag_formatter(padinfo) + , last_message_time_(log_clock::now()) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta_units = std::chrono::duration_cast(delta); + last_message_time_ = msg.time; + auto delta_count = static_cast(delta_units.count()); + auto n_digits = static_cast(ScopedPadder::count_digits(delta_count)); + ScopedPadder p(n_digits, padinfo_, dest); + fmt_helper::append_int(delta_count, dest); + } + +private: + log_clock::time_point last_message_time_; +}; + +// Full info formatter +// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v +class full_formatter final : public flag_formatter +{ +public: + explicit full_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + using std::chrono::duration_cast; + using std::chrono::milliseconds; + using std::chrono::seconds; + + // cache the date/time part for the next second. + auto duration = msg.time.time_since_epoch(); + auto secs = duration_cast(duration); + + if (cache_timestamp_ != secs || cached_datetime_.size() == 0) + { + cached_datetime_.clear(); + cached_datetime_.push_back('['); + fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mday, cached_datetime_); + cached_datetime_.push_back(' '); + + fmt_helper::pad2(tm_time.tm_hour, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_min, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_sec, cached_datetime_); + cached_datetime_.push_back('.'); + + cache_timestamp_ = secs; + } + dest.append(cached_datetime_.begin(), cached_datetime_.end()); + + auto millis = fmt_helper::time_fraction(msg.time); + fmt_helper::pad3(static_cast(millis.count()), dest); + dest.push_back(']'); + dest.push_back(' '); + + // append logger name if exists + if (msg.logger_name.size() > 0) + { + dest.push_back('['); + fmt_helper::append_string_view(msg.logger_name, dest); + dest.push_back(']'); + dest.push_back(' '); + } + + dest.push_back('['); + // wrap the level name with color + msg.color_range_start = dest.size(); + // fmt_helper::append_string_view(level::to_c_str(msg.level), dest); + fmt_helper::append_string_view(level::to_string_view(msg.level), dest); + msg.color_range_end = dest.size(); + dest.push_back(']'); + dest.push_back(' '); + + // add source location if present + if (!msg.source.empty()) + { + dest.push_back('['); + const char *filename = details::short_filename_formatter::basename(msg.source.filename); + fmt_helper::append_string_view(filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + dest.push_back(']'); + dest.push_back(' '); + } + // fmt_helper::append_string_view(msg.msg(), dest); + fmt_helper::append_string_view(msg.payload, dest); + } + +private: + std::chrono::seconds cache_timestamp_{0}; + memory_buf_t cached_datetime_; +}; + +} // namespace details + +SPDLOG_INLINE pattern_formatter::pattern_formatter( + std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags) + : pattern_(std::move(pattern)) + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(false) + , last_log_secs_(0) + , custom_handlers_(std::move(custom_user_flags)) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + compile_pattern_(pattern_); +} + +// use by default full formatter for if pattern is not given +SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + : pattern_("%+") + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(true) + , last_log_secs_(0) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + formatters_.push_back(details::make_unique(details::padding_info{})); +} + +SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const +{ + custom_flags cloned_custom_formatters; + for (auto &it : custom_handlers_) + { + cloned_custom_formatters[it.first] = it.second->clone(); + } + auto cloned = details::make_unique(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters)); + cloned->need_localtime(need_localtime_); +#if defined(__GNUC__) && __GNUC__ < 5 + return std::move(cloned); +#else + return cloned; +#endif +} + +SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest) +{ + if (need_localtime_) + { + const auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); + if (secs != last_log_secs_) + { + cached_tm_ = get_time_(msg); + last_log_secs_ = secs; + } + } + + for (auto &f : formatters_) + { + f->format(msg, cached_tm_, dest); + } + // write eol + details::fmt_helper::append_string_view(eol_, dest); +} + +SPDLOG_INLINE void pattern_formatter::set_pattern(std::string pattern) +{ + pattern_ = std::move(pattern); + need_localtime_ = false; + compile_pattern_(pattern_); +} + +SPDLOG_INLINE void pattern_formatter::need_localtime(bool need) +{ + need_localtime_ = need; +} + +SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) +{ + if (pattern_time_type_ == pattern_time_type::local) + { + return details::os::localtime(log_clock::to_time_t(msg.time)); + } + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} + +template +SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) +{ + // process custom flags + auto it = custom_handlers_.find(flag); + if (it != custom_handlers_.end()) + { + auto custom_handler = it->second->clone(); + custom_handler->set_padding_info(padding); + formatters_.push_back(std::move(custom_handler)); + return; + } + + // process built-in flags + switch (flag) + { + case ('+'): // default formatter + formatters_.push_back(details::make_unique(padding)); + need_localtime_ = true; + break; + + case 'n': // logger name + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'l': // level + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'L': // short level + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('t'): // thread id + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('v'): // the message text + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('a'): // weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('A'): // short weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('b'): + case ('h'): // month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('B'): // short month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('c'): // datetime + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('C'): // year 2 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('Y'): // year 4 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('D'): + case ('x'): // datetime MM/DD/YY + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('m'): // month 1-12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('d'): // day of month 1-31 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('H'): // hours 24 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('I'): // hours 12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('M'): // minutes + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('S'): // seconds + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('e'): // milliseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('f'): // microseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('F'): // nanoseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('E'): // seconds since epoch + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('p'): // am/pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('r'): // 12 hour clock 02:55:02 pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('R'): // 24-hour HH:MM time + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('T'): + case ('X'): // ISO 8601 time format (HH:MM:SS) + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('z'): // timezone + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('P'): // pid + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('^'): // color range start + formatters_.push_back(details::make_unique(padding)); + break; + + case ('$'): // color range end + formatters_.push_back(details::make_unique(padding)); + break; + + case ('@'): // source location (filename:filenumber) + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('s'): // short source filename - without directory name + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('g'): // full source filename + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('#'): // source line number + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('!'): // source funcname + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('%'): // % char + formatters_.push_back(details::make_unique('%')); + break; + + case ('u'): // elapsed time since last log message in nanos + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('i'): // elapsed time since last log message in micros + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('o'): // elapsed time since last log message in millis + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('O'): // elapsed time since last log message in seconds + formatters_.push_back(details::make_unique>(padding)); + break; + + default: // Unknown flag appears as is + auto unknown_flag = details::make_unique(); + + if (!padding.truncate_) + { + unknown_flag->add_ch('%'); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + // fix issue #1617 (prev char was '!' and should have been treated as funcname flag instead of truncating flag) + // spdlog::set_pattern("[%10!] %v") => "[ main] some message" + // spdlog::set_pattern("[%3!!] %v") => "[mai] some message" + else + { + padding.truncate_ = false; + formatters_.push_back(details::make_unique>(padding)); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + + break; + } +} + +// Extract given pad spec (e.g. %8X, %=8X, %-8!X, %8!X, %=8!X, %-8!X, %+8!X) +// Advance the given it pass the end of the padding spec found (if any) +// Return padding. +SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) +{ + using details::padding_info; + using details::scoped_padder; + const size_t max_width = 64; + if (it == end) + { + return padding_info{}; + } + + padding_info::pad_side side; + switch (*it) + { + case '-': + side = padding_info::pad_side::right; + ++it; + break; + case '=': + side = padding_info::pad_side::center; + ++it; + break; + default: + side = details::padding_info::pad_side::left; + break; + } + + if (it == end || !std::isdigit(static_cast(*it))) + { + return padding_info{}; // no padding if no digit found here + } + + auto width = static_cast(*it) - '0'; + for (++it; it != end && std::isdigit(static_cast(*it)); ++it) + { + auto digit = static_cast(*it) - '0'; + width = width * 10 + digit; + } + + // search for the optional truncate marker '!' + bool truncate; + if (it != end && *it == '!') + { + truncate = true; + ++it; + } + else + { + truncate = false; + } + return details::padding_info{std::min(width, max_width), side, truncate}; +} + +SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) +{ + auto end = pattern.end(); + std::unique_ptr user_chars; + formatters_.clear(); + for (auto it = pattern.begin(); it != end; ++it) + { + if (*it == '%') + { + if (user_chars) // append user chars found so far + { + formatters_.push_back(std::move(user_chars)); + } + + auto padding = handle_padspec_(++it, end); + + if (it != end) + { + if (padding.enabled()) + { + handle_flag_(*it, padding); + } + else + { + handle_flag_(*it, padding); + } + } + else + { + break; + } + } + else // chars not following the % sign should be displayed as is + { + if (!user_chars) + { + user_chars = details::make_unique(); + } + user_chars->add_ch(*it); + } + } + if (user_chars) // append raw chars found so far + { + formatters_.push_back(std::move(user_chars)); + } +} +} // namespace spdlog diff --git a/spdlog/pattern_formatter.h b/spdlog/pattern_formatter.h new file mode 100644 index 0000000..acf1c53 --- /dev/null +++ b/spdlog/pattern_formatter.h @@ -0,0 +1,128 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { +namespace details { + +// padding information. +struct padding_info +{ + enum class pad_side + { + left, + right, + center + }; + + padding_info() = default; + padding_info(size_t width, padding_info::pad_side side, bool truncate) + : width_(width) + , side_(side) + , truncate_(truncate) + , enabled_(true) + {} + + bool enabled() const + { + return enabled_; + } + size_t width_ = 0; + pad_side side_ = pad_side::left; + bool truncate_ = false; + bool enabled_ = false; +}; + +class SPDLOG_API flag_formatter +{ +public: + explicit flag_formatter(padding_info padinfo) + : padinfo_(padinfo) + {} + flag_formatter() = default; + virtual ~flag_formatter() = default; + virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0; + +protected: + padding_info padinfo_; +}; + +} // namespace details + +class SPDLOG_API custom_flag_formatter : public details::flag_formatter +{ +public: + virtual std::unique_ptr clone() const = 0; + + void set_padding_info(const details::padding_info &padding) + { + flag_formatter::padinfo_ = padding; + } +}; + +class SPDLOG_API pattern_formatter final : public formatter +{ +public: + using custom_flags = std::unordered_map>; + + explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local, + std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags()); + + // use default pattern is not given + explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol); + + pattern_formatter(const pattern_formatter &other) = delete; + pattern_formatter &operator=(const pattern_formatter &other) = delete; + + std::unique_ptr clone() const override; + void format(const details::log_msg &msg, memory_buf_t &dest) override; + + template + pattern_formatter &add_flag(char flag, Args &&... args) + { + custom_handlers_[flag] = details::make_unique(std::forward(args)...); + return *this; + } + void set_pattern(std::string pattern); + void need_localtime(bool need = true); + +private: + std::string pattern_; + std::string eol_; + pattern_time_type pattern_time_type_; + bool need_localtime_; + std::tm cached_tm_; + std::chrono::seconds last_log_secs_; + std::vector> formatters_; + custom_flags custom_handlers_; + + std::tm get_time_(const details::log_msg &msg); + template + void handle_flag_(char flag, details::padding_info padding); + + // Extract given pad spec (e.g. %8X) + // Advance the given it pass the end of the padding spec found (if any) + // Return padding. + static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end); + + void compile_pattern_(const std::string &pattern); +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "pattern_formatter-inl.h" +#endif diff --git a/spdlog/spdlog-inl.h b/spdlog/spdlog-inl.h new file mode 100644 index 0000000..708399c --- /dev/null +++ b/spdlog/spdlog-inl.h @@ -0,0 +1,120 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { + +SPDLOG_INLINE void initialize_logger(std::shared_ptr logger) +{ + details::registry::instance().initialize_logger(std::move(logger)); +} + +SPDLOG_INLINE std::shared_ptr get(const std::string &name) +{ + return details::registry::instance().get(name); +} + +SPDLOG_INLINE void set_formatter(std::unique_ptr formatter) +{ + details::registry::instance().set_formatter(std::move(formatter)); +} + +SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type) +{ + set_formatter(std::unique_ptr(new pattern_formatter(std::move(pattern), time_type))); +} + +SPDLOG_INLINE void enable_backtrace(size_t n_messages) +{ + details::registry::instance().enable_backtrace(n_messages); +} + +SPDLOG_INLINE void disable_backtrace() +{ + details::registry::instance().disable_backtrace(); +} + +SPDLOG_INLINE void dump_backtrace() +{ + default_logger_raw()->dump_backtrace(); +} + +SPDLOG_INLINE level::level_enum get_level() +{ + return default_logger_raw()->level(); +} + +SPDLOG_INLINE bool should_log(level::level_enum log_level) +{ + return default_logger_raw()->should_log(log_level); +} + +SPDLOG_INLINE void set_level(level::level_enum log_level) +{ + details::registry::instance().set_level(log_level); +} + +SPDLOG_INLINE void flush_on(level::level_enum log_level) +{ + details::registry::instance().flush_on(log_level); +} + +SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg)) +{ + details::registry::instance().set_error_handler(handler); +} + +SPDLOG_INLINE void register_logger(std::shared_ptr logger) +{ + details::registry::instance().register_logger(std::move(logger)); +} + +SPDLOG_INLINE void apply_all(const std::function)> &fun) +{ + details::registry::instance().apply_all(fun); +} + +SPDLOG_INLINE void drop(const std::string &name) +{ + details::registry::instance().drop(name); +} + +SPDLOG_INLINE void drop_all() +{ + details::registry::instance().drop_all(); +} + +SPDLOG_INLINE void shutdown() +{ + details::registry::instance().shutdown(); +} + +SPDLOG_INLINE void set_automatic_registration(bool automatic_registration) +{ + details::registry::instance().set_automatic_registration(automatic_registration); +} + +SPDLOG_INLINE std::shared_ptr default_logger() +{ + return details::registry::instance().default_logger(); +} + +SPDLOG_INLINE spdlog::logger *default_logger_raw() +{ + return details::registry::instance().get_default_raw(); +} + +SPDLOG_INLINE void set_default_logger(std::shared_ptr default_logger) +{ + details::registry::instance().set_default_logger(std::move(default_logger)); +} + +} // namespace spdlog diff --git a/spdlog/spdlog.h b/spdlog/spdlog.h new file mode 100644 index 0000000..ee83e8d --- /dev/null +++ b/spdlog/spdlog.h @@ -0,0 +1,354 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +// spdlog main header file. +// see example.cpp for usage example + +#ifndef SPDLOG_H +#define SPDLOG_H + +#pragma once + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +namespace spdlog { + +using default_factory = synchronous_factory; + +// Create and register a logger with a templated sink type +// The logger's level, formatter and flush level will be set according the +// global settings. +// +// Example: +// spdlog::create("logger_name", "dailylog_filename", 11, 59); +template +inline std::shared_ptr create(std::string logger_name, SinkArgs &&... sink_args) +{ + return default_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +// Initialize and register a logger, +// formatter and flush level will be set according the global settings. +// +// Useful for initializing manually created loggers with the global settings. +// +// Example: +// auto mylogger = std::make_shared("mylogger", ...); +// spdlog::initialize_logger(mylogger); +SPDLOG_API void initialize_logger(std::shared_ptr logger); + +// Return an existing logger or nullptr if a logger with such name doesn't +// exist. +// example: spdlog::get("my_logger")->info("hello {}", "world"); +SPDLOG_API std::shared_ptr get(const std::string &name); + +// Set global formatter. Each sink in each logger will get a clone of this object +SPDLOG_API void set_formatter(std::unique_ptr formatter); + +// Set global format string. +// example: spdlog::set_pattern("%Y-%m-%d %H:%M:%S.%e %l : %v"); +SPDLOG_API void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + +// enable global backtrace support +SPDLOG_API void enable_backtrace(size_t n_messages); + +// disable global backtrace support +SPDLOG_API void disable_backtrace(); + +// call dump backtrace on default logger +SPDLOG_API void dump_backtrace(); + +// Get global logging level +SPDLOG_API level::level_enum get_level(); + +// Set global logging level +SPDLOG_API void set_level(level::level_enum log_level); + +// Determine whether the default logger should log messages with a certain level +SPDLOG_API bool should_log(level::level_enum lvl); + +// Set global flush level +SPDLOG_API void flush_on(level::level_enum log_level); + +// Start/Restart a periodic flusher thread +// Warning: Use only if all your loggers are thread safe! +template +inline void flush_every(std::chrono::duration interval) +{ + details::registry::instance().flush_every(interval); +} + +// Set global error handler +SPDLOG_API void set_error_handler(void (*handler)(const std::string &msg)); + +// Register the given logger with the given name +SPDLOG_API void register_logger(std::shared_ptr logger); + +// Apply a user defined function on all registered loggers +// Example: +// spdlog::apply_all([&](std::shared_ptr l) {l->flush();}); +SPDLOG_API void apply_all(const std::function)> &fun); + +// Drop the reference to the given logger +SPDLOG_API void drop(const std::string &name); + +// Drop all references from the registry +SPDLOG_API void drop_all(); + +// stop any running threads started by spdlog and clean registry loggers +SPDLOG_API void shutdown(); + +// Automatic registration of loggers when using spdlog::create() or spdlog::create_async +SPDLOG_API void set_automatic_registration(bool automatic_registration); + +// API for using default logger (stdout_color_mt), +// e.g: spdlog::info("Message {}", 1); +// +// The default logger object can be accessed using the spdlog::default_logger(): +// For example, to add another sink to it: +// spdlog::default_logger()->sinks().push_back(some_sink); +// +// The default logger can replaced using spdlog::set_default_logger(new_logger). +// For example, to replace it with a file logger. +// +// IMPORTANT: +// The default API is thread safe (for _mt loggers), but: +// set_default_logger() *should not* be used concurrently with the default API. +// e.g do not call set_default_logger() from one thread while calling spdlog::info() from another. + +SPDLOG_API std::shared_ptr default_logger(); + +SPDLOG_API spdlog::logger *default_logger_raw(); + +SPDLOG_API void set_default_logger(std::shared_ptr default_logger); + +template +inline void log(source_loc source, level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} + +template +inline void log(source_loc source, level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(source, lvl, msg); +} + +template +inline void log(level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(lvl, msg); +} + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +template +inline void log(source_loc source, level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} +#endif + +template +inline void trace(const T &msg) +{ + default_logger_raw()->trace(msg); +} + +template +inline void debug(const T &msg) +{ + default_logger_raw()->debug(msg); +} + +template +inline void info(const T &msg) +{ + default_logger_raw()->info(msg); +} + +template +inline void warn(const T &msg) +{ + default_logger_raw()->warn(msg); +} + +template +inline void error(const T &msg) +{ + default_logger_raw()->error(msg); +} + +template +inline void critical(const T &msg) +{ + default_logger_raw()->critical(msg); +} + +} // namespace spdlog + +// +// enable/disable log calls at compile time according to global level. +// +// define SPDLOG_ACTIVE_LEVEL to one of those (before including spdlog.h): +// SPDLOG_LEVEL_TRACE, +// SPDLOG_LEVEL_DEBUG, +// SPDLOG_LEVEL_INFO, +// SPDLOG_LEVEL_WARN, +// SPDLOG_LEVEL_ERROR, +// SPDLOG_LEVEL_CRITICAL, +// SPDLOG_LEVEL_OFF +// + +#ifndef SPDLOG_NO_SOURCE_LOC +# define SPDLOG_LOGGER_CALL(logger, level, ...) \ + (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CALL(logger, level, ...) (logger)->log(spdlog::source_loc{}, level, __VA_ARGS__) +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE +# define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__) +# define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_TRACE(logger, ...) (void)0 +# define SPDLOG_TRACE(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_DEBUG +# define SPDLOG_LOGGER_DEBUG(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::debug, __VA_ARGS__) +# define SPDLOG_DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_DEBUG(logger, ...) (void)0 +# define SPDLOG_DEBUG(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_INFO +# define SPDLOG_LOGGER_INFO(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::info, __VA_ARGS__) +# define SPDLOG_INFO(...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_INFO(logger, ...) (void)0 +# define SPDLOG_INFO(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_WARN +# define SPDLOG_LOGGER_WARN(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::warn, __VA_ARGS__) +# define SPDLOG_WARN(...) SPDLOG_LOGGER_WARN(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_WARN(logger, ...) (void)0 +# define SPDLOG_WARN(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_ERROR +# define SPDLOG_LOGGER_ERROR(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::err, __VA_ARGS__) +# define SPDLOG_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_ERROR(logger, ...) (void)0 +# define SPDLOG_ERROR(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_CRITICAL +# define SPDLOG_LOGGER_CRITICAL(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::critical, __VA_ARGS__) +# define SPDLOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CRITICAL(logger, ...) (void)0 +# define SPDLOG_CRITICAL(...) (void)0 +#endif + +#ifdef SPDLOG_HEADER_ONLY +# include "spdlog-inl.h" +#endif + +#endif // SPDLOG_H diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/spdlog/pattern_formatter-inl.h b/spdlog/pattern_formatter-inl.h new file mode 100644 index 0000000..01afbe6 --- /dev/null +++ b/spdlog/pattern_formatter-inl.h @@ -0,0 +1,1436 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace spdlog { +namespace details { + +/////////////////////////////////////////////////////////////////////// +// name & level pattern appender +/////////////////////////////////////////////////////////////////////// + +class scoped_padder +{ +public: + scoped_padder(size_t wrapped_size, const padding_info &padinfo, memory_buf_t &dest) + : padinfo_(padinfo) + , dest_(dest) + { + remaining_pad_ = static_cast(padinfo.width_) - static_cast(wrapped_size); + if (remaining_pad_ <= 0) + { + return; + } + + if (padinfo_.side_ == padding_info::pad_side::left) + { + pad_it(remaining_pad_); + remaining_pad_ = 0; + } + else if (padinfo_.side_ == padding_info::pad_side::center) + { + auto half_pad = remaining_pad_ / 2; + auto reminder = remaining_pad_ & 1; + pad_it(half_pad); + remaining_pad_ = half_pad + reminder; // for the right side + } + } + + template + static unsigned int count_digits(T n) + { + return fmt_helper::count_digits(n); + } + + ~scoped_padder() + { + if (remaining_pad_ >= 0) + { + pad_it(remaining_pad_); + } + else if (padinfo_.truncate_) + { + long new_size = static_cast(dest_.size()) + remaining_pad_; + dest_.resize(static_cast(new_size)); + } + } + +private: + void pad_it(long count) + { + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); + } + + const padding_info &padinfo_; + memory_buf_t &dest_; + long remaining_pad_; + string_view_t spaces_{" ", 64}; +}; + +struct null_scoped_padder +{ + null_scoped_padder(size_t /*wrapped_size*/, const padding_info & /*padinfo*/, memory_buf_t & /*dest*/) {} + + template + static unsigned int count_digits(T /* number */) + { + return 0; + } +}; + +template +class name_formatter final : public flag_formatter +{ +public: + explicit name_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.logger_name.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.logger_name, dest); + } +}; + +// log level appender +template +class level_formatter final : public flag_formatter +{ +public: + explicit level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const string_view_t &level_name = level::to_string_view(msg.level); + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +// short log level appender +template +class short_level_formatter final : public flag_formatter +{ +public: + explicit short_level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + string_view_t level_name{level::to_short_c_str(msg.level)}; + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +/////////////////////////////////////////////////////////////////////// +// Date time pattern appenders +/////////////////////////////////////////////////////////////////////// + +static const char *ampm(const tm &t) +{ + return t.tm_hour >= 12 ? "PM" : "AM"; +} + +static int to12h(const tm &t) +{ + return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour; +} + +// Abbreviated weekday name +static std::array days{{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}}; + +template +class a_formatter final : public flag_formatter +{ +public: + explicit a_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full weekday name +static std::array full_days{{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}}; + +template +class A_formatter : public flag_formatter +{ +public: + explicit A_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Abbreviated month +static const std::array months{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}}; + +template +class b_formatter final : public flag_formatter +{ +public: + explicit b_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full month name +static const std::array full_months{ + {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}}; + +template +class B_formatter final : public flag_formatter +{ +public: + explicit B_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Date and time representation (Thu Aug 23 15:35:46 2014) +template +class c_formatter final : public flag_formatter +{ +public: + explicit c_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 24; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::append_string_view(days[static_cast(tm_time.tm_wday)], dest); + dest.push_back(' '); + fmt_helper::append_string_view(months[static_cast(tm_time.tm_mon)], dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_mday, dest); + dest.push_back(' '); + // time + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// year - 2 digit +template +class C_formatter final : public flag_formatter +{ +public: + explicit C_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01 +template +class D_formatter final : public flag_formatter +{ +public: + explicit D_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_mday, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// year - 4 digit +template +class Y_formatter final : public flag_formatter +{ +public: + explicit Y_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 4; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// month 1-12 +template +class m_formatter final : public flag_formatter +{ +public: + explicit m_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + } +}; + +// day of month 1-31 +template +class d_formatter final : public flag_formatter +{ +public: + explicit d_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mday, dest); + } +}; + +// hours in 24 format 0-23 +template +class H_formatter final : public flag_formatter +{ +public: + explicit H_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_hour, dest); + } +}; + +// hours in 12 format 1-12 +template +class I_formatter final : public flag_formatter +{ +public: + explicit I_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(to12h(tm_time), dest); + } +}; + +// minutes 0-59 +template +class M_formatter final : public flag_formatter +{ +public: + explicit M_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// seconds 0-59 +template +class S_formatter final : public flag_formatter +{ +public: + explicit S_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// milliseconds +template +class e_formatter final : public flag_formatter +{ +public: + explicit e_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto millis = fmt_helper::time_fraction(msg.time); + const size_t field_size = 3; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad3(static_cast(millis.count()), dest); + } +}; + +// microseconds +template +class f_formatter final : public flag_formatter +{ +public: + explicit f_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto micros = fmt_helper::time_fraction(msg.time); + + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad6(static_cast(micros.count()), dest); + } +}; + +// nanoseconds +template +class F_formatter final : public flag_formatter +{ +public: + explicit F_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto ns = fmt_helper::time_fraction(msg.time); + const size_t field_size = 9; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad9(static_cast(ns.count()), dest); + } +}; + +// seconds since epoch +template +class E_formatter final : public flag_formatter +{ +public: + explicit E_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + auto duration = msg.time.time_since_epoch(); + auto seconds = std::chrono::duration_cast(duration).count(); + fmt_helper::append_int(seconds, dest); + } +}; + +// AM/PM +template +class p_formatter final : public flag_formatter +{ +public: + explicit p_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 12 hour clock 02:55:02 pm +template +class r_formatter final : public flag_formatter +{ +public: + explicit r_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 11; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(to12h(tm_time), dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 24-hour HH:MM time, equivalent to %H:%M +template +class R_formatter final : public flag_formatter +{ +public: + explicit R_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 5; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S +template +class T_formatter final : public flag_formatter +{ +public: + explicit T_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// ISO 8601 offset from UTC in timezone (+-HH:MM) +template +class z_formatter final : public flag_formatter +{ +public: + explicit z_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + z_formatter() = default; + z_formatter(const z_formatter &) = delete; + z_formatter &operator=(const z_formatter &) = delete; + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + + auto total_minutes = get_cached_offset(msg, tm_time); + bool is_negative = total_minutes < 0; + if (is_negative) + { + total_minutes = -total_minutes; + dest.push_back('-'); + } + else + { + dest.push_back('+'); + } + + fmt_helper::pad2(total_minutes / 60, dest); // hours + dest.push_back(':'); + fmt_helper::pad2(total_minutes % 60, dest); // minutes + } + +private: + log_clock::time_point last_update_{std::chrono::seconds(0)}; + int offset_minutes_{0}; + + int get_cached_offset(const log_msg &msg, const std::tm &tm_time) + { + // refresh every 10 seconds + if (msg.time - last_update_ >= std::chrono::seconds(10)) + { + offset_minutes_ = os::utc_minutes_offset(tm_time); + last_update_ = msg.time; + } + return offset_minutes_; + } +}; + +// Thread id +template +class t_formatter final : public flag_formatter +{ +public: + explicit t_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const auto field_size = ScopedPadder::count_digits(msg.thread_id); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.thread_id, dest); + } +}; + +// Current pid +template +class pid_formatter final : public flag_formatter +{ +public: + explicit pid_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + const auto pid = static_cast(details::os::pid()); + auto field_size = ScopedPadder::count_digits(pid); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(pid, dest); + } +}; + +template +class v_formatter final : public flag_formatter +{ +public: + explicit v_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.payload.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.payload, dest); + } +}; + +class ch_formatter final : public flag_formatter +{ +public: + explicit ch_formatter(char ch) + : ch_(ch) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + dest.push_back(ch_); + } + +private: + char ch_; +}; + +// aggregate user chars to display as is +class aggregate_formatter final : public flag_formatter +{ +public: + aggregate_formatter() = default; + + void add_ch(char ch) + { + str_ += ch; + } + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + fmt_helper::append_string_view(str_, dest); + } + +private: + std::string str_; +}; + +// mark the color range. expect it to be in the form of "%^colored text%$" +class color_start_formatter final : public flag_formatter +{ +public: + explicit color_start_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_start = dest.size(); + } +}; + +class color_stop_formatter final : public flag_formatter +{ +public: + explicit color_stop_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_end = dest.size(); + } +}; + +// print source location +template +class source_location_formatter final : public flag_formatter +{ +public: + explicit source_location_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + size_t text_size; + if (padinfo_.enabled()) + { + // calc text size for padding based on "filename:line" + text_size = std::char_traits::length(msg.source.filename) + ScopedPadder::count_digits(msg.source.line) + 1; + } + else + { + text_size = 0; + } + + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source filename +template +class source_filename_formatter final : public flag_formatter +{ +public: + explicit source_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + } +}; + +template +class short_filename_formatter final : public flag_formatter +{ +public: + explicit short_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4127) // consider using 'if constexpr' instead +#endif // _MSC_VER + static const char *basename(const char *filename) + { + // if the size is 2 (1 character + null terminator) we can use the more efficient strrchr + // the branch will be elided by optimizations + if (sizeof(os::folder_seps) == 2) + { + const char *rv = std::strrchr(filename, os::folder_seps[0]); + return rv != nullptr ? rv + 1 : filename; + } + else + { + const std::reverse_iterator begin(filename + std::strlen(filename)); + const std::reverse_iterator end(filename); + + const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1); + return it != end ? it.base() : filename; + } + } +#ifdef _MSC_VER +# pragma warning(pop) +#endif // _MSC_VER + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + auto filename = basename(msg.source.filename); + size_t text_size = padinfo_.enabled() ? std::char_traits::length(filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(filename, dest); + } +}; + +template +class source_linenum_formatter final : public flag_formatter +{ +public: + explicit source_linenum_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + auto field_size = ScopedPadder::count_digits(msg.source.line); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source funcname +template +class source_funcname_formatter final : public flag_formatter +{ +public: + explicit source_funcname_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.funcname) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.funcname, dest); + } +}; + +// print elapsed time since last message +template +class elapsed_formatter final : public flag_formatter +{ +public: + using DurationUnits = Units; + + explicit elapsed_formatter(padding_info padinfo) + : flag_formatter(padinfo) + , last_message_time_(log_clock::now()) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta_units = std::chrono::duration_cast(delta); + last_message_time_ = msg.time; + auto delta_count = static_cast(delta_units.count()); + auto n_digits = static_cast(ScopedPadder::count_digits(delta_count)); + ScopedPadder p(n_digits, padinfo_, dest); + fmt_helper::append_int(delta_count, dest); + } + +private: + log_clock::time_point last_message_time_; +}; + +// Full info formatter +// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v +class full_formatter final : public flag_formatter +{ +public: + explicit full_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + using std::chrono::duration_cast; + using std::chrono::milliseconds; + using std::chrono::seconds; + + // cache the date/time part for the next second. + auto duration = msg.time.time_since_epoch(); + auto secs = duration_cast(duration); + + if (cache_timestamp_ != secs || cached_datetime_.size() == 0) + { + cached_datetime_.clear(); + cached_datetime_.push_back('['); + fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mday, cached_datetime_); + cached_datetime_.push_back(' '); + + fmt_helper::pad2(tm_time.tm_hour, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_min, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_sec, cached_datetime_); + cached_datetime_.push_back('.'); + + cache_timestamp_ = secs; + } + dest.append(cached_datetime_.begin(), cached_datetime_.end()); + + auto millis = fmt_helper::time_fraction(msg.time); + fmt_helper::pad3(static_cast(millis.count()), dest); + dest.push_back(']'); + dest.push_back(' '); + + // append logger name if exists + if (msg.logger_name.size() > 0) + { + dest.push_back('['); + fmt_helper::append_string_view(msg.logger_name, dest); + dest.push_back(']'); + dest.push_back(' '); + } + + dest.push_back('['); + // wrap the level name with color + msg.color_range_start = dest.size(); + // fmt_helper::append_string_view(level::to_c_str(msg.level), dest); + fmt_helper::append_string_view(level::to_string_view(msg.level), dest); + msg.color_range_end = dest.size(); + dest.push_back(']'); + dest.push_back(' '); + + // add source location if present + if (!msg.source.empty()) + { + dest.push_back('['); + const char *filename = details::short_filename_formatter::basename(msg.source.filename); + fmt_helper::append_string_view(filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + dest.push_back(']'); + dest.push_back(' '); + } + // fmt_helper::append_string_view(msg.msg(), dest); + fmt_helper::append_string_view(msg.payload, dest); + } + +private: + std::chrono::seconds cache_timestamp_{0}; + memory_buf_t cached_datetime_; +}; + +} // namespace details + +SPDLOG_INLINE pattern_formatter::pattern_formatter( + std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags) + : pattern_(std::move(pattern)) + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(false) + , last_log_secs_(0) + , custom_handlers_(std::move(custom_user_flags)) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + compile_pattern_(pattern_); +} + +// use by default full formatter for if pattern is not given +SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + : pattern_("%+") + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(true) + , last_log_secs_(0) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + formatters_.push_back(details::make_unique(details::padding_info{})); +} + +SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const +{ + custom_flags cloned_custom_formatters; + for (auto &it : custom_handlers_) + { + cloned_custom_formatters[it.first] = it.second->clone(); + } + auto cloned = details::make_unique(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters)); + cloned->need_localtime(need_localtime_); +#if defined(__GNUC__) && __GNUC__ < 5 + return std::move(cloned); +#else + return cloned; +#endif +} + +SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest) +{ + if (need_localtime_) + { + const auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); + if (secs != last_log_secs_) + { + cached_tm_ = get_time_(msg); + last_log_secs_ = secs; + } + } + + for (auto &f : formatters_) + { + f->format(msg, cached_tm_, dest); + } + // write eol + details::fmt_helper::append_string_view(eol_, dest); +} + +SPDLOG_INLINE void pattern_formatter::set_pattern(std::string pattern) +{ + pattern_ = std::move(pattern); + need_localtime_ = false; + compile_pattern_(pattern_); +} + +SPDLOG_INLINE void pattern_formatter::need_localtime(bool need) +{ + need_localtime_ = need; +} + +SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) +{ + if (pattern_time_type_ == pattern_time_type::local) + { + return details::os::localtime(log_clock::to_time_t(msg.time)); + } + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} + +template +SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) +{ + // process custom flags + auto it = custom_handlers_.find(flag); + if (it != custom_handlers_.end()) + { + auto custom_handler = it->second->clone(); + custom_handler->set_padding_info(padding); + formatters_.push_back(std::move(custom_handler)); + return; + } + + // process built-in flags + switch (flag) + { + case ('+'): // default formatter + formatters_.push_back(details::make_unique(padding)); + need_localtime_ = true; + break; + + case 'n': // logger name + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'l': // level + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'L': // short level + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('t'): // thread id + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('v'): // the message text + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('a'): // weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('A'): // short weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('b'): + case ('h'): // month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('B'): // short month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('c'): // datetime + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('C'): // year 2 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('Y'): // year 4 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('D'): + case ('x'): // datetime MM/DD/YY + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('m'): // month 1-12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('d'): // day of month 1-31 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('H'): // hours 24 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('I'): // hours 12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('M'): // minutes + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('S'): // seconds + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('e'): // milliseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('f'): // microseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('F'): // nanoseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('E'): // seconds since epoch + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('p'): // am/pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('r'): // 12 hour clock 02:55:02 pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('R'): // 24-hour HH:MM time + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('T'): + case ('X'): // ISO 8601 time format (HH:MM:SS) + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('z'): // timezone + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('P'): // pid + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('^'): // color range start + formatters_.push_back(details::make_unique(padding)); + break; + + case ('$'): // color range end + formatters_.push_back(details::make_unique(padding)); + break; + + case ('@'): // source location (filename:filenumber) + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('s'): // short source filename - without directory name + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('g'): // full source filename + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('#'): // source line number + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('!'): // source funcname + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('%'): // % char + formatters_.push_back(details::make_unique('%')); + break; + + case ('u'): // elapsed time since last log message in nanos + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('i'): // elapsed time since last log message in micros + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('o'): // elapsed time since last log message in millis + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('O'): // elapsed time since last log message in seconds + formatters_.push_back(details::make_unique>(padding)); + break; + + default: // Unknown flag appears as is + auto unknown_flag = details::make_unique(); + + if (!padding.truncate_) + { + unknown_flag->add_ch('%'); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + // fix issue #1617 (prev char was '!' and should have been treated as funcname flag instead of truncating flag) + // spdlog::set_pattern("[%10!] %v") => "[ main] some message" + // spdlog::set_pattern("[%3!!] %v") => "[mai] some message" + else + { + padding.truncate_ = false; + formatters_.push_back(details::make_unique>(padding)); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + + break; + } +} + +// Extract given pad spec (e.g. %8X, %=8X, %-8!X, %8!X, %=8!X, %-8!X, %+8!X) +// Advance the given it pass the end of the padding spec found (if any) +// Return padding. +SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) +{ + using details::padding_info; + using details::scoped_padder; + const size_t max_width = 64; + if (it == end) + { + return padding_info{}; + } + + padding_info::pad_side side; + switch (*it) + { + case '-': + side = padding_info::pad_side::right; + ++it; + break; + case '=': + side = padding_info::pad_side::center; + ++it; + break; + default: + side = details::padding_info::pad_side::left; + break; + } + + if (it == end || !std::isdigit(static_cast(*it))) + { + return padding_info{}; // no padding if no digit found here + } + + auto width = static_cast(*it) - '0'; + for (++it; it != end && std::isdigit(static_cast(*it)); ++it) + { + auto digit = static_cast(*it) - '0'; + width = width * 10 + digit; + } + + // search for the optional truncate marker '!' + bool truncate; + if (it != end && *it == '!') + { + truncate = true; + ++it; + } + else + { + truncate = false; + } + return details::padding_info{std::min(width, max_width), side, truncate}; +} + +SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) +{ + auto end = pattern.end(); + std::unique_ptr user_chars; + formatters_.clear(); + for (auto it = pattern.begin(); it != end; ++it) + { + if (*it == '%') + { + if (user_chars) // append user chars found so far + { + formatters_.push_back(std::move(user_chars)); + } + + auto padding = handle_padspec_(++it, end); + + if (it != end) + { + if (padding.enabled()) + { + handle_flag_(*it, padding); + } + else + { + handle_flag_(*it, padding); + } + } + else + { + break; + } + } + else // chars not following the % sign should be displayed as is + { + if (!user_chars) + { + user_chars = details::make_unique(); + } + user_chars->add_ch(*it); + } + } + if (user_chars) // append raw chars found so far + { + formatters_.push_back(std::move(user_chars)); + } +} +} // namespace spdlog diff --git a/spdlog/pattern_formatter.h b/spdlog/pattern_formatter.h new file mode 100644 index 0000000..acf1c53 --- /dev/null +++ b/spdlog/pattern_formatter.h @@ -0,0 +1,128 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { +namespace details { + +// padding information. +struct padding_info +{ + enum class pad_side + { + left, + right, + center + }; + + padding_info() = default; + padding_info(size_t width, padding_info::pad_side side, bool truncate) + : width_(width) + , side_(side) + , truncate_(truncate) + , enabled_(true) + {} + + bool enabled() const + { + return enabled_; + } + size_t width_ = 0; + pad_side side_ = pad_side::left; + bool truncate_ = false; + bool enabled_ = false; +}; + +class SPDLOG_API flag_formatter +{ +public: + explicit flag_formatter(padding_info padinfo) + : padinfo_(padinfo) + {} + flag_formatter() = default; + virtual ~flag_formatter() = default; + virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0; + +protected: + padding_info padinfo_; +}; + +} // namespace details + +class SPDLOG_API custom_flag_formatter : public details::flag_formatter +{ +public: + virtual std::unique_ptr clone() const = 0; + + void set_padding_info(const details::padding_info &padding) + { + flag_formatter::padinfo_ = padding; + } +}; + +class SPDLOG_API pattern_formatter final : public formatter +{ +public: + using custom_flags = std::unordered_map>; + + explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local, + std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags()); + + // use default pattern is not given + explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol); + + pattern_formatter(const pattern_formatter &other) = delete; + pattern_formatter &operator=(const pattern_formatter &other) = delete; + + std::unique_ptr clone() const override; + void format(const details::log_msg &msg, memory_buf_t &dest) override; + + template + pattern_formatter &add_flag(char flag, Args &&... args) + { + custom_handlers_[flag] = details::make_unique(std::forward(args)...); + return *this; + } + void set_pattern(std::string pattern); + void need_localtime(bool need = true); + +private: + std::string pattern_; + std::string eol_; + pattern_time_type pattern_time_type_; + bool need_localtime_; + std::tm cached_tm_; + std::chrono::seconds last_log_secs_; + std::vector> formatters_; + custom_flags custom_handlers_; + + std::tm get_time_(const details::log_msg &msg); + template + void handle_flag_(char flag, details::padding_info padding); + + // Extract given pad spec (e.g. %8X) + // Advance the given it pass the end of the padding spec found (if any) + // Return padding. + static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end); + + void compile_pattern_(const std::string &pattern); +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "pattern_formatter-inl.h" +#endif diff --git a/spdlog/spdlog-inl.h b/spdlog/spdlog-inl.h new file mode 100644 index 0000000..708399c --- /dev/null +++ b/spdlog/spdlog-inl.h @@ -0,0 +1,120 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { + +SPDLOG_INLINE void initialize_logger(std::shared_ptr logger) +{ + details::registry::instance().initialize_logger(std::move(logger)); +} + +SPDLOG_INLINE std::shared_ptr get(const std::string &name) +{ + return details::registry::instance().get(name); +} + +SPDLOG_INLINE void set_formatter(std::unique_ptr formatter) +{ + details::registry::instance().set_formatter(std::move(formatter)); +} + +SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type) +{ + set_formatter(std::unique_ptr(new pattern_formatter(std::move(pattern), time_type))); +} + +SPDLOG_INLINE void enable_backtrace(size_t n_messages) +{ + details::registry::instance().enable_backtrace(n_messages); +} + +SPDLOG_INLINE void disable_backtrace() +{ + details::registry::instance().disable_backtrace(); +} + +SPDLOG_INLINE void dump_backtrace() +{ + default_logger_raw()->dump_backtrace(); +} + +SPDLOG_INLINE level::level_enum get_level() +{ + return default_logger_raw()->level(); +} + +SPDLOG_INLINE bool should_log(level::level_enum log_level) +{ + return default_logger_raw()->should_log(log_level); +} + +SPDLOG_INLINE void set_level(level::level_enum log_level) +{ + details::registry::instance().set_level(log_level); +} + +SPDLOG_INLINE void flush_on(level::level_enum log_level) +{ + details::registry::instance().flush_on(log_level); +} + +SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg)) +{ + details::registry::instance().set_error_handler(handler); +} + +SPDLOG_INLINE void register_logger(std::shared_ptr logger) +{ + details::registry::instance().register_logger(std::move(logger)); +} + +SPDLOG_INLINE void apply_all(const std::function)> &fun) +{ + details::registry::instance().apply_all(fun); +} + +SPDLOG_INLINE void drop(const std::string &name) +{ + details::registry::instance().drop(name); +} + +SPDLOG_INLINE void drop_all() +{ + details::registry::instance().drop_all(); +} + +SPDLOG_INLINE void shutdown() +{ + details::registry::instance().shutdown(); +} + +SPDLOG_INLINE void set_automatic_registration(bool automatic_registration) +{ + details::registry::instance().set_automatic_registration(automatic_registration); +} + +SPDLOG_INLINE std::shared_ptr default_logger() +{ + return details::registry::instance().default_logger(); +} + +SPDLOG_INLINE spdlog::logger *default_logger_raw() +{ + return details::registry::instance().get_default_raw(); +} + +SPDLOG_INLINE void set_default_logger(std::shared_ptr default_logger) +{ + details::registry::instance().set_default_logger(std::move(default_logger)); +} + +} // namespace spdlog diff --git a/spdlog/spdlog.h b/spdlog/spdlog.h new file mode 100644 index 0000000..ee83e8d --- /dev/null +++ b/spdlog/spdlog.h @@ -0,0 +1,354 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +// spdlog main header file. +// see example.cpp for usage example + +#ifndef SPDLOG_H +#define SPDLOG_H + +#pragma once + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +namespace spdlog { + +using default_factory = synchronous_factory; + +// Create and register a logger with a templated sink type +// The logger's level, formatter and flush level will be set according the +// global settings. +// +// Example: +// spdlog::create("logger_name", "dailylog_filename", 11, 59); +template +inline std::shared_ptr create(std::string logger_name, SinkArgs &&... sink_args) +{ + return default_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +// Initialize and register a logger, +// formatter and flush level will be set according the global settings. +// +// Useful for initializing manually created loggers with the global settings. +// +// Example: +// auto mylogger = std::make_shared("mylogger", ...); +// spdlog::initialize_logger(mylogger); +SPDLOG_API void initialize_logger(std::shared_ptr logger); + +// Return an existing logger or nullptr if a logger with such name doesn't +// exist. +// example: spdlog::get("my_logger")->info("hello {}", "world"); +SPDLOG_API std::shared_ptr get(const std::string &name); + +// Set global formatter. Each sink in each logger will get a clone of this object +SPDLOG_API void set_formatter(std::unique_ptr formatter); + +// Set global format string. +// example: spdlog::set_pattern("%Y-%m-%d %H:%M:%S.%e %l : %v"); +SPDLOG_API void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + +// enable global backtrace support +SPDLOG_API void enable_backtrace(size_t n_messages); + +// disable global backtrace support +SPDLOG_API void disable_backtrace(); + +// call dump backtrace on default logger +SPDLOG_API void dump_backtrace(); + +// Get global logging level +SPDLOG_API level::level_enum get_level(); + +// Set global logging level +SPDLOG_API void set_level(level::level_enum log_level); + +// Determine whether the default logger should log messages with a certain level +SPDLOG_API bool should_log(level::level_enum lvl); + +// Set global flush level +SPDLOG_API void flush_on(level::level_enum log_level); + +// Start/Restart a periodic flusher thread +// Warning: Use only if all your loggers are thread safe! +template +inline void flush_every(std::chrono::duration interval) +{ + details::registry::instance().flush_every(interval); +} + +// Set global error handler +SPDLOG_API void set_error_handler(void (*handler)(const std::string &msg)); + +// Register the given logger with the given name +SPDLOG_API void register_logger(std::shared_ptr logger); + +// Apply a user defined function on all registered loggers +// Example: +// spdlog::apply_all([&](std::shared_ptr l) {l->flush();}); +SPDLOG_API void apply_all(const std::function)> &fun); + +// Drop the reference to the given logger +SPDLOG_API void drop(const std::string &name); + +// Drop all references from the registry +SPDLOG_API void drop_all(); + +// stop any running threads started by spdlog and clean registry loggers +SPDLOG_API void shutdown(); + +// Automatic registration of loggers when using spdlog::create() or spdlog::create_async +SPDLOG_API void set_automatic_registration(bool automatic_registration); + +// API for using default logger (stdout_color_mt), +// e.g: spdlog::info("Message {}", 1); +// +// The default logger object can be accessed using the spdlog::default_logger(): +// For example, to add another sink to it: +// spdlog::default_logger()->sinks().push_back(some_sink); +// +// The default logger can replaced using spdlog::set_default_logger(new_logger). +// For example, to replace it with a file logger. +// +// IMPORTANT: +// The default API is thread safe (for _mt loggers), but: +// set_default_logger() *should not* be used concurrently with the default API. +// e.g do not call set_default_logger() from one thread while calling spdlog::info() from another. + +SPDLOG_API std::shared_ptr default_logger(); + +SPDLOG_API spdlog::logger *default_logger_raw(); + +SPDLOG_API void set_default_logger(std::shared_ptr default_logger); + +template +inline void log(source_loc source, level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} + +template +inline void log(source_loc source, level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(source, lvl, msg); +} + +template +inline void log(level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(lvl, msg); +} + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +template +inline void log(source_loc source, level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} +#endif + +template +inline void trace(const T &msg) +{ + default_logger_raw()->trace(msg); +} + +template +inline void debug(const T &msg) +{ + default_logger_raw()->debug(msg); +} + +template +inline void info(const T &msg) +{ + default_logger_raw()->info(msg); +} + +template +inline void warn(const T &msg) +{ + default_logger_raw()->warn(msg); +} + +template +inline void error(const T &msg) +{ + default_logger_raw()->error(msg); +} + +template +inline void critical(const T &msg) +{ + default_logger_raw()->critical(msg); +} + +} // namespace spdlog + +// +// enable/disable log calls at compile time according to global level. +// +// define SPDLOG_ACTIVE_LEVEL to one of those (before including spdlog.h): +// SPDLOG_LEVEL_TRACE, +// SPDLOG_LEVEL_DEBUG, +// SPDLOG_LEVEL_INFO, +// SPDLOG_LEVEL_WARN, +// SPDLOG_LEVEL_ERROR, +// SPDLOG_LEVEL_CRITICAL, +// SPDLOG_LEVEL_OFF +// + +#ifndef SPDLOG_NO_SOURCE_LOC +# define SPDLOG_LOGGER_CALL(logger, level, ...) \ + (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CALL(logger, level, ...) (logger)->log(spdlog::source_loc{}, level, __VA_ARGS__) +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE +# define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__) +# define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_TRACE(logger, ...) (void)0 +# define SPDLOG_TRACE(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_DEBUG +# define SPDLOG_LOGGER_DEBUG(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::debug, __VA_ARGS__) +# define SPDLOG_DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_DEBUG(logger, ...) (void)0 +# define SPDLOG_DEBUG(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_INFO +# define SPDLOG_LOGGER_INFO(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::info, __VA_ARGS__) +# define SPDLOG_INFO(...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_INFO(logger, ...) (void)0 +# define SPDLOG_INFO(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_WARN +# define SPDLOG_LOGGER_WARN(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::warn, __VA_ARGS__) +# define SPDLOG_WARN(...) SPDLOG_LOGGER_WARN(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_WARN(logger, ...) (void)0 +# define SPDLOG_WARN(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_ERROR +# define SPDLOG_LOGGER_ERROR(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::err, __VA_ARGS__) +# define SPDLOG_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_ERROR(logger, ...) (void)0 +# define SPDLOG_ERROR(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_CRITICAL +# define SPDLOG_LOGGER_CRITICAL(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::critical, __VA_ARGS__) +# define SPDLOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CRITICAL(logger, ...) (void)0 +# define SPDLOG_CRITICAL(...) (void)0 +#endif + +#ifdef SPDLOG_HEADER_ONLY +# include "spdlog-inl.h" +#endif + +#endif // SPDLOG_H diff --git a/spdlog/stopwatch.h b/spdlog/stopwatch.h new file mode 100644 index 0000000..5d1f2dc --- /dev/null +++ b/spdlog/stopwatch.h @@ -0,0 +1,69 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +// Stopwatch support for spdlog (using std::chrono::steady_clock). +// Displays elapsed seconds since construction as double. +// +// Usage: +// +// spdlog::stopwatch sw; +// ... +// spdlog::debug("Elapsed: {} seconds", sw); => "Elapsed 0.005116733 seconds" +// spdlog::info("Elapsed: {:.6} seconds", sw); => "Elapsed 0.005163 seconds" +// +// +// If other units are needed (e.g. millis instead of double), include "fmt/chrono.h" and use "duration_cast<..>(sw.elapsed())": +// +// #include +//.. +// using std::chrono::duration_cast; +// using std::chrono::milliseconds; +// spdlog::info("Elapsed {}", duration_cast(sw.elapsed())); => "Elapsed 5ms" + +namespace spdlog { +class stopwatch +{ + using clock = std::chrono::steady_clock; + std::chrono::time_point start_tp_; + +public: + stopwatch() + : start_tp_{clock::now()} + {} + + std::chrono::duration elapsed() const + { + return std::chrono::duration(clock::now() - start_tp_); + } + + void reset() + { + start_tp_ = clock::now(); + } +}; +} // namespace spdlog + +// Support for fmt formatting (e.g. "{:012.9}" or just "{}") +namespace +#ifdef SPDLOG_USE_STD_FORMAT + std +#else + fmt +#endif +{ + +template<> +struct formatter : formatter +{ + template + auto format(const spdlog::stopwatch &sw, FormatContext &ctx) -> decltype(ctx.out()) + { + return formatter::format(sw.elapsed().count(), ctx); + } +}; +} // namespace std diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/spdlog/pattern_formatter-inl.h b/spdlog/pattern_formatter-inl.h new file mode 100644 index 0000000..01afbe6 --- /dev/null +++ b/spdlog/pattern_formatter-inl.h @@ -0,0 +1,1436 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace spdlog { +namespace details { + +/////////////////////////////////////////////////////////////////////// +// name & level pattern appender +/////////////////////////////////////////////////////////////////////// + +class scoped_padder +{ +public: + scoped_padder(size_t wrapped_size, const padding_info &padinfo, memory_buf_t &dest) + : padinfo_(padinfo) + , dest_(dest) + { + remaining_pad_ = static_cast(padinfo.width_) - static_cast(wrapped_size); + if (remaining_pad_ <= 0) + { + return; + } + + if (padinfo_.side_ == padding_info::pad_side::left) + { + pad_it(remaining_pad_); + remaining_pad_ = 0; + } + else if (padinfo_.side_ == padding_info::pad_side::center) + { + auto half_pad = remaining_pad_ / 2; + auto reminder = remaining_pad_ & 1; + pad_it(half_pad); + remaining_pad_ = half_pad + reminder; // for the right side + } + } + + template + static unsigned int count_digits(T n) + { + return fmt_helper::count_digits(n); + } + + ~scoped_padder() + { + if (remaining_pad_ >= 0) + { + pad_it(remaining_pad_); + } + else if (padinfo_.truncate_) + { + long new_size = static_cast(dest_.size()) + remaining_pad_; + dest_.resize(static_cast(new_size)); + } + } + +private: + void pad_it(long count) + { + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); + } + + const padding_info &padinfo_; + memory_buf_t &dest_; + long remaining_pad_; + string_view_t spaces_{" ", 64}; +}; + +struct null_scoped_padder +{ + null_scoped_padder(size_t /*wrapped_size*/, const padding_info & /*padinfo*/, memory_buf_t & /*dest*/) {} + + template + static unsigned int count_digits(T /* number */) + { + return 0; + } +}; + +template +class name_formatter final : public flag_formatter +{ +public: + explicit name_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.logger_name.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.logger_name, dest); + } +}; + +// log level appender +template +class level_formatter final : public flag_formatter +{ +public: + explicit level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const string_view_t &level_name = level::to_string_view(msg.level); + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +// short log level appender +template +class short_level_formatter final : public flag_formatter +{ +public: + explicit short_level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + string_view_t level_name{level::to_short_c_str(msg.level)}; + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +/////////////////////////////////////////////////////////////////////// +// Date time pattern appenders +/////////////////////////////////////////////////////////////////////// + +static const char *ampm(const tm &t) +{ + return t.tm_hour >= 12 ? "PM" : "AM"; +} + +static int to12h(const tm &t) +{ + return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour; +} + +// Abbreviated weekday name +static std::array days{{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}}; + +template +class a_formatter final : public flag_formatter +{ +public: + explicit a_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full weekday name +static std::array full_days{{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}}; + +template +class A_formatter : public flag_formatter +{ +public: + explicit A_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Abbreviated month +static const std::array months{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}}; + +template +class b_formatter final : public flag_formatter +{ +public: + explicit b_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full month name +static const std::array full_months{ + {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}}; + +template +class B_formatter final : public flag_formatter +{ +public: + explicit B_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Date and time representation (Thu Aug 23 15:35:46 2014) +template +class c_formatter final : public flag_formatter +{ +public: + explicit c_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 24; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::append_string_view(days[static_cast(tm_time.tm_wday)], dest); + dest.push_back(' '); + fmt_helper::append_string_view(months[static_cast(tm_time.tm_mon)], dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_mday, dest); + dest.push_back(' '); + // time + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// year - 2 digit +template +class C_formatter final : public flag_formatter +{ +public: + explicit C_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01 +template +class D_formatter final : public flag_formatter +{ +public: + explicit D_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_mday, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// year - 4 digit +template +class Y_formatter final : public flag_formatter +{ +public: + explicit Y_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 4; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// month 1-12 +template +class m_formatter final : public flag_formatter +{ +public: + explicit m_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + } +}; + +// day of month 1-31 +template +class d_formatter final : public flag_formatter +{ +public: + explicit d_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mday, dest); + } +}; + +// hours in 24 format 0-23 +template +class H_formatter final : public flag_formatter +{ +public: + explicit H_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_hour, dest); + } +}; + +// hours in 12 format 1-12 +template +class I_formatter final : public flag_formatter +{ +public: + explicit I_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(to12h(tm_time), dest); + } +}; + +// minutes 0-59 +template +class M_formatter final : public flag_formatter +{ +public: + explicit M_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// seconds 0-59 +template +class S_formatter final : public flag_formatter +{ +public: + explicit S_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// milliseconds +template +class e_formatter final : public flag_formatter +{ +public: + explicit e_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto millis = fmt_helper::time_fraction(msg.time); + const size_t field_size = 3; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad3(static_cast(millis.count()), dest); + } +}; + +// microseconds +template +class f_formatter final : public flag_formatter +{ +public: + explicit f_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto micros = fmt_helper::time_fraction(msg.time); + + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad6(static_cast(micros.count()), dest); + } +}; + +// nanoseconds +template +class F_formatter final : public flag_formatter +{ +public: + explicit F_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto ns = fmt_helper::time_fraction(msg.time); + const size_t field_size = 9; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad9(static_cast(ns.count()), dest); + } +}; + +// seconds since epoch +template +class E_formatter final : public flag_formatter +{ +public: + explicit E_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + auto duration = msg.time.time_since_epoch(); + auto seconds = std::chrono::duration_cast(duration).count(); + fmt_helper::append_int(seconds, dest); + } +}; + +// AM/PM +template +class p_formatter final : public flag_formatter +{ +public: + explicit p_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 12 hour clock 02:55:02 pm +template +class r_formatter final : public flag_formatter +{ +public: + explicit r_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 11; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(to12h(tm_time), dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 24-hour HH:MM time, equivalent to %H:%M +template +class R_formatter final : public flag_formatter +{ +public: + explicit R_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 5; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S +template +class T_formatter final : public flag_formatter +{ +public: + explicit T_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// ISO 8601 offset from UTC in timezone (+-HH:MM) +template +class z_formatter final : public flag_formatter +{ +public: + explicit z_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + z_formatter() = default; + z_formatter(const z_formatter &) = delete; + z_formatter &operator=(const z_formatter &) = delete; + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + + auto total_minutes = get_cached_offset(msg, tm_time); + bool is_negative = total_minutes < 0; + if (is_negative) + { + total_minutes = -total_minutes; + dest.push_back('-'); + } + else + { + dest.push_back('+'); + } + + fmt_helper::pad2(total_minutes / 60, dest); // hours + dest.push_back(':'); + fmt_helper::pad2(total_minutes % 60, dest); // minutes + } + +private: + log_clock::time_point last_update_{std::chrono::seconds(0)}; + int offset_minutes_{0}; + + int get_cached_offset(const log_msg &msg, const std::tm &tm_time) + { + // refresh every 10 seconds + if (msg.time - last_update_ >= std::chrono::seconds(10)) + { + offset_minutes_ = os::utc_minutes_offset(tm_time); + last_update_ = msg.time; + } + return offset_minutes_; + } +}; + +// Thread id +template +class t_formatter final : public flag_formatter +{ +public: + explicit t_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const auto field_size = ScopedPadder::count_digits(msg.thread_id); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.thread_id, dest); + } +}; + +// Current pid +template +class pid_formatter final : public flag_formatter +{ +public: + explicit pid_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + const auto pid = static_cast(details::os::pid()); + auto field_size = ScopedPadder::count_digits(pid); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(pid, dest); + } +}; + +template +class v_formatter final : public flag_formatter +{ +public: + explicit v_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.payload.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.payload, dest); + } +}; + +class ch_formatter final : public flag_formatter +{ +public: + explicit ch_formatter(char ch) + : ch_(ch) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + dest.push_back(ch_); + } + +private: + char ch_; +}; + +// aggregate user chars to display as is +class aggregate_formatter final : public flag_formatter +{ +public: + aggregate_formatter() = default; + + void add_ch(char ch) + { + str_ += ch; + } + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + fmt_helper::append_string_view(str_, dest); + } + +private: + std::string str_; +}; + +// mark the color range. expect it to be in the form of "%^colored text%$" +class color_start_formatter final : public flag_formatter +{ +public: + explicit color_start_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_start = dest.size(); + } +}; + +class color_stop_formatter final : public flag_formatter +{ +public: + explicit color_stop_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_end = dest.size(); + } +}; + +// print source location +template +class source_location_formatter final : public flag_formatter +{ +public: + explicit source_location_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + size_t text_size; + if (padinfo_.enabled()) + { + // calc text size for padding based on "filename:line" + text_size = std::char_traits::length(msg.source.filename) + ScopedPadder::count_digits(msg.source.line) + 1; + } + else + { + text_size = 0; + } + + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source filename +template +class source_filename_formatter final : public flag_formatter +{ +public: + explicit source_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + } +}; + +template +class short_filename_formatter final : public flag_formatter +{ +public: + explicit short_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4127) // consider using 'if constexpr' instead +#endif // _MSC_VER + static const char *basename(const char *filename) + { + // if the size is 2 (1 character + null terminator) we can use the more efficient strrchr + // the branch will be elided by optimizations + if (sizeof(os::folder_seps) == 2) + { + const char *rv = std::strrchr(filename, os::folder_seps[0]); + return rv != nullptr ? rv + 1 : filename; + } + else + { + const std::reverse_iterator begin(filename + std::strlen(filename)); + const std::reverse_iterator end(filename); + + const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1); + return it != end ? it.base() : filename; + } + } +#ifdef _MSC_VER +# pragma warning(pop) +#endif // _MSC_VER + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + auto filename = basename(msg.source.filename); + size_t text_size = padinfo_.enabled() ? std::char_traits::length(filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(filename, dest); + } +}; + +template +class source_linenum_formatter final : public flag_formatter +{ +public: + explicit source_linenum_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + auto field_size = ScopedPadder::count_digits(msg.source.line); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source funcname +template +class source_funcname_formatter final : public flag_formatter +{ +public: + explicit source_funcname_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.funcname) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.funcname, dest); + } +}; + +// print elapsed time since last message +template +class elapsed_formatter final : public flag_formatter +{ +public: + using DurationUnits = Units; + + explicit elapsed_formatter(padding_info padinfo) + : flag_formatter(padinfo) + , last_message_time_(log_clock::now()) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta_units = std::chrono::duration_cast(delta); + last_message_time_ = msg.time; + auto delta_count = static_cast(delta_units.count()); + auto n_digits = static_cast(ScopedPadder::count_digits(delta_count)); + ScopedPadder p(n_digits, padinfo_, dest); + fmt_helper::append_int(delta_count, dest); + } + +private: + log_clock::time_point last_message_time_; +}; + +// Full info formatter +// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v +class full_formatter final : public flag_formatter +{ +public: + explicit full_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + using std::chrono::duration_cast; + using std::chrono::milliseconds; + using std::chrono::seconds; + + // cache the date/time part for the next second. + auto duration = msg.time.time_since_epoch(); + auto secs = duration_cast(duration); + + if (cache_timestamp_ != secs || cached_datetime_.size() == 0) + { + cached_datetime_.clear(); + cached_datetime_.push_back('['); + fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mday, cached_datetime_); + cached_datetime_.push_back(' '); + + fmt_helper::pad2(tm_time.tm_hour, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_min, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_sec, cached_datetime_); + cached_datetime_.push_back('.'); + + cache_timestamp_ = secs; + } + dest.append(cached_datetime_.begin(), cached_datetime_.end()); + + auto millis = fmt_helper::time_fraction(msg.time); + fmt_helper::pad3(static_cast(millis.count()), dest); + dest.push_back(']'); + dest.push_back(' '); + + // append logger name if exists + if (msg.logger_name.size() > 0) + { + dest.push_back('['); + fmt_helper::append_string_view(msg.logger_name, dest); + dest.push_back(']'); + dest.push_back(' '); + } + + dest.push_back('['); + // wrap the level name with color + msg.color_range_start = dest.size(); + // fmt_helper::append_string_view(level::to_c_str(msg.level), dest); + fmt_helper::append_string_view(level::to_string_view(msg.level), dest); + msg.color_range_end = dest.size(); + dest.push_back(']'); + dest.push_back(' '); + + // add source location if present + if (!msg.source.empty()) + { + dest.push_back('['); + const char *filename = details::short_filename_formatter::basename(msg.source.filename); + fmt_helper::append_string_view(filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + dest.push_back(']'); + dest.push_back(' '); + } + // fmt_helper::append_string_view(msg.msg(), dest); + fmt_helper::append_string_view(msg.payload, dest); + } + +private: + std::chrono::seconds cache_timestamp_{0}; + memory_buf_t cached_datetime_; +}; + +} // namespace details + +SPDLOG_INLINE pattern_formatter::pattern_formatter( + std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags) + : pattern_(std::move(pattern)) + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(false) + , last_log_secs_(0) + , custom_handlers_(std::move(custom_user_flags)) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + compile_pattern_(pattern_); +} + +// use by default full formatter for if pattern is not given +SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + : pattern_("%+") + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(true) + , last_log_secs_(0) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + formatters_.push_back(details::make_unique(details::padding_info{})); +} + +SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const +{ + custom_flags cloned_custom_formatters; + for (auto &it : custom_handlers_) + { + cloned_custom_formatters[it.first] = it.second->clone(); + } + auto cloned = details::make_unique(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters)); + cloned->need_localtime(need_localtime_); +#if defined(__GNUC__) && __GNUC__ < 5 + return std::move(cloned); +#else + return cloned; +#endif +} + +SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest) +{ + if (need_localtime_) + { + const auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); + if (secs != last_log_secs_) + { + cached_tm_ = get_time_(msg); + last_log_secs_ = secs; + } + } + + for (auto &f : formatters_) + { + f->format(msg, cached_tm_, dest); + } + // write eol + details::fmt_helper::append_string_view(eol_, dest); +} + +SPDLOG_INLINE void pattern_formatter::set_pattern(std::string pattern) +{ + pattern_ = std::move(pattern); + need_localtime_ = false; + compile_pattern_(pattern_); +} + +SPDLOG_INLINE void pattern_formatter::need_localtime(bool need) +{ + need_localtime_ = need; +} + +SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) +{ + if (pattern_time_type_ == pattern_time_type::local) + { + return details::os::localtime(log_clock::to_time_t(msg.time)); + } + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} + +template +SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) +{ + // process custom flags + auto it = custom_handlers_.find(flag); + if (it != custom_handlers_.end()) + { + auto custom_handler = it->second->clone(); + custom_handler->set_padding_info(padding); + formatters_.push_back(std::move(custom_handler)); + return; + } + + // process built-in flags + switch (flag) + { + case ('+'): // default formatter + formatters_.push_back(details::make_unique(padding)); + need_localtime_ = true; + break; + + case 'n': // logger name + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'l': // level + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'L': // short level + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('t'): // thread id + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('v'): // the message text + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('a'): // weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('A'): // short weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('b'): + case ('h'): // month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('B'): // short month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('c'): // datetime + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('C'): // year 2 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('Y'): // year 4 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('D'): + case ('x'): // datetime MM/DD/YY + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('m'): // month 1-12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('d'): // day of month 1-31 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('H'): // hours 24 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('I'): // hours 12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('M'): // minutes + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('S'): // seconds + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('e'): // milliseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('f'): // microseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('F'): // nanoseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('E'): // seconds since epoch + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('p'): // am/pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('r'): // 12 hour clock 02:55:02 pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('R'): // 24-hour HH:MM time + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('T'): + case ('X'): // ISO 8601 time format (HH:MM:SS) + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('z'): // timezone + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('P'): // pid + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('^'): // color range start + formatters_.push_back(details::make_unique(padding)); + break; + + case ('$'): // color range end + formatters_.push_back(details::make_unique(padding)); + break; + + case ('@'): // source location (filename:filenumber) + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('s'): // short source filename - without directory name + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('g'): // full source filename + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('#'): // source line number + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('!'): // source funcname + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('%'): // % char + formatters_.push_back(details::make_unique('%')); + break; + + case ('u'): // elapsed time since last log message in nanos + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('i'): // elapsed time since last log message in micros + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('o'): // elapsed time since last log message in millis + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('O'): // elapsed time since last log message in seconds + formatters_.push_back(details::make_unique>(padding)); + break; + + default: // Unknown flag appears as is + auto unknown_flag = details::make_unique(); + + if (!padding.truncate_) + { + unknown_flag->add_ch('%'); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + // fix issue #1617 (prev char was '!' and should have been treated as funcname flag instead of truncating flag) + // spdlog::set_pattern("[%10!] %v") => "[ main] some message" + // spdlog::set_pattern("[%3!!] %v") => "[mai] some message" + else + { + padding.truncate_ = false; + formatters_.push_back(details::make_unique>(padding)); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + + break; + } +} + +// Extract given pad spec (e.g. %8X, %=8X, %-8!X, %8!X, %=8!X, %-8!X, %+8!X) +// Advance the given it pass the end of the padding spec found (if any) +// Return padding. +SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) +{ + using details::padding_info; + using details::scoped_padder; + const size_t max_width = 64; + if (it == end) + { + return padding_info{}; + } + + padding_info::pad_side side; + switch (*it) + { + case '-': + side = padding_info::pad_side::right; + ++it; + break; + case '=': + side = padding_info::pad_side::center; + ++it; + break; + default: + side = details::padding_info::pad_side::left; + break; + } + + if (it == end || !std::isdigit(static_cast(*it))) + { + return padding_info{}; // no padding if no digit found here + } + + auto width = static_cast(*it) - '0'; + for (++it; it != end && std::isdigit(static_cast(*it)); ++it) + { + auto digit = static_cast(*it) - '0'; + width = width * 10 + digit; + } + + // search for the optional truncate marker '!' + bool truncate; + if (it != end && *it == '!') + { + truncate = true; + ++it; + } + else + { + truncate = false; + } + return details::padding_info{std::min(width, max_width), side, truncate}; +} + +SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) +{ + auto end = pattern.end(); + std::unique_ptr user_chars; + formatters_.clear(); + for (auto it = pattern.begin(); it != end; ++it) + { + if (*it == '%') + { + if (user_chars) // append user chars found so far + { + formatters_.push_back(std::move(user_chars)); + } + + auto padding = handle_padspec_(++it, end); + + if (it != end) + { + if (padding.enabled()) + { + handle_flag_(*it, padding); + } + else + { + handle_flag_(*it, padding); + } + } + else + { + break; + } + } + else // chars not following the % sign should be displayed as is + { + if (!user_chars) + { + user_chars = details::make_unique(); + } + user_chars->add_ch(*it); + } + } + if (user_chars) // append raw chars found so far + { + formatters_.push_back(std::move(user_chars)); + } +} +} // namespace spdlog diff --git a/spdlog/pattern_formatter.h b/spdlog/pattern_formatter.h new file mode 100644 index 0000000..acf1c53 --- /dev/null +++ b/spdlog/pattern_formatter.h @@ -0,0 +1,128 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { +namespace details { + +// padding information. +struct padding_info +{ + enum class pad_side + { + left, + right, + center + }; + + padding_info() = default; + padding_info(size_t width, padding_info::pad_side side, bool truncate) + : width_(width) + , side_(side) + , truncate_(truncate) + , enabled_(true) + {} + + bool enabled() const + { + return enabled_; + } + size_t width_ = 0; + pad_side side_ = pad_side::left; + bool truncate_ = false; + bool enabled_ = false; +}; + +class SPDLOG_API flag_formatter +{ +public: + explicit flag_formatter(padding_info padinfo) + : padinfo_(padinfo) + {} + flag_formatter() = default; + virtual ~flag_formatter() = default; + virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0; + +protected: + padding_info padinfo_; +}; + +} // namespace details + +class SPDLOG_API custom_flag_formatter : public details::flag_formatter +{ +public: + virtual std::unique_ptr clone() const = 0; + + void set_padding_info(const details::padding_info &padding) + { + flag_formatter::padinfo_ = padding; + } +}; + +class SPDLOG_API pattern_formatter final : public formatter +{ +public: + using custom_flags = std::unordered_map>; + + explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local, + std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags()); + + // use default pattern is not given + explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol); + + pattern_formatter(const pattern_formatter &other) = delete; + pattern_formatter &operator=(const pattern_formatter &other) = delete; + + std::unique_ptr clone() const override; + void format(const details::log_msg &msg, memory_buf_t &dest) override; + + template + pattern_formatter &add_flag(char flag, Args &&... args) + { + custom_handlers_[flag] = details::make_unique(std::forward(args)...); + return *this; + } + void set_pattern(std::string pattern); + void need_localtime(bool need = true); + +private: + std::string pattern_; + std::string eol_; + pattern_time_type pattern_time_type_; + bool need_localtime_; + std::tm cached_tm_; + std::chrono::seconds last_log_secs_; + std::vector> formatters_; + custom_flags custom_handlers_; + + std::tm get_time_(const details::log_msg &msg); + template + void handle_flag_(char flag, details::padding_info padding); + + // Extract given pad spec (e.g. %8X) + // Advance the given it pass the end of the padding spec found (if any) + // Return padding. + static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end); + + void compile_pattern_(const std::string &pattern); +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "pattern_formatter-inl.h" +#endif diff --git a/spdlog/spdlog-inl.h b/spdlog/spdlog-inl.h new file mode 100644 index 0000000..708399c --- /dev/null +++ b/spdlog/spdlog-inl.h @@ -0,0 +1,120 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { + +SPDLOG_INLINE void initialize_logger(std::shared_ptr logger) +{ + details::registry::instance().initialize_logger(std::move(logger)); +} + +SPDLOG_INLINE std::shared_ptr get(const std::string &name) +{ + return details::registry::instance().get(name); +} + +SPDLOG_INLINE void set_formatter(std::unique_ptr formatter) +{ + details::registry::instance().set_formatter(std::move(formatter)); +} + +SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type) +{ + set_formatter(std::unique_ptr(new pattern_formatter(std::move(pattern), time_type))); +} + +SPDLOG_INLINE void enable_backtrace(size_t n_messages) +{ + details::registry::instance().enable_backtrace(n_messages); +} + +SPDLOG_INLINE void disable_backtrace() +{ + details::registry::instance().disable_backtrace(); +} + +SPDLOG_INLINE void dump_backtrace() +{ + default_logger_raw()->dump_backtrace(); +} + +SPDLOG_INLINE level::level_enum get_level() +{ + return default_logger_raw()->level(); +} + +SPDLOG_INLINE bool should_log(level::level_enum log_level) +{ + return default_logger_raw()->should_log(log_level); +} + +SPDLOG_INLINE void set_level(level::level_enum log_level) +{ + details::registry::instance().set_level(log_level); +} + +SPDLOG_INLINE void flush_on(level::level_enum log_level) +{ + details::registry::instance().flush_on(log_level); +} + +SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg)) +{ + details::registry::instance().set_error_handler(handler); +} + +SPDLOG_INLINE void register_logger(std::shared_ptr logger) +{ + details::registry::instance().register_logger(std::move(logger)); +} + +SPDLOG_INLINE void apply_all(const std::function)> &fun) +{ + details::registry::instance().apply_all(fun); +} + +SPDLOG_INLINE void drop(const std::string &name) +{ + details::registry::instance().drop(name); +} + +SPDLOG_INLINE void drop_all() +{ + details::registry::instance().drop_all(); +} + +SPDLOG_INLINE void shutdown() +{ + details::registry::instance().shutdown(); +} + +SPDLOG_INLINE void set_automatic_registration(bool automatic_registration) +{ + details::registry::instance().set_automatic_registration(automatic_registration); +} + +SPDLOG_INLINE std::shared_ptr default_logger() +{ + return details::registry::instance().default_logger(); +} + +SPDLOG_INLINE spdlog::logger *default_logger_raw() +{ + return details::registry::instance().get_default_raw(); +} + +SPDLOG_INLINE void set_default_logger(std::shared_ptr default_logger) +{ + details::registry::instance().set_default_logger(std::move(default_logger)); +} + +} // namespace spdlog diff --git a/spdlog/spdlog.h b/spdlog/spdlog.h new file mode 100644 index 0000000..ee83e8d --- /dev/null +++ b/spdlog/spdlog.h @@ -0,0 +1,354 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +// spdlog main header file. +// see example.cpp for usage example + +#ifndef SPDLOG_H +#define SPDLOG_H + +#pragma once + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +namespace spdlog { + +using default_factory = synchronous_factory; + +// Create and register a logger with a templated sink type +// The logger's level, formatter and flush level will be set according the +// global settings. +// +// Example: +// spdlog::create("logger_name", "dailylog_filename", 11, 59); +template +inline std::shared_ptr create(std::string logger_name, SinkArgs &&... sink_args) +{ + return default_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +// Initialize and register a logger, +// formatter and flush level will be set according the global settings. +// +// Useful for initializing manually created loggers with the global settings. +// +// Example: +// auto mylogger = std::make_shared("mylogger", ...); +// spdlog::initialize_logger(mylogger); +SPDLOG_API void initialize_logger(std::shared_ptr logger); + +// Return an existing logger or nullptr if a logger with such name doesn't +// exist. +// example: spdlog::get("my_logger")->info("hello {}", "world"); +SPDLOG_API std::shared_ptr get(const std::string &name); + +// Set global formatter. Each sink in each logger will get a clone of this object +SPDLOG_API void set_formatter(std::unique_ptr formatter); + +// Set global format string. +// example: spdlog::set_pattern("%Y-%m-%d %H:%M:%S.%e %l : %v"); +SPDLOG_API void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + +// enable global backtrace support +SPDLOG_API void enable_backtrace(size_t n_messages); + +// disable global backtrace support +SPDLOG_API void disable_backtrace(); + +// call dump backtrace on default logger +SPDLOG_API void dump_backtrace(); + +// Get global logging level +SPDLOG_API level::level_enum get_level(); + +// Set global logging level +SPDLOG_API void set_level(level::level_enum log_level); + +// Determine whether the default logger should log messages with a certain level +SPDLOG_API bool should_log(level::level_enum lvl); + +// Set global flush level +SPDLOG_API void flush_on(level::level_enum log_level); + +// Start/Restart a periodic flusher thread +// Warning: Use only if all your loggers are thread safe! +template +inline void flush_every(std::chrono::duration interval) +{ + details::registry::instance().flush_every(interval); +} + +// Set global error handler +SPDLOG_API void set_error_handler(void (*handler)(const std::string &msg)); + +// Register the given logger with the given name +SPDLOG_API void register_logger(std::shared_ptr logger); + +// Apply a user defined function on all registered loggers +// Example: +// spdlog::apply_all([&](std::shared_ptr l) {l->flush();}); +SPDLOG_API void apply_all(const std::function)> &fun); + +// Drop the reference to the given logger +SPDLOG_API void drop(const std::string &name); + +// Drop all references from the registry +SPDLOG_API void drop_all(); + +// stop any running threads started by spdlog and clean registry loggers +SPDLOG_API void shutdown(); + +// Automatic registration of loggers when using spdlog::create() or spdlog::create_async +SPDLOG_API void set_automatic_registration(bool automatic_registration); + +// API for using default logger (stdout_color_mt), +// e.g: spdlog::info("Message {}", 1); +// +// The default logger object can be accessed using the spdlog::default_logger(): +// For example, to add another sink to it: +// spdlog::default_logger()->sinks().push_back(some_sink); +// +// The default logger can replaced using spdlog::set_default_logger(new_logger). +// For example, to replace it with a file logger. +// +// IMPORTANT: +// The default API is thread safe (for _mt loggers), but: +// set_default_logger() *should not* be used concurrently with the default API. +// e.g do not call set_default_logger() from one thread while calling spdlog::info() from another. + +SPDLOG_API std::shared_ptr default_logger(); + +SPDLOG_API spdlog::logger *default_logger_raw(); + +SPDLOG_API void set_default_logger(std::shared_ptr default_logger); + +template +inline void log(source_loc source, level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} + +template +inline void log(source_loc source, level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(source, lvl, msg); +} + +template +inline void log(level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(lvl, msg); +} + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +template +inline void log(source_loc source, level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} +#endif + +template +inline void trace(const T &msg) +{ + default_logger_raw()->trace(msg); +} + +template +inline void debug(const T &msg) +{ + default_logger_raw()->debug(msg); +} + +template +inline void info(const T &msg) +{ + default_logger_raw()->info(msg); +} + +template +inline void warn(const T &msg) +{ + default_logger_raw()->warn(msg); +} + +template +inline void error(const T &msg) +{ + default_logger_raw()->error(msg); +} + +template +inline void critical(const T &msg) +{ + default_logger_raw()->critical(msg); +} + +} // namespace spdlog + +// +// enable/disable log calls at compile time according to global level. +// +// define SPDLOG_ACTIVE_LEVEL to one of those (before including spdlog.h): +// SPDLOG_LEVEL_TRACE, +// SPDLOG_LEVEL_DEBUG, +// SPDLOG_LEVEL_INFO, +// SPDLOG_LEVEL_WARN, +// SPDLOG_LEVEL_ERROR, +// SPDLOG_LEVEL_CRITICAL, +// SPDLOG_LEVEL_OFF +// + +#ifndef SPDLOG_NO_SOURCE_LOC +# define SPDLOG_LOGGER_CALL(logger, level, ...) \ + (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CALL(logger, level, ...) (logger)->log(spdlog::source_loc{}, level, __VA_ARGS__) +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE +# define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__) +# define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_TRACE(logger, ...) (void)0 +# define SPDLOG_TRACE(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_DEBUG +# define SPDLOG_LOGGER_DEBUG(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::debug, __VA_ARGS__) +# define SPDLOG_DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_DEBUG(logger, ...) (void)0 +# define SPDLOG_DEBUG(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_INFO +# define SPDLOG_LOGGER_INFO(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::info, __VA_ARGS__) +# define SPDLOG_INFO(...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_INFO(logger, ...) (void)0 +# define SPDLOG_INFO(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_WARN +# define SPDLOG_LOGGER_WARN(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::warn, __VA_ARGS__) +# define SPDLOG_WARN(...) SPDLOG_LOGGER_WARN(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_WARN(logger, ...) (void)0 +# define SPDLOG_WARN(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_ERROR +# define SPDLOG_LOGGER_ERROR(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::err, __VA_ARGS__) +# define SPDLOG_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_ERROR(logger, ...) (void)0 +# define SPDLOG_ERROR(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_CRITICAL +# define SPDLOG_LOGGER_CRITICAL(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::critical, __VA_ARGS__) +# define SPDLOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CRITICAL(logger, ...) (void)0 +# define SPDLOG_CRITICAL(...) (void)0 +#endif + +#ifdef SPDLOG_HEADER_ONLY +# include "spdlog-inl.h" +#endif + +#endif // SPDLOG_H diff --git a/spdlog/stopwatch.h b/spdlog/stopwatch.h new file mode 100644 index 0000000..5d1f2dc --- /dev/null +++ b/spdlog/stopwatch.h @@ -0,0 +1,69 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +// Stopwatch support for spdlog (using std::chrono::steady_clock). +// Displays elapsed seconds since construction as double. +// +// Usage: +// +// spdlog::stopwatch sw; +// ... +// spdlog::debug("Elapsed: {} seconds", sw); => "Elapsed 0.005116733 seconds" +// spdlog::info("Elapsed: {:.6} seconds", sw); => "Elapsed 0.005163 seconds" +// +// +// If other units are needed (e.g. millis instead of double), include "fmt/chrono.h" and use "duration_cast<..>(sw.elapsed())": +// +// #include +//.. +// using std::chrono::duration_cast; +// using std::chrono::milliseconds; +// spdlog::info("Elapsed {}", duration_cast(sw.elapsed())); => "Elapsed 5ms" + +namespace spdlog { +class stopwatch +{ + using clock = std::chrono::steady_clock; + std::chrono::time_point start_tp_; + +public: + stopwatch() + : start_tp_{clock::now()} + {} + + std::chrono::duration elapsed() const + { + return std::chrono::duration(clock::now() - start_tp_); + } + + void reset() + { + start_tp_ = clock::now(); + } +}; +} // namespace spdlog + +// Support for fmt formatting (e.g. "{:012.9}" or just "{}") +namespace +#ifdef SPDLOG_USE_STD_FORMAT + std +#else + fmt +#endif +{ + +template<> +struct formatter : formatter +{ + template + auto format(const spdlog::stopwatch &sw, FormatContext &ctx) -> decltype(ctx.out()) + { + return formatter::format(sw.elapsed().count(), ctx); + } +}; +} // namespace std diff --git a/spdlog/tweakme.h b/spdlog/tweakme.h new file mode 100644 index 0000000..5bcb5ff --- /dev/null +++ b/spdlog/tweakme.h @@ -0,0 +1,140 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +/////////////////////////////////////////////////////////////////////////////// +// +// Edit this file to squeeze more performance, and to customize supported +// features +// +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Under Linux, the much faster CLOCK_REALTIME_COARSE clock can be used. +// This clock is less accurate - can be off by dozens of millis - depending on +// the kernel HZ. +// Uncomment to use it instead of the regular clock. +// +// #define SPDLOG_CLOCK_COARSE +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if source location logging is not needed. +// This will prevent spdlog from using __FILE__, __LINE__ and SPDLOG_FUNCTION +// +// #define SPDLOG_NO_SOURCE_LOC +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if thread id logging is not needed (i.e. no %t in the log pattern). +// This will prevent spdlog from querying the thread id on each log call. +// +// WARNING: If the log pattern contains thread id (i.e, %t) while this flag is +// on, zero will be logged as thread id. +// +// #define SPDLOG_NO_THREAD_ID +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent spdlog from using thread local storage. +// +// WARNING: if your program forks, UNCOMMENT this flag to prevent undefined +// thread ids in the children logs. +// +// #define SPDLOG_NO_TLS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to avoid spdlog's usage of atomic log levels +// Use only if your code never modifies a logger's log levels concurrently by +// different threads. +// +// #define SPDLOG_NO_ATOMIC_LEVELS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable usage of wchar_t for file names on Windows. +// +// #define SPDLOG_WCHAR_FILENAMES +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default eol ("\n" or "\r\n" under Linux/Windows) +// +// #define SPDLOG_EOL ";-)\n" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default folder separators ("/" or "\\/" under +// Linux/Windows). Each character in the string is treated as a different +// separator. +// +// #define SPDLOG_FOLDER_SEPS "\\" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use your own copy of the fmt library instead of spdlog's copy. +// In this case spdlog will try to include so set your -I flag +// accordingly. +// +// #define SPDLOG_FMT_EXTERNAL +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use C++20 std::format instead of fmt. +// +// #define SPDLOG_USE_STD_FORMAT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable wchar_t support (convert to utf8) +// +// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent child processes from inheriting log file descriptors +// +// #define SPDLOG_PREVENT_CHILD_FD +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize level names (e.g. "MY TRACE") +// +// #define SPDLOG_LEVEL_NAMES { "MY TRACE", "MY DEBUG", "MY INFO", "MY WARNING", "MY ERROR", "MY CRITICAL", "OFF" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize short level names (e.g. "MT") +// These can be longer than one character. +// +// #define SPDLOG_SHORT_LEVEL_NAMES { "T", "D", "I", "W", "E", "C", "O" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to disable default logger creation. +// This might save some (very) small initialization time if no default logger is needed. +// +// #define SPDLOG_DISABLE_DEFAULT_LOGGER +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment and set to compile time level with zero cost (default is INFO). +// Macros like SPDLOG_DEBUG(..), SPDLOG_INFO(..) will expand to empty statements if not enabled +// +// #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment (and change if desired) macro to use for function names. +// This is compiler dependent. +// __PRETTY_FUNCTION__ might be nicer in clang/gcc, and __FUNCTION__ in msvc. +// Defaults to __FUNCTION__ (should work on all compilers) if not defined. +// +// #ifdef __PRETTY_FUNCTION__ +// # define SPDLOG_FUNCTION __PRETTY_FUNCTION__ +// #else +// # define SPDLOG_FUNCTION __FUNCTION__ +// #endif +/////////////////////////////////////////////////////////////////////////////// diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/spdlog/pattern_formatter-inl.h b/spdlog/pattern_formatter-inl.h new file mode 100644 index 0000000..01afbe6 --- /dev/null +++ b/spdlog/pattern_formatter-inl.h @@ -0,0 +1,1436 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace spdlog { +namespace details { + +/////////////////////////////////////////////////////////////////////// +// name & level pattern appender +/////////////////////////////////////////////////////////////////////// + +class scoped_padder +{ +public: + scoped_padder(size_t wrapped_size, const padding_info &padinfo, memory_buf_t &dest) + : padinfo_(padinfo) + , dest_(dest) + { + remaining_pad_ = static_cast(padinfo.width_) - static_cast(wrapped_size); + if (remaining_pad_ <= 0) + { + return; + } + + if (padinfo_.side_ == padding_info::pad_side::left) + { + pad_it(remaining_pad_); + remaining_pad_ = 0; + } + else if (padinfo_.side_ == padding_info::pad_side::center) + { + auto half_pad = remaining_pad_ / 2; + auto reminder = remaining_pad_ & 1; + pad_it(half_pad); + remaining_pad_ = half_pad + reminder; // for the right side + } + } + + template + static unsigned int count_digits(T n) + { + return fmt_helper::count_digits(n); + } + + ~scoped_padder() + { + if (remaining_pad_ >= 0) + { + pad_it(remaining_pad_); + } + else if (padinfo_.truncate_) + { + long new_size = static_cast(dest_.size()) + remaining_pad_; + dest_.resize(static_cast(new_size)); + } + } + +private: + void pad_it(long count) + { + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); + } + + const padding_info &padinfo_; + memory_buf_t &dest_; + long remaining_pad_; + string_view_t spaces_{" ", 64}; +}; + +struct null_scoped_padder +{ + null_scoped_padder(size_t /*wrapped_size*/, const padding_info & /*padinfo*/, memory_buf_t & /*dest*/) {} + + template + static unsigned int count_digits(T /* number */) + { + return 0; + } +}; + +template +class name_formatter final : public flag_formatter +{ +public: + explicit name_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.logger_name.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.logger_name, dest); + } +}; + +// log level appender +template +class level_formatter final : public flag_formatter +{ +public: + explicit level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const string_view_t &level_name = level::to_string_view(msg.level); + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +// short log level appender +template +class short_level_formatter final : public flag_formatter +{ +public: + explicit short_level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + string_view_t level_name{level::to_short_c_str(msg.level)}; + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +/////////////////////////////////////////////////////////////////////// +// Date time pattern appenders +/////////////////////////////////////////////////////////////////////// + +static const char *ampm(const tm &t) +{ + return t.tm_hour >= 12 ? "PM" : "AM"; +} + +static int to12h(const tm &t) +{ + return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour; +} + +// Abbreviated weekday name +static std::array days{{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}}; + +template +class a_formatter final : public flag_formatter +{ +public: + explicit a_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full weekday name +static std::array full_days{{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}}; + +template +class A_formatter : public flag_formatter +{ +public: + explicit A_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Abbreviated month +static const std::array months{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}}; + +template +class b_formatter final : public flag_formatter +{ +public: + explicit b_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full month name +static const std::array full_months{ + {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}}; + +template +class B_formatter final : public flag_formatter +{ +public: + explicit B_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Date and time representation (Thu Aug 23 15:35:46 2014) +template +class c_formatter final : public flag_formatter +{ +public: + explicit c_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 24; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::append_string_view(days[static_cast(tm_time.tm_wday)], dest); + dest.push_back(' '); + fmt_helper::append_string_view(months[static_cast(tm_time.tm_mon)], dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_mday, dest); + dest.push_back(' '); + // time + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// year - 2 digit +template +class C_formatter final : public flag_formatter +{ +public: + explicit C_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01 +template +class D_formatter final : public flag_formatter +{ +public: + explicit D_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_mday, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// year - 4 digit +template +class Y_formatter final : public flag_formatter +{ +public: + explicit Y_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 4; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// month 1-12 +template +class m_formatter final : public flag_formatter +{ +public: + explicit m_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + } +}; + +// day of month 1-31 +template +class d_formatter final : public flag_formatter +{ +public: + explicit d_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mday, dest); + } +}; + +// hours in 24 format 0-23 +template +class H_formatter final : public flag_formatter +{ +public: + explicit H_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_hour, dest); + } +}; + +// hours in 12 format 1-12 +template +class I_formatter final : public flag_formatter +{ +public: + explicit I_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(to12h(tm_time), dest); + } +}; + +// minutes 0-59 +template +class M_formatter final : public flag_formatter +{ +public: + explicit M_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// seconds 0-59 +template +class S_formatter final : public flag_formatter +{ +public: + explicit S_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// milliseconds +template +class e_formatter final : public flag_formatter +{ +public: + explicit e_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto millis = fmt_helper::time_fraction(msg.time); + const size_t field_size = 3; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad3(static_cast(millis.count()), dest); + } +}; + +// microseconds +template +class f_formatter final : public flag_formatter +{ +public: + explicit f_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto micros = fmt_helper::time_fraction(msg.time); + + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad6(static_cast(micros.count()), dest); + } +}; + +// nanoseconds +template +class F_formatter final : public flag_formatter +{ +public: + explicit F_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto ns = fmt_helper::time_fraction(msg.time); + const size_t field_size = 9; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad9(static_cast(ns.count()), dest); + } +}; + +// seconds since epoch +template +class E_formatter final : public flag_formatter +{ +public: + explicit E_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + auto duration = msg.time.time_since_epoch(); + auto seconds = std::chrono::duration_cast(duration).count(); + fmt_helper::append_int(seconds, dest); + } +}; + +// AM/PM +template +class p_formatter final : public flag_formatter +{ +public: + explicit p_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 12 hour clock 02:55:02 pm +template +class r_formatter final : public flag_formatter +{ +public: + explicit r_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 11; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(to12h(tm_time), dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 24-hour HH:MM time, equivalent to %H:%M +template +class R_formatter final : public flag_formatter +{ +public: + explicit R_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 5; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S +template +class T_formatter final : public flag_formatter +{ +public: + explicit T_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// ISO 8601 offset from UTC in timezone (+-HH:MM) +template +class z_formatter final : public flag_formatter +{ +public: + explicit z_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + z_formatter() = default; + z_formatter(const z_formatter &) = delete; + z_formatter &operator=(const z_formatter &) = delete; + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + + auto total_minutes = get_cached_offset(msg, tm_time); + bool is_negative = total_minutes < 0; + if (is_negative) + { + total_minutes = -total_minutes; + dest.push_back('-'); + } + else + { + dest.push_back('+'); + } + + fmt_helper::pad2(total_minutes / 60, dest); // hours + dest.push_back(':'); + fmt_helper::pad2(total_minutes % 60, dest); // minutes + } + +private: + log_clock::time_point last_update_{std::chrono::seconds(0)}; + int offset_minutes_{0}; + + int get_cached_offset(const log_msg &msg, const std::tm &tm_time) + { + // refresh every 10 seconds + if (msg.time - last_update_ >= std::chrono::seconds(10)) + { + offset_minutes_ = os::utc_minutes_offset(tm_time); + last_update_ = msg.time; + } + return offset_minutes_; + } +}; + +// Thread id +template +class t_formatter final : public flag_formatter +{ +public: + explicit t_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const auto field_size = ScopedPadder::count_digits(msg.thread_id); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.thread_id, dest); + } +}; + +// Current pid +template +class pid_formatter final : public flag_formatter +{ +public: + explicit pid_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + const auto pid = static_cast(details::os::pid()); + auto field_size = ScopedPadder::count_digits(pid); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(pid, dest); + } +}; + +template +class v_formatter final : public flag_formatter +{ +public: + explicit v_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.payload.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.payload, dest); + } +}; + +class ch_formatter final : public flag_formatter +{ +public: + explicit ch_formatter(char ch) + : ch_(ch) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + dest.push_back(ch_); + } + +private: + char ch_; +}; + +// aggregate user chars to display as is +class aggregate_formatter final : public flag_formatter +{ +public: + aggregate_formatter() = default; + + void add_ch(char ch) + { + str_ += ch; + } + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + fmt_helper::append_string_view(str_, dest); + } + +private: + std::string str_; +}; + +// mark the color range. expect it to be in the form of "%^colored text%$" +class color_start_formatter final : public flag_formatter +{ +public: + explicit color_start_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_start = dest.size(); + } +}; + +class color_stop_formatter final : public flag_formatter +{ +public: + explicit color_stop_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_end = dest.size(); + } +}; + +// print source location +template +class source_location_formatter final : public flag_formatter +{ +public: + explicit source_location_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + size_t text_size; + if (padinfo_.enabled()) + { + // calc text size for padding based on "filename:line" + text_size = std::char_traits::length(msg.source.filename) + ScopedPadder::count_digits(msg.source.line) + 1; + } + else + { + text_size = 0; + } + + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source filename +template +class source_filename_formatter final : public flag_formatter +{ +public: + explicit source_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + } +}; + +template +class short_filename_formatter final : public flag_formatter +{ +public: + explicit short_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4127) // consider using 'if constexpr' instead +#endif // _MSC_VER + static const char *basename(const char *filename) + { + // if the size is 2 (1 character + null terminator) we can use the more efficient strrchr + // the branch will be elided by optimizations + if (sizeof(os::folder_seps) == 2) + { + const char *rv = std::strrchr(filename, os::folder_seps[0]); + return rv != nullptr ? rv + 1 : filename; + } + else + { + const std::reverse_iterator begin(filename + std::strlen(filename)); + const std::reverse_iterator end(filename); + + const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1); + return it != end ? it.base() : filename; + } + } +#ifdef _MSC_VER +# pragma warning(pop) +#endif // _MSC_VER + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + auto filename = basename(msg.source.filename); + size_t text_size = padinfo_.enabled() ? std::char_traits::length(filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(filename, dest); + } +}; + +template +class source_linenum_formatter final : public flag_formatter +{ +public: + explicit source_linenum_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + auto field_size = ScopedPadder::count_digits(msg.source.line); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source funcname +template +class source_funcname_formatter final : public flag_formatter +{ +public: + explicit source_funcname_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.funcname) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.funcname, dest); + } +}; + +// print elapsed time since last message +template +class elapsed_formatter final : public flag_formatter +{ +public: + using DurationUnits = Units; + + explicit elapsed_formatter(padding_info padinfo) + : flag_formatter(padinfo) + , last_message_time_(log_clock::now()) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta_units = std::chrono::duration_cast(delta); + last_message_time_ = msg.time; + auto delta_count = static_cast(delta_units.count()); + auto n_digits = static_cast(ScopedPadder::count_digits(delta_count)); + ScopedPadder p(n_digits, padinfo_, dest); + fmt_helper::append_int(delta_count, dest); + } + +private: + log_clock::time_point last_message_time_; +}; + +// Full info formatter +// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v +class full_formatter final : public flag_formatter +{ +public: + explicit full_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + using std::chrono::duration_cast; + using std::chrono::milliseconds; + using std::chrono::seconds; + + // cache the date/time part for the next second. + auto duration = msg.time.time_since_epoch(); + auto secs = duration_cast(duration); + + if (cache_timestamp_ != secs || cached_datetime_.size() == 0) + { + cached_datetime_.clear(); + cached_datetime_.push_back('['); + fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mday, cached_datetime_); + cached_datetime_.push_back(' '); + + fmt_helper::pad2(tm_time.tm_hour, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_min, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_sec, cached_datetime_); + cached_datetime_.push_back('.'); + + cache_timestamp_ = secs; + } + dest.append(cached_datetime_.begin(), cached_datetime_.end()); + + auto millis = fmt_helper::time_fraction(msg.time); + fmt_helper::pad3(static_cast(millis.count()), dest); + dest.push_back(']'); + dest.push_back(' '); + + // append logger name if exists + if (msg.logger_name.size() > 0) + { + dest.push_back('['); + fmt_helper::append_string_view(msg.logger_name, dest); + dest.push_back(']'); + dest.push_back(' '); + } + + dest.push_back('['); + // wrap the level name with color + msg.color_range_start = dest.size(); + // fmt_helper::append_string_view(level::to_c_str(msg.level), dest); + fmt_helper::append_string_view(level::to_string_view(msg.level), dest); + msg.color_range_end = dest.size(); + dest.push_back(']'); + dest.push_back(' '); + + // add source location if present + if (!msg.source.empty()) + { + dest.push_back('['); + const char *filename = details::short_filename_formatter::basename(msg.source.filename); + fmt_helper::append_string_view(filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + dest.push_back(']'); + dest.push_back(' '); + } + // fmt_helper::append_string_view(msg.msg(), dest); + fmt_helper::append_string_view(msg.payload, dest); + } + +private: + std::chrono::seconds cache_timestamp_{0}; + memory_buf_t cached_datetime_; +}; + +} // namespace details + +SPDLOG_INLINE pattern_formatter::pattern_formatter( + std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags) + : pattern_(std::move(pattern)) + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(false) + , last_log_secs_(0) + , custom_handlers_(std::move(custom_user_flags)) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + compile_pattern_(pattern_); +} + +// use by default full formatter for if pattern is not given +SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + : pattern_("%+") + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(true) + , last_log_secs_(0) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + formatters_.push_back(details::make_unique(details::padding_info{})); +} + +SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const +{ + custom_flags cloned_custom_formatters; + for (auto &it : custom_handlers_) + { + cloned_custom_formatters[it.first] = it.second->clone(); + } + auto cloned = details::make_unique(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters)); + cloned->need_localtime(need_localtime_); +#if defined(__GNUC__) && __GNUC__ < 5 + return std::move(cloned); +#else + return cloned; +#endif +} + +SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest) +{ + if (need_localtime_) + { + const auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); + if (secs != last_log_secs_) + { + cached_tm_ = get_time_(msg); + last_log_secs_ = secs; + } + } + + for (auto &f : formatters_) + { + f->format(msg, cached_tm_, dest); + } + // write eol + details::fmt_helper::append_string_view(eol_, dest); +} + +SPDLOG_INLINE void pattern_formatter::set_pattern(std::string pattern) +{ + pattern_ = std::move(pattern); + need_localtime_ = false; + compile_pattern_(pattern_); +} + +SPDLOG_INLINE void pattern_formatter::need_localtime(bool need) +{ + need_localtime_ = need; +} + +SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) +{ + if (pattern_time_type_ == pattern_time_type::local) + { + return details::os::localtime(log_clock::to_time_t(msg.time)); + } + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} + +template +SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) +{ + // process custom flags + auto it = custom_handlers_.find(flag); + if (it != custom_handlers_.end()) + { + auto custom_handler = it->second->clone(); + custom_handler->set_padding_info(padding); + formatters_.push_back(std::move(custom_handler)); + return; + } + + // process built-in flags + switch (flag) + { + case ('+'): // default formatter + formatters_.push_back(details::make_unique(padding)); + need_localtime_ = true; + break; + + case 'n': // logger name + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'l': // level + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'L': // short level + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('t'): // thread id + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('v'): // the message text + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('a'): // weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('A'): // short weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('b'): + case ('h'): // month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('B'): // short month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('c'): // datetime + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('C'): // year 2 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('Y'): // year 4 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('D'): + case ('x'): // datetime MM/DD/YY + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('m'): // month 1-12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('d'): // day of month 1-31 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('H'): // hours 24 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('I'): // hours 12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('M'): // minutes + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('S'): // seconds + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('e'): // milliseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('f'): // microseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('F'): // nanoseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('E'): // seconds since epoch + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('p'): // am/pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('r'): // 12 hour clock 02:55:02 pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('R'): // 24-hour HH:MM time + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('T'): + case ('X'): // ISO 8601 time format (HH:MM:SS) + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('z'): // timezone + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('P'): // pid + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('^'): // color range start + formatters_.push_back(details::make_unique(padding)); + break; + + case ('$'): // color range end + formatters_.push_back(details::make_unique(padding)); + break; + + case ('@'): // source location (filename:filenumber) + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('s'): // short source filename - without directory name + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('g'): // full source filename + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('#'): // source line number + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('!'): // source funcname + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('%'): // % char + formatters_.push_back(details::make_unique('%')); + break; + + case ('u'): // elapsed time since last log message in nanos + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('i'): // elapsed time since last log message in micros + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('o'): // elapsed time since last log message in millis + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('O'): // elapsed time since last log message in seconds + formatters_.push_back(details::make_unique>(padding)); + break; + + default: // Unknown flag appears as is + auto unknown_flag = details::make_unique(); + + if (!padding.truncate_) + { + unknown_flag->add_ch('%'); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + // fix issue #1617 (prev char was '!' and should have been treated as funcname flag instead of truncating flag) + // spdlog::set_pattern("[%10!] %v") => "[ main] some message" + // spdlog::set_pattern("[%3!!] %v") => "[mai] some message" + else + { + padding.truncate_ = false; + formatters_.push_back(details::make_unique>(padding)); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + + break; + } +} + +// Extract given pad spec (e.g. %8X, %=8X, %-8!X, %8!X, %=8!X, %-8!X, %+8!X) +// Advance the given it pass the end of the padding spec found (if any) +// Return padding. +SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) +{ + using details::padding_info; + using details::scoped_padder; + const size_t max_width = 64; + if (it == end) + { + return padding_info{}; + } + + padding_info::pad_side side; + switch (*it) + { + case '-': + side = padding_info::pad_side::right; + ++it; + break; + case '=': + side = padding_info::pad_side::center; + ++it; + break; + default: + side = details::padding_info::pad_side::left; + break; + } + + if (it == end || !std::isdigit(static_cast(*it))) + { + return padding_info{}; // no padding if no digit found here + } + + auto width = static_cast(*it) - '0'; + for (++it; it != end && std::isdigit(static_cast(*it)); ++it) + { + auto digit = static_cast(*it) - '0'; + width = width * 10 + digit; + } + + // search for the optional truncate marker '!' + bool truncate; + if (it != end && *it == '!') + { + truncate = true; + ++it; + } + else + { + truncate = false; + } + return details::padding_info{std::min(width, max_width), side, truncate}; +} + +SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) +{ + auto end = pattern.end(); + std::unique_ptr user_chars; + formatters_.clear(); + for (auto it = pattern.begin(); it != end; ++it) + { + if (*it == '%') + { + if (user_chars) // append user chars found so far + { + formatters_.push_back(std::move(user_chars)); + } + + auto padding = handle_padspec_(++it, end); + + if (it != end) + { + if (padding.enabled()) + { + handle_flag_(*it, padding); + } + else + { + handle_flag_(*it, padding); + } + } + else + { + break; + } + } + else // chars not following the % sign should be displayed as is + { + if (!user_chars) + { + user_chars = details::make_unique(); + } + user_chars->add_ch(*it); + } + } + if (user_chars) // append raw chars found so far + { + formatters_.push_back(std::move(user_chars)); + } +} +} // namespace spdlog diff --git a/spdlog/pattern_formatter.h b/spdlog/pattern_formatter.h new file mode 100644 index 0000000..acf1c53 --- /dev/null +++ b/spdlog/pattern_formatter.h @@ -0,0 +1,128 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { +namespace details { + +// padding information. +struct padding_info +{ + enum class pad_side + { + left, + right, + center + }; + + padding_info() = default; + padding_info(size_t width, padding_info::pad_side side, bool truncate) + : width_(width) + , side_(side) + , truncate_(truncate) + , enabled_(true) + {} + + bool enabled() const + { + return enabled_; + } + size_t width_ = 0; + pad_side side_ = pad_side::left; + bool truncate_ = false; + bool enabled_ = false; +}; + +class SPDLOG_API flag_formatter +{ +public: + explicit flag_formatter(padding_info padinfo) + : padinfo_(padinfo) + {} + flag_formatter() = default; + virtual ~flag_formatter() = default; + virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0; + +protected: + padding_info padinfo_; +}; + +} // namespace details + +class SPDLOG_API custom_flag_formatter : public details::flag_formatter +{ +public: + virtual std::unique_ptr clone() const = 0; + + void set_padding_info(const details::padding_info &padding) + { + flag_formatter::padinfo_ = padding; + } +}; + +class SPDLOG_API pattern_formatter final : public formatter +{ +public: + using custom_flags = std::unordered_map>; + + explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local, + std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags()); + + // use default pattern is not given + explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol); + + pattern_formatter(const pattern_formatter &other) = delete; + pattern_formatter &operator=(const pattern_formatter &other) = delete; + + std::unique_ptr clone() const override; + void format(const details::log_msg &msg, memory_buf_t &dest) override; + + template + pattern_formatter &add_flag(char flag, Args &&... args) + { + custom_handlers_[flag] = details::make_unique(std::forward(args)...); + return *this; + } + void set_pattern(std::string pattern); + void need_localtime(bool need = true); + +private: + std::string pattern_; + std::string eol_; + pattern_time_type pattern_time_type_; + bool need_localtime_; + std::tm cached_tm_; + std::chrono::seconds last_log_secs_; + std::vector> formatters_; + custom_flags custom_handlers_; + + std::tm get_time_(const details::log_msg &msg); + template + void handle_flag_(char flag, details::padding_info padding); + + // Extract given pad spec (e.g. %8X) + // Advance the given it pass the end of the padding spec found (if any) + // Return padding. + static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end); + + void compile_pattern_(const std::string &pattern); +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "pattern_formatter-inl.h" +#endif diff --git a/spdlog/spdlog-inl.h b/spdlog/spdlog-inl.h new file mode 100644 index 0000000..708399c --- /dev/null +++ b/spdlog/spdlog-inl.h @@ -0,0 +1,120 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { + +SPDLOG_INLINE void initialize_logger(std::shared_ptr logger) +{ + details::registry::instance().initialize_logger(std::move(logger)); +} + +SPDLOG_INLINE std::shared_ptr get(const std::string &name) +{ + return details::registry::instance().get(name); +} + +SPDLOG_INLINE void set_formatter(std::unique_ptr formatter) +{ + details::registry::instance().set_formatter(std::move(formatter)); +} + +SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type) +{ + set_formatter(std::unique_ptr(new pattern_formatter(std::move(pattern), time_type))); +} + +SPDLOG_INLINE void enable_backtrace(size_t n_messages) +{ + details::registry::instance().enable_backtrace(n_messages); +} + +SPDLOG_INLINE void disable_backtrace() +{ + details::registry::instance().disable_backtrace(); +} + +SPDLOG_INLINE void dump_backtrace() +{ + default_logger_raw()->dump_backtrace(); +} + +SPDLOG_INLINE level::level_enum get_level() +{ + return default_logger_raw()->level(); +} + +SPDLOG_INLINE bool should_log(level::level_enum log_level) +{ + return default_logger_raw()->should_log(log_level); +} + +SPDLOG_INLINE void set_level(level::level_enum log_level) +{ + details::registry::instance().set_level(log_level); +} + +SPDLOG_INLINE void flush_on(level::level_enum log_level) +{ + details::registry::instance().flush_on(log_level); +} + +SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg)) +{ + details::registry::instance().set_error_handler(handler); +} + +SPDLOG_INLINE void register_logger(std::shared_ptr logger) +{ + details::registry::instance().register_logger(std::move(logger)); +} + +SPDLOG_INLINE void apply_all(const std::function)> &fun) +{ + details::registry::instance().apply_all(fun); +} + +SPDLOG_INLINE void drop(const std::string &name) +{ + details::registry::instance().drop(name); +} + +SPDLOG_INLINE void drop_all() +{ + details::registry::instance().drop_all(); +} + +SPDLOG_INLINE void shutdown() +{ + details::registry::instance().shutdown(); +} + +SPDLOG_INLINE void set_automatic_registration(bool automatic_registration) +{ + details::registry::instance().set_automatic_registration(automatic_registration); +} + +SPDLOG_INLINE std::shared_ptr default_logger() +{ + return details::registry::instance().default_logger(); +} + +SPDLOG_INLINE spdlog::logger *default_logger_raw() +{ + return details::registry::instance().get_default_raw(); +} + +SPDLOG_INLINE void set_default_logger(std::shared_ptr default_logger) +{ + details::registry::instance().set_default_logger(std::move(default_logger)); +} + +} // namespace spdlog diff --git a/spdlog/spdlog.h b/spdlog/spdlog.h new file mode 100644 index 0000000..ee83e8d --- /dev/null +++ b/spdlog/spdlog.h @@ -0,0 +1,354 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +// spdlog main header file. +// see example.cpp for usage example + +#ifndef SPDLOG_H +#define SPDLOG_H + +#pragma once + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +namespace spdlog { + +using default_factory = synchronous_factory; + +// Create and register a logger with a templated sink type +// The logger's level, formatter and flush level will be set according the +// global settings. +// +// Example: +// spdlog::create("logger_name", "dailylog_filename", 11, 59); +template +inline std::shared_ptr create(std::string logger_name, SinkArgs &&... sink_args) +{ + return default_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +// Initialize and register a logger, +// formatter and flush level will be set according the global settings. +// +// Useful for initializing manually created loggers with the global settings. +// +// Example: +// auto mylogger = std::make_shared("mylogger", ...); +// spdlog::initialize_logger(mylogger); +SPDLOG_API void initialize_logger(std::shared_ptr logger); + +// Return an existing logger or nullptr if a logger with such name doesn't +// exist. +// example: spdlog::get("my_logger")->info("hello {}", "world"); +SPDLOG_API std::shared_ptr get(const std::string &name); + +// Set global formatter. Each sink in each logger will get a clone of this object +SPDLOG_API void set_formatter(std::unique_ptr formatter); + +// Set global format string. +// example: spdlog::set_pattern("%Y-%m-%d %H:%M:%S.%e %l : %v"); +SPDLOG_API void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + +// enable global backtrace support +SPDLOG_API void enable_backtrace(size_t n_messages); + +// disable global backtrace support +SPDLOG_API void disable_backtrace(); + +// call dump backtrace on default logger +SPDLOG_API void dump_backtrace(); + +// Get global logging level +SPDLOG_API level::level_enum get_level(); + +// Set global logging level +SPDLOG_API void set_level(level::level_enum log_level); + +// Determine whether the default logger should log messages with a certain level +SPDLOG_API bool should_log(level::level_enum lvl); + +// Set global flush level +SPDLOG_API void flush_on(level::level_enum log_level); + +// Start/Restart a periodic flusher thread +// Warning: Use only if all your loggers are thread safe! +template +inline void flush_every(std::chrono::duration interval) +{ + details::registry::instance().flush_every(interval); +} + +// Set global error handler +SPDLOG_API void set_error_handler(void (*handler)(const std::string &msg)); + +// Register the given logger with the given name +SPDLOG_API void register_logger(std::shared_ptr logger); + +// Apply a user defined function on all registered loggers +// Example: +// spdlog::apply_all([&](std::shared_ptr l) {l->flush();}); +SPDLOG_API void apply_all(const std::function)> &fun); + +// Drop the reference to the given logger +SPDLOG_API void drop(const std::string &name); + +// Drop all references from the registry +SPDLOG_API void drop_all(); + +// stop any running threads started by spdlog and clean registry loggers +SPDLOG_API void shutdown(); + +// Automatic registration of loggers when using spdlog::create() or spdlog::create_async +SPDLOG_API void set_automatic_registration(bool automatic_registration); + +// API for using default logger (stdout_color_mt), +// e.g: spdlog::info("Message {}", 1); +// +// The default logger object can be accessed using the spdlog::default_logger(): +// For example, to add another sink to it: +// spdlog::default_logger()->sinks().push_back(some_sink); +// +// The default logger can replaced using spdlog::set_default_logger(new_logger). +// For example, to replace it with a file logger. +// +// IMPORTANT: +// The default API is thread safe (for _mt loggers), but: +// set_default_logger() *should not* be used concurrently with the default API. +// e.g do not call set_default_logger() from one thread while calling spdlog::info() from another. + +SPDLOG_API std::shared_ptr default_logger(); + +SPDLOG_API spdlog::logger *default_logger_raw(); + +SPDLOG_API void set_default_logger(std::shared_ptr default_logger); + +template +inline void log(source_loc source, level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} + +template +inline void log(source_loc source, level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(source, lvl, msg); +} + +template +inline void log(level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(lvl, msg); +} + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +template +inline void log(source_loc source, level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} +#endif + +template +inline void trace(const T &msg) +{ + default_logger_raw()->trace(msg); +} + +template +inline void debug(const T &msg) +{ + default_logger_raw()->debug(msg); +} + +template +inline void info(const T &msg) +{ + default_logger_raw()->info(msg); +} + +template +inline void warn(const T &msg) +{ + default_logger_raw()->warn(msg); +} + +template +inline void error(const T &msg) +{ + default_logger_raw()->error(msg); +} + +template +inline void critical(const T &msg) +{ + default_logger_raw()->critical(msg); +} + +} // namespace spdlog + +// +// enable/disable log calls at compile time according to global level. +// +// define SPDLOG_ACTIVE_LEVEL to one of those (before including spdlog.h): +// SPDLOG_LEVEL_TRACE, +// SPDLOG_LEVEL_DEBUG, +// SPDLOG_LEVEL_INFO, +// SPDLOG_LEVEL_WARN, +// SPDLOG_LEVEL_ERROR, +// SPDLOG_LEVEL_CRITICAL, +// SPDLOG_LEVEL_OFF +// + +#ifndef SPDLOG_NO_SOURCE_LOC +# define SPDLOG_LOGGER_CALL(logger, level, ...) \ + (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CALL(logger, level, ...) (logger)->log(spdlog::source_loc{}, level, __VA_ARGS__) +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE +# define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__) +# define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_TRACE(logger, ...) (void)0 +# define SPDLOG_TRACE(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_DEBUG +# define SPDLOG_LOGGER_DEBUG(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::debug, __VA_ARGS__) +# define SPDLOG_DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_DEBUG(logger, ...) (void)0 +# define SPDLOG_DEBUG(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_INFO +# define SPDLOG_LOGGER_INFO(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::info, __VA_ARGS__) +# define SPDLOG_INFO(...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_INFO(logger, ...) (void)0 +# define SPDLOG_INFO(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_WARN +# define SPDLOG_LOGGER_WARN(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::warn, __VA_ARGS__) +# define SPDLOG_WARN(...) SPDLOG_LOGGER_WARN(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_WARN(logger, ...) (void)0 +# define SPDLOG_WARN(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_ERROR +# define SPDLOG_LOGGER_ERROR(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::err, __VA_ARGS__) +# define SPDLOG_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_ERROR(logger, ...) (void)0 +# define SPDLOG_ERROR(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_CRITICAL +# define SPDLOG_LOGGER_CRITICAL(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::critical, __VA_ARGS__) +# define SPDLOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CRITICAL(logger, ...) (void)0 +# define SPDLOG_CRITICAL(...) (void)0 +#endif + +#ifdef SPDLOG_HEADER_ONLY +# include "spdlog-inl.h" +#endif + +#endif // SPDLOG_H diff --git a/spdlog/stopwatch.h b/spdlog/stopwatch.h new file mode 100644 index 0000000..5d1f2dc --- /dev/null +++ b/spdlog/stopwatch.h @@ -0,0 +1,69 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +// Stopwatch support for spdlog (using std::chrono::steady_clock). +// Displays elapsed seconds since construction as double. +// +// Usage: +// +// spdlog::stopwatch sw; +// ... +// spdlog::debug("Elapsed: {} seconds", sw); => "Elapsed 0.005116733 seconds" +// spdlog::info("Elapsed: {:.6} seconds", sw); => "Elapsed 0.005163 seconds" +// +// +// If other units are needed (e.g. millis instead of double), include "fmt/chrono.h" and use "duration_cast<..>(sw.elapsed())": +// +// #include +//.. +// using std::chrono::duration_cast; +// using std::chrono::milliseconds; +// spdlog::info("Elapsed {}", duration_cast(sw.elapsed())); => "Elapsed 5ms" + +namespace spdlog { +class stopwatch +{ + using clock = std::chrono::steady_clock; + std::chrono::time_point start_tp_; + +public: + stopwatch() + : start_tp_{clock::now()} + {} + + std::chrono::duration elapsed() const + { + return std::chrono::duration(clock::now() - start_tp_); + } + + void reset() + { + start_tp_ = clock::now(); + } +}; +} // namespace spdlog + +// Support for fmt formatting (e.g. "{:012.9}" or just "{}") +namespace +#ifdef SPDLOG_USE_STD_FORMAT + std +#else + fmt +#endif +{ + +template<> +struct formatter : formatter +{ + template + auto format(const spdlog::stopwatch &sw, FormatContext &ctx) -> decltype(ctx.out()) + { + return formatter::format(sw.elapsed().count(), ctx); + } +}; +} // namespace std diff --git a/spdlog/tweakme.h b/spdlog/tweakme.h new file mode 100644 index 0000000..5bcb5ff --- /dev/null +++ b/spdlog/tweakme.h @@ -0,0 +1,140 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +/////////////////////////////////////////////////////////////////////////////// +// +// Edit this file to squeeze more performance, and to customize supported +// features +// +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Under Linux, the much faster CLOCK_REALTIME_COARSE clock can be used. +// This clock is less accurate - can be off by dozens of millis - depending on +// the kernel HZ. +// Uncomment to use it instead of the regular clock. +// +// #define SPDLOG_CLOCK_COARSE +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if source location logging is not needed. +// This will prevent spdlog from using __FILE__, __LINE__ and SPDLOG_FUNCTION +// +// #define SPDLOG_NO_SOURCE_LOC +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if thread id logging is not needed (i.e. no %t in the log pattern). +// This will prevent spdlog from querying the thread id on each log call. +// +// WARNING: If the log pattern contains thread id (i.e, %t) while this flag is +// on, zero will be logged as thread id. +// +// #define SPDLOG_NO_THREAD_ID +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent spdlog from using thread local storage. +// +// WARNING: if your program forks, UNCOMMENT this flag to prevent undefined +// thread ids in the children logs. +// +// #define SPDLOG_NO_TLS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to avoid spdlog's usage of atomic log levels +// Use only if your code never modifies a logger's log levels concurrently by +// different threads. +// +// #define SPDLOG_NO_ATOMIC_LEVELS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable usage of wchar_t for file names on Windows. +// +// #define SPDLOG_WCHAR_FILENAMES +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default eol ("\n" or "\r\n" under Linux/Windows) +// +// #define SPDLOG_EOL ";-)\n" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default folder separators ("/" or "\\/" under +// Linux/Windows). Each character in the string is treated as a different +// separator. +// +// #define SPDLOG_FOLDER_SEPS "\\" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use your own copy of the fmt library instead of spdlog's copy. +// In this case spdlog will try to include so set your -I flag +// accordingly. +// +// #define SPDLOG_FMT_EXTERNAL +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use C++20 std::format instead of fmt. +// +// #define SPDLOG_USE_STD_FORMAT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable wchar_t support (convert to utf8) +// +// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent child processes from inheriting log file descriptors +// +// #define SPDLOG_PREVENT_CHILD_FD +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize level names (e.g. "MY TRACE") +// +// #define SPDLOG_LEVEL_NAMES { "MY TRACE", "MY DEBUG", "MY INFO", "MY WARNING", "MY ERROR", "MY CRITICAL", "OFF" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize short level names (e.g. "MT") +// These can be longer than one character. +// +// #define SPDLOG_SHORT_LEVEL_NAMES { "T", "D", "I", "W", "E", "C", "O" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to disable default logger creation. +// This might save some (very) small initialization time if no default logger is needed. +// +// #define SPDLOG_DISABLE_DEFAULT_LOGGER +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment and set to compile time level with zero cost (default is INFO). +// Macros like SPDLOG_DEBUG(..), SPDLOG_INFO(..) will expand to empty statements if not enabled +// +// #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment (and change if desired) macro to use for function names. +// This is compiler dependent. +// __PRETTY_FUNCTION__ might be nicer in clang/gcc, and __FUNCTION__ in msvc. +// Defaults to __FUNCTION__ (should work on all compilers) if not defined. +// +// #ifdef __PRETTY_FUNCTION__ +// # define SPDLOG_FUNCTION __PRETTY_FUNCTION__ +// #else +// # define SPDLOG_FUNCTION __FUNCTION__ +// #endif +/////////////////////////////////////////////////////////////////////////////// diff --git a/spdlog/version.h b/spdlog/version.h new file mode 100644 index 0000000..5717bea --- /dev/null +++ b/spdlog/version.h @@ -0,0 +1,10 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#define SPDLOG_VER_MAJOR 1 +#define SPDLOG_VER_MINOR 11 +#define SPDLOG_VER_PATCH 0 + +#define SPDLOG_VERSION (SPDLOG_VER_MAJOR * 10000 + SPDLOG_VER_MINOR * 100 + SPDLOG_VER_PATCH) diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/spdlog/pattern_formatter-inl.h b/spdlog/pattern_formatter-inl.h new file mode 100644 index 0000000..01afbe6 --- /dev/null +++ b/spdlog/pattern_formatter-inl.h @@ -0,0 +1,1436 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace spdlog { +namespace details { + +/////////////////////////////////////////////////////////////////////// +// name & level pattern appender +/////////////////////////////////////////////////////////////////////// + +class scoped_padder +{ +public: + scoped_padder(size_t wrapped_size, const padding_info &padinfo, memory_buf_t &dest) + : padinfo_(padinfo) + , dest_(dest) + { + remaining_pad_ = static_cast(padinfo.width_) - static_cast(wrapped_size); + if (remaining_pad_ <= 0) + { + return; + } + + if (padinfo_.side_ == padding_info::pad_side::left) + { + pad_it(remaining_pad_); + remaining_pad_ = 0; + } + else if (padinfo_.side_ == padding_info::pad_side::center) + { + auto half_pad = remaining_pad_ / 2; + auto reminder = remaining_pad_ & 1; + pad_it(half_pad); + remaining_pad_ = half_pad + reminder; // for the right side + } + } + + template + static unsigned int count_digits(T n) + { + return fmt_helper::count_digits(n); + } + + ~scoped_padder() + { + if (remaining_pad_ >= 0) + { + pad_it(remaining_pad_); + } + else if (padinfo_.truncate_) + { + long new_size = static_cast(dest_.size()) + remaining_pad_; + dest_.resize(static_cast(new_size)); + } + } + +private: + void pad_it(long count) + { + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); + } + + const padding_info &padinfo_; + memory_buf_t &dest_; + long remaining_pad_; + string_view_t spaces_{" ", 64}; +}; + +struct null_scoped_padder +{ + null_scoped_padder(size_t /*wrapped_size*/, const padding_info & /*padinfo*/, memory_buf_t & /*dest*/) {} + + template + static unsigned int count_digits(T /* number */) + { + return 0; + } +}; + +template +class name_formatter final : public flag_formatter +{ +public: + explicit name_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.logger_name.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.logger_name, dest); + } +}; + +// log level appender +template +class level_formatter final : public flag_formatter +{ +public: + explicit level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const string_view_t &level_name = level::to_string_view(msg.level); + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +// short log level appender +template +class short_level_formatter final : public flag_formatter +{ +public: + explicit short_level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + string_view_t level_name{level::to_short_c_str(msg.level)}; + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +/////////////////////////////////////////////////////////////////////// +// Date time pattern appenders +/////////////////////////////////////////////////////////////////////// + +static const char *ampm(const tm &t) +{ + return t.tm_hour >= 12 ? "PM" : "AM"; +} + +static int to12h(const tm &t) +{ + return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour; +} + +// Abbreviated weekday name +static std::array days{{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}}; + +template +class a_formatter final : public flag_formatter +{ +public: + explicit a_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full weekday name +static std::array full_days{{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}}; + +template +class A_formatter : public flag_formatter +{ +public: + explicit A_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Abbreviated month +static const std::array months{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}}; + +template +class b_formatter final : public flag_formatter +{ +public: + explicit b_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full month name +static const std::array full_months{ + {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}}; + +template +class B_formatter final : public flag_formatter +{ +public: + explicit B_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Date and time representation (Thu Aug 23 15:35:46 2014) +template +class c_formatter final : public flag_formatter +{ +public: + explicit c_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 24; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::append_string_view(days[static_cast(tm_time.tm_wday)], dest); + dest.push_back(' '); + fmt_helper::append_string_view(months[static_cast(tm_time.tm_mon)], dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_mday, dest); + dest.push_back(' '); + // time + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// year - 2 digit +template +class C_formatter final : public flag_formatter +{ +public: + explicit C_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01 +template +class D_formatter final : public flag_formatter +{ +public: + explicit D_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_mday, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// year - 4 digit +template +class Y_formatter final : public flag_formatter +{ +public: + explicit Y_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 4; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// month 1-12 +template +class m_formatter final : public flag_formatter +{ +public: + explicit m_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + } +}; + +// day of month 1-31 +template +class d_formatter final : public flag_formatter +{ +public: + explicit d_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mday, dest); + } +}; + +// hours in 24 format 0-23 +template +class H_formatter final : public flag_formatter +{ +public: + explicit H_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_hour, dest); + } +}; + +// hours in 12 format 1-12 +template +class I_formatter final : public flag_formatter +{ +public: + explicit I_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(to12h(tm_time), dest); + } +}; + +// minutes 0-59 +template +class M_formatter final : public flag_formatter +{ +public: + explicit M_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// seconds 0-59 +template +class S_formatter final : public flag_formatter +{ +public: + explicit S_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// milliseconds +template +class e_formatter final : public flag_formatter +{ +public: + explicit e_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto millis = fmt_helper::time_fraction(msg.time); + const size_t field_size = 3; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad3(static_cast(millis.count()), dest); + } +}; + +// microseconds +template +class f_formatter final : public flag_formatter +{ +public: + explicit f_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto micros = fmt_helper::time_fraction(msg.time); + + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad6(static_cast(micros.count()), dest); + } +}; + +// nanoseconds +template +class F_formatter final : public flag_formatter +{ +public: + explicit F_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto ns = fmt_helper::time_fraction(msg.time); + const size_t field_size = 9; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad9(static_cast(ns.count()), dest); + } +}; + +// seconds since epoch +template +class E_formatter final : public flag_formatter +{ +public: + explicit E_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + auto duration = msg.time.time_since_epoch(); + auto seconds = std::chrono::duration_cast(duration).count(); + fmt_helper::append_int(seconds, dest); + } +}; + +// AM/PM +template +class p_formatter final : public flag_formatter +{ +public: + explicit p_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 12 hour clock 02:55:02 pm +template +class r_formatter final : public flag_formatter +{ +public: + explicit r_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 11; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(to12h(tm_time), dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 24-hour HH:MM time, equivalent to %H:%M +template +class R_formatter final : public flag_formatter +{ +public: + explicit R_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 5; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S +template +class T_formatter final : public flag_formatter +{ +public: + explicit T_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// ISO 8601 offset from UTC in timezone (+-HH:MM) +template +class z_formatter final : public flag_formatter +{ +public: + explicit z_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + z_formatter() = default; + z_formatter(const z_formatter &) = delete; + z_formatter &operator=(const z_formatter &) = delete; + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + + auto total_minutes = get_cached_offset(msg, tm_time); + bool is_negative = total_minutes < 0; + if (is_negative) + { + total_minutes = -total_minutes; + dest.push_back('-'); + } + else + { + dest.push_back('+'); + } + + fmt_helper::pad2(total_minutes / 60, dest); // hours + dest.push_back(':'); + fmt_helper::pad2(total_minutes % 60, dest); // minutes + } + +private: + log_clock::time_point last_update_{std::chrono::seconds(0)}; + int offset_minutes_{0}; + + int get_cached_offset(const log_msg &msg, const std::tm &tm_time) + { + // refresh every 10 seconds + if (msg.time - last_update_ >= std::chrono::seconds(10)) + { + offset_minutes_ = os::utc_minutes_offset(tm_time); + last_update_ = msg.time; + } + return offset_minutes_; + } +}; + +// Thread id +template +class t_formatter final : public flag_formatter +{ +public: + explicit t_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const auto field_size = ScopedPadder::count_digits(msg.thread_id); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.thread_id, dest); + } +}; + +// Current pid +template +class pid_formatter final : public flag_formatter +{ +public: + explicit pid_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + const auto pid = static_cast(details::os::pid()); + auto field_size = ScopedPadder::count_digits(pid); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(pid, dest); + } +}; + +template +class v_formatter final : public flag_formatter +{ +public: + explicit v_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.payload.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.payload, dest); + } +}; + +class ch_formatter final : public flag_formatter +{ +public: + explicit ch_formatter(char ch) + : ch_(ch) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + dest.push_back(ch_); + } + +private: + char ch_; +}; + +// aggregate user chars to display as is +class aggregate_formatter final : public flag_formatter +{ +public: + aggregate_formatter() = default; + + void add_ch(char ch) + { + str_ += ch; + } + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + fmt_helper::append_string_view(str_, dest); + } + +private: + std::string str_; +}; + +// mark the color range. expect it to be in the form of "%^colored text%$" +class color_start_formatter final : public flag_formatter +{ +public: + explicit color_start_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_start = dest.size(); + } +}; + +class color_stop_formatter final : public flag_formatter +{ +public: + explicit color_stop_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_end = dest.size(); + } +}; + +// print source location +template +class source_location_formatter final : public flag_formatter +{ +public: + explicit source_location_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + size_t text_size; + if (padinfo_.enabled()) + { + // calc text size for padding based on "filename:line" + text_size = std::char_traits::length(msg.source.filename) + ScopedPadder::count_digits(msg.source.line) + 1; + } + else + { + text_size = 0; + } + + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source filename +template +class source_filename_formatter final : public flag_formatter +{ +public: + explicit source_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + } +}; + +template +class short_filename_formatter final : public flag_formatter +{ +public: + explicit short_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4127) // consider using 'if constexpr' instead +#endif // _MSC_VER + static const char *basename(const char *filename) + { + // if the size is 2 (1 character + null terminator) we can use the more efficient strrchr + // the branch will be elided by optimizations + if (sizeof(os::folder_seps) == 2) + { + const char *rv = std::strrchr(filename, os::folder_seps[0]); + return rv != nullptr ? rv + 1 : filename; + } + else + { + const std::reverse_iterator begin(filename + std::strlen(filename)); + const std::reverse_iterator end(filename); + + const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1); + return it != end ? it.base() : filename; + } + } +#ifdef _MSC_VER +# pragma warning(pop) +#endif // _MSC_VER + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + auto filename = basename(msg.source.filename); + size_t text_size = padinfo_.enabled() ? std::char_traits::length(filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(filename, dest); + } +}; + +template +class source_linenum_formatter final : public flag_formatter +{ +public: + explicit source_linenum_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + auto field_size = ScopedPadder::count_digits(msg.source.line); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source funcname +template +class source_funcname_formatter final : public flag_formatter +{ +public: + explicit source_funcname_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.funcname) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.funcname, dest); + } +}; + +// print elapsed time since last message +template +class elapsed_formatter final : public flag_formatter +{ +public: + using DurationUnits = Units; + + explicit elapsed_formatter(padding_info padinfo) + : flag_formatter(padinfo) + , last_message_time_(log_clock::now()) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta_units = std::chrono::duration_cast(delta); + last_message_time_ = msg.time; + auto delta_count = static_cast(delta_units.count()); + auto n_digits = static_cast(ScopedPadder::count_digits(delta_count)); + ScopedPadder p(n_digits, padinfo_, dest); + fmt_helper::append_int(delta_count, dest); + } + +private: + log_clock::time_point last_message_time_; +}; + +// Full info formatter +// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v +class full_formatter final : public flag_formatter +{ +public: + explicit full_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + using std::chrono::duration_cast; + using std::chrono::milliseconds; + using std::chrono::seconds; + + // cache the date/time part for the next second. + auto duration = msg.time.time_since_epoch(); + auto secs = duration_cast(duration); + + if (cache_timestamp_ != secs || cached_datetime_.size() == 0) + { + cached_datetime_.clear(); + cached_datetime_.push_back('['); + fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mday, cached_datetime_); + cached_datetime_.push_back(' '); + + fmt_helper::pad2(tm_time.tm_hour, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_min, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_sec, cached_datetime_); + cached_datetime_.push_back('.'); + + cache_timestamp_ = secs; + } + dest.append(cached_datetime_.begin(), cached_datetime_.end()); + + auto millis = fmt_helper::time_fraction(msg.time); + fmt_helper::pad3(static_cast(millis.count()), dest); + dest.push_back(']'); + dest.push_back(' '); + + // append logger name if exists + if (msg.logger_name.size() > 0) + { + dest.push_back('['); + fmt_helper::append_string_view(msg.logger_name, dest); + dest.push_back(']'); + dest.push_back(' '); + } + + dest.push_back('['); + // wrap the level name with color + msg.color_range_start = dest.size(); + // fmt_helper::append_string_view(level::to_c_str(msg.level), dest); + fmt_helper::append_string_view(level::to_string_view(msg.level), dest); + msg.color_range_end = dest.size(); + dest.push_back(']'); + dest.push_back(' '); + + // add source location if present + if (!msg.source.empty()) + { + dest.push_back('['); + const char *filename = details::short_filename_formatter::basename(msg.source.filename); + fmt_helper::append_string_view(filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + dest.push_back(']'); + dest.push_back(' '); + } + // fmt_helper::append_string_view(msg.msg(), dest); + fmt_helper::append_string_view(msg.payload, dest); + } + +private: + std::chrono::seconds cache_timestamp_{0}; + memory_buf_t cached_datetime_; +}; + +} // namespace details + +SPDLOG_INLINE pattern_formatter::pattern_formatter( + std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags) + : pattern_(std::move(pattern)) + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(false) + , last_log_secs_(0) + , custom_handlers_(std::move(custom_user_flags)) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + compile_pattern_(pattern_); +} + +// use by default full formatter for if pattern is not given +SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + : pattern_("%+") + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(true) + , last_log_secs_(0) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + formatters_.push_back(details::make_unique(details::padding_info{})); +} + +SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const +{ + custom_flags cloned_custom_formatters; + for (auto &it : custom_handlers_) + { + cloned_custom_formatters[it.first] = it.second->clone(); + } + auto cloned = details::make_unique(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters)); + cloned->need_localtime(need_localtime_); +#if defined(__GNUC__) && __GNUC__ < 5 + return std::move(cloned); +#else + return cloned; +#endif +} + +SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest) +{ + if (need_localtime_) + { + const auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); + if (secs != last_log_secs_) + { + cached_tm_ = get_time_(msg); + last_log_secs_ = secs; + } + } + + for (auto &f : formatters_) + { + f->format(msg, cached_tm_, dest); + } + // write eol + details::fmt_helper::append_string_view(eol_, dest); +} + +SPDLOG_INLINE void pattern_formatter::set_pattern(std::string pattern) +{ + pattern_ = std::move(pattern); + need_localtime_ = false; + compile_pattern_(pattern_); +} + +SPDLOG_INLINE void pattern_formatter::need_localtime(bool need) +{ + need_localtime_ = need; +} + +SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) +{ + if (pattern_time_type_ == pattern_time_type::local) + { + return details::os::localtime(log_clock::to_time_t(msg.time)); + } + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} + +template +SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) +{ + // process custom flags + auto it = custom_handlers_.find(flag); + if (it != custom_handlers_.end()) + { + auto custom_handler = it->second->clone(); + custom_handler->set_padding_info(padding); + formatters_.push_back(std::move(custom_handler)); + return; + } + + // process built-in flags + switch (flag) + { + case ('+'): // default formatter + formatters_.push_back(details::make_unique(padding)); + need_localtime_ = true; + break; + + case 'n': // logger name + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'l': // level + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'L': // short level + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('t'): // thread id + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('v'): // the message text + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('a'): // weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('A'): // short weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('b'): + case ('h'): // month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('B'): // short month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('c'): // datetime + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('C'): // year 2 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('Y'): // year 4 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('D'): + case ('x'): // datetime MM/DD/YY + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('m'): // month 1-12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('d'): // day of month 1-31 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('H'): // hours 24 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('I'): // hours 12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('M'): // minutes + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('S'): // seconds + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('e'): // milliseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('f'): // microseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('F'): // nanoseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('E'): // seconds since epoch + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('p'): // am/pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('r'): // 12 hour clock 02:55:02 pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('R'): // 24-hour HH:MM time + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('T'): + case ('X'): // ISO 8601 time format (HH:MM:SS) + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('z'): // timezone + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('P'): // pid + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('^'): // color range start + formatters_.push_back(details::make_unique(padding)); + break; + + case ('$'): // color range end + formatters_.push_back(details::make_unique(padding)); + break; + + case ('@'): // source location (filename:filenumber) + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('s'): // short source filename - without directory name + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('g'): // full source filename + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('#'): // source line number + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('!'): // source funcname + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('%'): // % char + formatters_.push_back(details::make_unique('%')); + break; + + case ('u'): // elapsed time since last log message in nanos + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('i'): // elapsed time since last log message in micros + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('o'): // elapsed time since last log message in millis + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('O'): // elapsed time since last log message in seconds + formatters_.push_back(details::make_unique>(padding)); + break; + + default: // Unknown flag appears as is + auto unknown_flag = details::make_unique(); + + if (!padding.truncate_) + { + unknown_flag->add_ch('%'); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + // fix issue #1617 (prev char was '!' and should have been treated as funcname flag instead of truncating flag) + // spdlog::set_pattern("[%10!] %v") => "[ main] some message" + // spdlog::set_pattern("[%3!!] %v") => "[mai] some message" + else + { + padding.truncate_ = false; + formatters_.push_back(details::make_unique>(padding)); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + + break; + } +} + +// Extract given pad spec (e.g. %8X, %=8X, %-8!X, %8!X, %=8!X, %-8!X, %+8!X) +// Advance the given it pass the end of the padding spec found (if any) +// Return padding. +SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) +{ + using details::padding_info; + using details::scoped_padder; + const size_t max_width = 64; + if (it == end) + { + return padding_info{}; + } + + padding_info::pad_side side; + switch (*it) + { + case '-': + side = padding_info::pad_side::right; + ++it; + break; + case '=': + side = padding_info::pad_side::center; + ++it; + break; + default: + side = details::padding_info::pad_side::left; + break; + } + + if (it == end || !std::isdigit(static_cast(*it))) + { + return padding_info{}; // no padding if no digit found here + } + + auto width = static_cast(*it) - '0'; + for (++it; it != end && std::isdigit(static_cast(*it)); ++it) + { + auto digit = static_cast(*it) - '0'; + width = width * 10 + digit; + } + + // search for the optional truncate marker '!' + bool truncate; + if (it != end && *it == '!') + { + truncate = true; + ++it; + } + else + { + truncate = false; + } + return details::padding_info{std::min(width, max_width), side, truncate}; +} + +SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) +{ + auto end = pattern.end(); + std::unique_ptr user_chars; + formatters_.clear(); + for (auto it = pattern.begin(); it != end; ++it) + { + if (*it == '%') + { + if (user_chars) // append user chars found so far + { + formatters_.push_back(std::move(user_chars)); + } + + auto padding = handle_padspec_(++it, end); + + if (it != end) + { + if (padding.enabled()) + { + handle_flag_(*it, padding); + } + else + { + handle_flag_(*it, padding); + } + } + else + { + break; + } + } + else // chars not following the % sign should be displayed as is + { + if (!user_chars) + { + user_chars = details::make_unique(); + } + user_chars->add_ch(*it); + } + } + if (user_chars) // append raw chars found so far + { + formatters_.push_back(std::move(user_chars)); + } +} +} // namespace spdlog diff --git a/spdlog/pattern_formatter.h b/spdlog/pattern_formatter.h new file mode 100644 index 0000000..acf1c53 --- /dev/null +++ b/spdlog/pattern_formatter.h @@ -0,0 +1,128 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { +namespace details { + +// padding information. +struct padding_info +{ + enum class pad_side + { + left, + right, + center + }; + + padding_info() = default; + padding_info(size_t width, padding_info::pad_side side, bool truncate) + : width_(width) + , side_(side) + , truncate_(truncate) + , enabled_(true) + {} + + bool enabled() const + { + return enabled_; + } + size_t width_ = 0; + pad_side side_ = pad_side::left; + bool truncate_ = false; + bool enabled_ = false; +}; + +class SPDLOG_API flag_formatter +{ +public: + explicit flag_formatter(padding_info padinfo) + : padinfo_(padinfo) + {} + flag_formatter() = default; + virtual ~flag_formatter() = default; + virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0; + +protected: + padding_info padinfo_; +}; + +} // namespace details + +class SPDLOG_API custom_flag_formatter : public details::flag_formatter +{ +public: + virtual std::unique_ptr clone() const = 0; + + void set_padding_info(const details::padding_info &padding) + { + flag_formatter::padinfo_ = padding; + } +}; + +class SPDLOG_API pattern_formatter final : public formatter +{ +public: + using custom_flags = std::unordered_map>; + + explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local, + std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags()); + + // use default pattern is not given + explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol); + + pattern_formatter(const pattern_formatter &other) = delete; + pattern_formatter &operator=(const pattern_formatter &other) = delete; + + std::unique_ptr clone() const override; + void format(const details::log_msg &msg, memory_buf_t &dest) override; + + template + pattern_formatter &add_flag(char flag, Args &&... args) + { + custom_handlers_[flag] = details::make_unique(std::forward(args)...); + return *this; + } + void set_pattern(std::string pattern); + void need_localtime(bool need = true); + +private: + std::string pattern_; + std::string eol_; + pattern_time_type pattern_time_type_; + bool need_localtime_; + std::tm cached_tm_; + std::chrono::seconds last_log_secs_; + std::vector> formatters_; + custom_flags custom_handlers_; + + std::tm get_time_(const details::log_msg &msg); + template + void handle_flag_(char flag, details::padding_info padding); + + // Extract given pad spec (e.g. %8X) + // Advance the given it pass the end of the padding spec found (if any) + // Return padding. + static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end); + + void compile_pattern_(const std::string &pattern); +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "pattern_formatter-inl.h" +#endif diff --git a/spdlog/spdlog-inl.h b/spdlog/spdlog-inl.h new file mode 100644 index 0000000..708399c --- /dev/null +++ b/spdlog/spdlog-inl.h @@ -0,0 +1,120 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { + +SPDLOG_INLINE void initialize_logger(std::shared_ptr logger) +{ + details::registry::instance().initialize_logger(std::move(logger)); +} + +SPDLOG_INLINE std::shared_ptr get(const std::string &name) +{ + return details::registry::instance().get(name); +} + +SPDLOG_INLINE void set_formatter(std::unique_ptr formatter) +{ + details::registry::instance().set_formatter(std::move(formatter)); +} + +SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type) +{ + set_formatter(std::unique_ptr(new pattern_formatter(std::move(pattern), time_type))); +} + +SPDLOG_INLINE void enable_backtrace(size_t n_messages) +{ + details::registry::instance().enable_backtrace(n_messages); +} + +SPDLOG_INLINE void disable_backtrace() +{ + details::registry::instance().disable_backtrace(); +} + +SPDLOG_INLINE void dump_backtrace() +{ + default_logger_raw()->dump_backtrace(); +} + +SPDLOG_INLINE level::level_enum get_level() +{ + return default_logger_raw()->level(); +} + +SPDLOG_INLINE bool should_log(level::level_enum log_level) +{ + return default_logger_raw()->should_log(log_level); +} + +SPDLOG_INLINE void set_level(level::level_enum log_level) +{ + details::registry::instance().set_level(log_level); +} + +SPDLOG_INLINE void flush_on(level::level_enum log_level) +{ + details::registry::instance().flush_on(log_level); +} + +SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg)) +{ + details::registry::instance().set_error_handler(handler); +} + +SPDLOG_INLINE void register_logger(std::shared_ptr logger) +{ + details::registry::instance().register_logger(std::move(logger)); +} + +SPDLOG_INLINE void apply_all(const std::function)> &fun) +{ + details::registry::instance().apply_all(fun); +} + +SPDLOG_INLINE void drop(const std::string &name) +{ + details::registry::instance().drop(name); +} + +SPDLOG_INLINE void drop_all() +{ + details::registry::instance().drop_all(); +} + +SPDLOG_INLINE void shutdown() +{ + details::registry::instance().shutdown(); +} + +SPDLOG_INLINE void set_automatic_registration(bool automatic_registration) +{ + details::registry::instance().set_automatic_registration(automatic_registration); +} + +SPDLOG_INLINE std::shared_ptr default_logger() +{ + return details::registry::instance().default_logger(); +} + +SPDLOG_INLINE spdlog::logger *default_logger_raw() +{ + return details::registry::instance().get_default_raw(); +} + +SPDLOG_INLINE void set_default_logger(std::shared_ptr default_logger) +{ + details::registry::instance().set_default_logger(std::move(default_logger)); +} + +} // namespace spdlog diff --git a/spdlog/spdlog.h b/spdlog/spdlog.h new file mode 100644 index 0000000..ee83e8d --- /dev/null +++ b/spdlog/spdlog.h @@ -0,0 +1,354 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +// spdlog main header file. +// see example.cpp for usage example + +#ifndef SPDLOG_H +#define SPDLOG_H + +#pragma once + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +namespace spdlog { + +using default_factory = synchronous_factory; + +// Create and register a logger with a templated sink type +// The logger's level, formatter and flush level will be set according the +// global settings. +// +// Example: +// spdlog::create("logger_name", "dailylog_filename", 11, 59); +template +inline std::shared_ptr create(std::string logger_name, SinkArgs &&... sink_args) +{ + return default_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +// Initialize and register a logger, +// formatter and flush level will be set according the global settings. +// +// Useful for initializing manually created loggers with the global settings. +// +// Example: +// auto mylogger = std::make_shared("mylogger", ...); +// spdlog::initialize_logger(mylogger); +SPDLOG_API void initialize_logger(std::shared_ptr logger); + +// Return an existing logger or nullptr if a logger with such name doesn't +// exist. +// example: spdlog::get("my_logger")->info("hello {}", "world"); +SPDLOG_API std::shared_ptr get(const std::string &name); + +// Set global formatter. Each sink in each logger will get a clone of this object +SPDLOG_API void set_formatter(std::unique_ptr formatter); + +// Set global format string. +// example: spdlog::set_pattern("%Y-%m-%d %H:%M:%S.%e %l : %v"); +SPDLOG_API void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + +// enable global backtrace support +SPDLOG_API void enable_backtrace(size_t n_messages); + +// disable global backtrace support +SPDLOG_API void disable_backtrace(); + +// call dump backtrace on default logger +SPDLOG_API void dump_backtrace(); + +// Get global logging level +SPDLOG_API level::level_enum get_level(); + +// Set global logging level +SPDLOG_API void set_level(level::level_enum log_level); + +// Determine whether the default logger should log messages with a certain level +SPDLOG_API bool should_log(level::level_enum lvl); + +// Set global flush level +SPDLOG_API void flush_on(level::level_enum log_level); + +// Start/Restart a periodic flusher thread +// Warning: Use only if all your loggers are thread safe! +template +inline void flush_every(std::chrono::duration interval) +{ + details::registry::instance().flush_every(interval); +} + +// Set global error handler +SPDLOG_API void set_error_handler(void (*handler)(const std::string &msg)); + +// Register the given logger with the given name +SPDLOG_API void register_logger(std::shared_ptr logger); + +// Apply a user defined function on all registered loggers +// Example: +// spdlog::apply_all([&](std::shared_ptr l) {l->flush();}); +SPDLOG_API void apply_all(const std::function)> &fun); + +// Drop the reference to the given logger +SPDLOG_API void drop(const std::string &name); + +// Drop all references from the registry +SPDLOG_API void drop_all(); + +// stop any running threads started by spdlog and clean registry loggers +SPDLOG_API void shutdown(); + +// Automatic registration of loggers when using spdlog::create() or spdlog::create_async +SPDLOG_API void set_automatic_registration(bool automatic_registration); + +// API for using default logger (stdout_color_mt), +// e.g: spdlog::info("Message {}", 1); +// +// The default logger object can be accessed using the spdlog::default_logger(): +// For example, to add another sink to it: +// spdlog::default_logger()->sinks().push_back(some_sink); +// +// The default logger can replaced using spdlog::set_default_logger(new_logger). +// For example, to replace it with a file logger. +// +// IMPORTANT: +// The default API is thread safe (for _mt loggers), but: +// set_default_logger() *should not* be used concurrently with the default API. +// e.g do not call set_default_logger() from one thread while calling spdlog::info() from another. + +SPDLOG_API std::shared_ptr default_logger(); + +SPDLOG_API spdlog::logger *default_logger_raw(); + +SPDLOG_API void set_default_logger(std::shared_ptr default_logger); + +template +inline void log(source_loc source, level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} + +template +inline void log(source_loc source, level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(source, lvl, msg); +} + +template +inline void log(level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(lvl, msg); +} + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +template +inline void log(source_loc source, level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} +#endif + +template +inline void trace(const T &msg) +{ + default_logger_raw()->trace(msg); +} + +template +inline void debug(const T &msg) +{ + default_logger_raw()->debug(msg); +} + +template +inline void info(const T &msg) +{ + default_logger_raw()->info(msg); +} + +template +inline void warn(const T &msg) +{ + default_logger_raw()->warn(msg); +} + +template +inline void error(const T &msg) +{ + default_logger_raw()->error(msg); +} + +template +inline void critical(const T &msg) +{ + default_logger_raw()->critical(msg); +} + +} // namespace spdlog + +// +// enable/disable log calls at compile time according to global level. +// +// define SPDLOG_ACTIVE_LEVEL to one of those (before including spdlog.h): +// SPDLOG_LEVEL_TRACE, +// SPDLOG_LEVEL_DEBUG, +// SPDLOG_LEVEL_INFO, +// SPDLOG_LEVEL_WARN, +// SPDLOG_LEVEL_ERROR, +// SPDLOG_LEVEL_CRITICAL, +// SPDLOG_LEVEL_OFF +// + +#ifndef SPDLOG_NO_SOURCE_LOC +# define SPDLOG_LOGGER_CALL(logger, level, ...) \ + (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CALL(logger, level, ...) (logger)->log(spdlog::source_loc{}, level, __VA_ARGS__) +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE +# define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__) +# define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_TRACE(logger, ...) (void)0 +# define SPDLOG_TRACE(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_DEBUG +# define SPDLOG_LOGGER_DEBUG(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::debug, __VA_ARGS__) +# define SPDLOG_DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_DEBUG(logger, ...) (void)0 +# define SPDLOG_DEBUG(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_INFO +# define SPDLOG_LOGGER_INFO(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::info, __VA_ARGS__) +# define SPDLOG_INFO(...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_INFO(logger, ...) (void)0 +# define SPDLOG_INFO(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_WARN +# define SPDLOG_LOGGER_WARN(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::warn, __VA_ARGS__) +# define SPDLOG_WARN(...) SPDLOG_LOGGER_WARN(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_WARN(logger, ...) (void)0 +# define SPDLOG_WARN(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_ERROR +# define SPDLOG_LOGGER_ERROR(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::err, __VA_ARGS__) +# define SPDLOG_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_ERROR(logger, ...) (void)0 +# define SPDLOG_ERROR(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_CRITICAL +# define SPDLOG_LOGGER_CRITICAL(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::critical, __VA_ARGS__) +# define SPDLOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CRITICAL(logger, ...) (void)0 +# define SPDLOG_CRITICAL(...) (void)0 +#endif + +#ifdef SPDLOG_HEADER_ONLY +# include "spdlog-inl.h" +#endif + +#endif // SPDLOG_H diff --git a/spdlog/stopwatch.h b/spdlog/stopwatch.h new file mode 100644 index 0000000..5d1f2dc --- /dev/null +++ b/spdlog/stopwatch.h @@ -0,0 +1,69 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +// Stopwatch support for spdlog (using std::chrono::steady_clock). +// Displays elapsed seconds since construction as double. +// +// Usage: +// +// spdlog::stopwatch sw; +// ... +// spdlog::debug("Elapsed: {} seconds", sw); => "Elapsed 0.005116733 seconds" +// spdlog::info("Elapsed: {:.6} seconds", sw); => "Elapsed 0.005163 seconds" +// +// +// If other units are needed (e.g. millis instead of double), include "fmt/chrono.h" and use "duration_cast<..>(sw.elapsed())": +// +// #include +//.. +// using std::chrono::duration_cast; +// using std::chrono::milliseconds; +// spdlog::info("Elapsed {}", duration_cast(sw.elapsed())); => "Elapsed 5ms" + +namespace spdlog { +class stopwatch +{ + using clock = std::chrono::steady_clock; + std::chrono::time_point start_tp_; + +public: + stopwatch() + : start_tp_{clock::now()} + {} + + std::chrono::duration elapsed() const + { + return std::chrono::duration(clock::now() - start_tp_); + } + + void reset() + { + start_tp_ = clock::now(); + } +}; +} // namespace spdlog + +// Support for fmt formatting (e.g. "{:012.9}" or just "{}") +namespace +#ifdef SPDLOG_USE_STD_FORMAT + std +#else + fmt +#endif +{ + +template<> +struct formatter : formatter +{ + template + auto format(const spdlog::stopwatch &sw, FormatContext &ctx) -> decltype(ctx.out()) + { + return formatter::format(sw.elapsed().count(), ctx); + } +}; +} // namespace std diff --git a/spdlog/tweakme.h b/spdlog/tweakme.h new file mode 100644 index 0000000..5bcb5ff --- /dev/null +++ b/spdlog/tweakme.h @@ -0,0 +1,140 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +/////////////////////////////////////////////////////////////////////////////// +// +// Edit this file to squeeze more performance, and to customize supported +// features +// +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Under Linux, the much faster CLOCK_REALTIME_COARSE clock can be used. +// This clock is less accurate - can be off by dozens of millis - depending on +// the kernel HZ. +// Uncomment to use it instead of the regular clock. +// +// #define SPDLOG_CLOCK_COARSE +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if source location logging is not needed. +// This will prevent spdlog from using __FILE__, __LINE__ and SPDLOG_FUNCTION +// +// #define SPDLOG_NO_SOURCE_LOC +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if thread id logging is not needed (i.e. no %t in the log pattern). +// This will prevent spdlog from querying the thread id on each log call. +// +// WARNING: If the log pattern contains thread id (i.e, %t) while this flag is +// on, zero will be logged as thread id. +// +// #define SPDLOG_NO_THREAD_ID +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent spdlog from using thread local storage. +// +// WARNING: if your program forks, UNCOMMENT this flag to prevent undefined +// thread ids in the children logs. +// +// #define SPDLOG_NO_TLS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to avoid spdlog's usage of atomic log levels +// Use only if your code never modifies a logger's log levels concurrently by +// different threads. +// +// #define SPDLOG_NO_ATOMIC_LEVELS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable usage of wchar_t for file names on Windows. +// +// #define SPDLOG_WCHAR_FILENAMES +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default eol ("\n" or "\r\n" under Linux/Windows) +// +// #define SPDLOG_EOL ";-)\n" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default folder separators ("/" or "\\/" under +// Linux/Windows). Each character in the string is treated as a different +// separator. +// +// #define SPDLOG_FOLDER_SEPS "\\" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use your own copy of the fmt library instead of spdlog's copy. +// In this case spdlog will try to include so set your -I flag +// accordingly. +// +// #define SPDLOG_FMT_EXTERNAL +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use C++20 std::format instead of fmt. +// +// #define SPDLOG_USE_STD_FORMAT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable wchar_t support (convert to utf8) +// +// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent child processes from inheriting log file descriptors +// +// #define SPDLOG_PREVENT_CHILD_FD +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize level names (e.g. "MY TRACE") +// +// #define SPDLOG_LEVEL_NAMES { "MY TRACE", "MY DEBUG", "MY INFO", "MY WARNING", "MY ERROR", "MY CRITICAL", "OFF" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize short level names (e.g. "MT") +// These can be longer than one character. +// +// #define SPDLOG_SHORT_LEVEL_NAMES { "T", "D", "I", "W", "E", "C", "O" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to disable default logger creation. +// This might save some (very) small initialization time if no default logger is needed. +// +// #define SPDLOG_DISABLE_DEFAULT_LOGGER +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment and set to compile time level with zero cost (default is INFO). +// Macros like SPDLOG_DEBUG(..), SPDLOG_INFO(..) will expand to empty statements if not enabled +// +// #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment (and change if desired) macro to use for function names. +// This is compiler dependent. +// __PRETTY_FUNCTION__ might be nicer in clang/gcc, and __FUNCTION__ in msvc. +// Defaults to __FUNCTION__ (should work on all compilers) if not defined. +// +// #ifdef __PRETTY_FUNCTION__ +// # define SPDLOG_FUNCTION __PRETTY_FUNCTION__ +// #else +// # define SPDLOG_FUNCTION __FUNCTION__ +// #endif +/////////////////////////////////////////////////////////////////////////////// diff --git a/spdlog/version.h b/spdlog/version.h new file mode 100644 index 0000000..5717bea --- /dev/null +++ b/spdlog/version.h @@ -0,0 +1,10 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#define SPDLOG_VER_MAJOR 1 +#define SPDLOG_VER_MINOR 11 +#define SPDLOG_VER_PATCH 0 + +#define SPDLOG_VERSION (SPDLOG_VER_MAJOR * 10000 + SPDLOG_VER_MINOR * 100 + SPDLOG_VER_PATCH) diff --git a/utils/SettingConfig.cpp b/utils/SettingConfig.cpp index f10b016..4b177fc 100644 --- a/utils/SettingConfig.cpp +++ b/utils/SettingConfig.cpp @@ -43,6 +43,9 @@ PORT_NAME = getProperty("com", "motoPortName").toString(); RECOG_TYPE = getProperty("recognize", "recogType").toInt(); + + LOG_FILE = getProperty("log", "logFile").toString(); + LOG_LEVEL = getProperty("log", "logLevel").toString(); } diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/spdlog/pattern_formatter-inl.h b/spdlog/pattern_formatter-inl.h new file mode 100644 index 0000000..01afbe6 --- /dev/null +++ b/spdlog/pattern_formatter-inl.h @@ -0,0 +1,1436 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace spdlog { +namespace details { + +/////////////////////////////////////////////////////////////////////// +// name & level pattern appender +/////////////////////////////////////////////////////////////////////// + +class scoped_padder +{ +public: + scoped_padder(size_t wrapped_size, const padding_info &padinfo, memory_buf_t &dest) + : padinfo_(padinfo) + , dest_(dest) + { + remaining_pad_ = static_cast(padinfo.width_) - static_cast(wrapped_size); + if (remaining_pad_ <= 0) + { + return; + } + + if (padinfo_.side_ == padding_info::pad_side::left) + { + pad_it(remaining_pad_); + remaining_pad_ = 0; + } + else if (padinfo_.side_ == padding_info::pad_side::center) + { + auto half_pad = remaining_pad_ / 2; + auto reminder = remaining_pad_ & 1; + pad_it(half_pad); + remaining_pad_ = half_pad + reminder; // for the right side + } + } + + template + static unsigned int count_digits(T n) + { + return fmt_helper::count_digits(n); + } + + ~scoped_padder() + { + if (remaining_pad_ >= 0) + { + pad_it(remaining_pad_); + } + else if (padinfo_.truncate_) + { + long new_size = static_cast(dest_.size()) + remaining_pad_; + dest_.resize(static_cast(new_size)); + } + } + +private: + void pad_it(long count) + { + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); + } + + const padding_info &padinfo_; + memory_buf_t &dest_; + long remaining_pad_; + string_view_t spaces_{" ", 64}; +}; + +struct null_scoped_padder +{ + null_scoped_padder(size_t /*wrapped_size*/, const padding_info & /*padinfo*/, memory_buf_t & /*dest*/) {} + + template + static unsigned int count_digits(T /* number */) + { + return 0; + } +}; + +template +class name_formatter final : public flag_formatter +{ +public: + explicit name_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.logger_name.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.logger_name, dest); + } +}; + +// log level appender +template +class level_formatter final : public flag_formatter +{ +public: + explicit level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const string_view_t &level_name = level::to_string_view(msg.level); + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +// short log level appender +template +class short_level_formatter final : public flag_formatter +{ +public: + explicit short_level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + string_view_t level_name{level::to_short_c_str(msg.level)}; + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +/////////////////////////////////////////////////////////////////////// +// Date time pattern appenders +/////////////////////////////////////////////////////////////////////// + +static const char *ampm(const tm &t) +{ + return t.tm_hour >= 12 ? "PM" : "AM"; +} + +static int to12h(const tm &t) +{ + return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour; +} + +// Abbreviated weekday name +static std::array days{{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}}; + +template +class a_formatter final : public flag_formatter +{ +public: + explicit a_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full weekday name +static std::array full_days{{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}}; + +template +class A_formatter : public flag_formatter +{ +public: + explicit A_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Abbreviated month +static const std::array months{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}}; + +template +class b_formatter final : public flag_formatter +{ +public: + explicit b_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full month name +static const std::array full_months{ + {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}}; + +template +class B_formatter final : public flag_formatter +{ +public: + explicit B_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Date and time representation (Thu Aug 23 15:35:46 2014) +template +class c_formatter final : public flag_formatter +{ +public: + explicit c_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 24; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::append_string_view(days[static_cast(tm_time.tm_wday)], dest); + dest.push_back(' '); + fmt_helper::append_string_view(months[static_cast(tm_time.tm_mon)], dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_mday, dest); + dest.push_back(' '); + // time + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// year - 2 digit +template +class C_formatter final : public flag_formatter +{ +public: + explicit C_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01 +template +class D_formatter final : public flag_formatter +{ +public: + explicit D_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_mday, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// year - 4 digit +template +class Y_formatter final : public flag_formatter +{ +public: + explicit Y_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 4; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// month 1-12 +template +class m_formatter final : public flag_formatter +{ +public: + explicit m_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + } +}; + +// day of month 1-31 +template +class d_formatter final : public flag_formatter +{ +public: + explicit d_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mday, dest); + } +}; + +// hours in 24 format 0-23 +template +class H_formatter final : public flag_formatter +{ +public: + explicit H_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_hour, dest); + } +}; + +// hours in 12 format 1-12 +template +class I_formatter final : public flag_formatter +{ +public: + explicit I_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(to12h(tm_time), dest); + } +}; + +// minutes 0-59 +template +class M_formatter final : public flag_formatter +{ +public: + explicit M_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// seconds 0-59 +template +class S_formatter final : public flag_formatter +{ +public: + explicit S_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// milliseconds +template +class e_formatter final : public flag_formatter +{ +public: + explicit e_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto millis = fmt_helper::time_fraction(msg.time); + const size_t field_size = 3; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad3(static_cast(millis.count()), dest); + } +}; + +// microseconds +template +class f_formatter final : public flag_formatter +{ +public: + explicit f_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto micros = fmt_helper::time_fraction(msg.time); + + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad6(static_cast(micros.count()), dest); + } +}; + +// nanoseconds +template +class F_formatter final : public flag_formatter +{ +public: + explicit F_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto ns = fmt_helper::time_fraction(msg.time); + const size_t field_size = 9; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad9(static_cast(ns.count()), dest); + } +}; + +// seconds since epoch +template +class E_formatter final : public flag_formatter +{ +public: + explicit E_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + auto duration = msg.time.time_since_epoch(); + auto seconds = std::chrono::duration_cast(duration).count(); + fmt_helper::append_int(seconds, dest); + } +}; + +// AM/PM +template +class p_formatter final : public flag_formatter +{ +public: + explicit p_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 12 hour clock 02:55:02 pm +template +class r_formatter final : public flag_formatter +{ +public: + explicit r_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 11; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(to12h(tm_time), dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 24-hour HH:MM time, equivalent to %H:%M +template +class R_formatter final : public flag_formatter +{ +public: + explicit R_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 5; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S +template +class T_formatter final : public flag_formatter +{ +public: + explicit T_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// ISO 8601 offset from UTC in timezone (+-HH:MM) +template +class z_formatter final : public flag_formatter +{ +public: + explicit z_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + z_formatter() = default; + z_formatter(const z_formatter &) = delete; + z_formatter &operator=(const z_formatter &) = delete; + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + + auto total_minutes = get_cached_offset(msg, tm_time); + bool is_negative = total_minutes < 0; + if (is_negative) + { + total_minutes = -total_minutes; + dest.push_back('-'); + } + else + { + dest.push_back('+'); + } + + fmt_helper::pad2(total_minutes / 60, dest); // hours + dest.push_back(':'); + fmt_helper::pad2(total_minutes % 60, dest); // minutes + } + +private: + log_clock::time_point last_update_{std::chrono::seconds(0)}; + int offset_minutes_{0}; + + int get_cached_offset(const log_msg &msg, const std::tm &tm_time) + { + // refresh every 10 seconds + if (msg.time - last_update_ >= std::chrono::seconds(10)) + { + offset_minutes_ = os::utc_minutes_offset(tm_time); + last_update_ = msg.time; + } + return offset_minutes_; + } +}; + +// Thread id +template +class t_formatter final : public flag_formatter +{ +public: + explicit t_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const auto field_size = ScopedPadder::count_digits(msg.thread_id); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.thread_id, dest); + } +}; + +// Current pid +template +class pid_formatter final : public flag_formatter +{ +public: + explicit pid_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + const auto pid = static_cast(details::os::pid()); + auto field_size = ScopedPadder::count_digits(pid); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(pid, dest); + } +}; + +template +class v_formatter final : public flag_formatter +{ +public: + explicit v_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.payload.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.payload, dest); + } +}; + +class ch_formatter final : public flag_formatter +{ +public: + explicit ch_formatter(char ch) + : ch_(ch) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + dest.push_back(ch_); + } + +private: + char ch_; +}; + +// aggregate user chars to display as is +class aggregate_formatter final : public flag_formatter +{ +public: + aggregate_formatter() = default; + + void add_ch(char ch) + { + str_ += ch; + } + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + fmt_helper::append_string_view(str_, dest); + } + +private: + std::string str_; +}; + +// mark the color range. expect it to be in the form of "%^colored text%$" +class color_start_formatter final : public flag_formatter +{ +public: + explicit color_start_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_start = dest.size(); + } +}; + +class color_stop_formatter final : public flag_formatter +{ +public: + explicit color_stop_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_end = dest.size(); + } +}; + +// print source location +template +class source_location_formatter final : public flag_formatter +{ +public: + explicit source_location_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + size_t text_size; + if (padinfo_.enabled()) + { + // calc text size for padding based on "filename:line" + text_size = std::char_traits::length(msg.source.filename) + ScopedPadder::count_digits(msg.source.line) + 1; + } + else + { + text_size = 0; + } + + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source filename +template +class source_filename_formatter final : public flag_formatter +{ +public: + explicit source_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + } +}; + +template +class short_filename_formatter final : public flag_formatter +{ +public: + explicit short_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4127) // consider using 'if constexpr' instead +#endif // _MSC_VER + static const char *basename(const char *filename) + { + // if the size is 2 (1 character + null terminator) we can use the more efficient strrchr + // the branch will be elided by optimizations + if (sizeof(os::folder_seps) == 2) + { + const char *rv = std::strrchr(filename, os::folder_seps[0]); + return rv != nullptr ? rv + 1 : filename; + } + else + { + const std::reverse_iterator begin(filename + std::strlen(filename)); + const std::reverse_iterator end(filename); + + const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1); + return it != end ? it.base() : filename; + } + } +#ifdef _MSC_VER +# pragma warning(pop) +#endif // _MSC_VER + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + auto filename = basename(msg.source.filename); + size_t text_size = padinfo_.enabled() ? std::char_traits::length(filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(filename, dest); + } +}; + +template +class source_linenum_formatter final : public flag_formatter +{ +public: + explicit source_linenum_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + auto field_size = ScopedPadder::count_digits(msg.source.line); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source funcname +template +class source_funcname_formatter final : public flag_formatter +{ +public: + explicit source_funcname_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.funcname) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.funcname, dest); + } +}; + +// print elapsed time since last message +template +class elapsed_formatter final : public flag_formatter +{ +public: + using DurationUnits = Units; + + explicit elapsed_formatter(padding_info padinfo) + : flag_formatter(padinfo) + , last_message_time_(log_clock::now()) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta_units = std::chrono::duration_cast(delta); + last_message_time_ = msg.time; + auto delta_count = static_cast(delta_units.count()); + auto n_digits = static_cast(ScopedPadder::count_digits(delta_count)); + ScopedPadder p(n_digits, padinfo_, dest); + fmt_helper::append_int(delta_count, dest); + } + +private: + log_clock::time_point last_message_time_; +}; + +// Full info formatter +// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v +class full_formatter final : public flag_formatter +{ +public: + explicit full_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + using std::chrono::duration_cast; + using std::chrono::milliseconds; + using std::chrono::seconds; + + // cache the date/time part for the next second. + auto duration = msg.time.time_since_epoch(); + auto secs = duration_cast(duration); + + if (cache_timestamp_ != secs || cached_datetime_.size() == 0) + { + cached_datetime_.clear(); + cached_datetime_.push_back('['); + fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mday, cached_datetime_); + cached_datetime_.push_back(' '); + + fmt_helper::pad2(tm_time.tm_hour, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_min, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_sec, cached_datetime_); + cached_datetime_.push_back('.'); + + cache_timestamp_ = secs; + } + dest.append(cached_datetime_.begin(), cached_datetime_.end()); + + auto millis = fmt_helper::time_fraction(msg.time); + fmt_helper::pad3(static_cast(millis.count()), dest); + dest.push_back(']'); + dest.push_back(' '); + + // append logger name if exists + if (msg.logger_name.size() > 0) + { + dest.push_back('['); + fmt_helper::append_string_view(msg.logger_name, dest); + dest.push_back(']'); + dest.push_back(' '); + } + + dest.push_back('['); + // wrap the level name with color + msg.color_range_start = dest.size(); + // fmt_helper::append_string_view(level::to_c_str(msg.level), dest); + fmt_helper::append_string_view(level::to_string_view(msg.level), dest); + msg.color_range_end = dest.size(); + dest.push_back(']'); + dest.push_back(' '); + + // add source location if present + if (!msg.source.empty()) + { + dest.push_back('['); + const char *filename = details::short_filename_formatter::basename(msg.source.filename); + fmt_helper::append_string_view(filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + dest.push_back(']'); + dest.push_back(' '); + } + // fmt_helper::append_string_view(msg.msg(), dest); + fmt_helper::append_string_view(msg.payload, dest); + } + +private: + std::chrono::seconds cache_timestamp_{0}; + memory_buf_t cached_datetime_; +}; + +} // namespace details + +SPDLOG_INLINE pattern_formatter::pattern_formatter( + std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags) + : pattern_(std::move(pattern)) + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(false) + , last_log_secs_(0) + , custom_handlers_(std::move(custom_user_flags)) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + compile_pattern_(pattern_); +} + +// use by default full formatter for if pattern is not given +SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + : pattern_("%+") + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(true) + , last_log_secs_(0) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + formatters_.push_back(details::make_unique(details::padding_info{})); +} + +SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const +{ + custom_flags cloned_custom_formatters; + for (auto &it : custom_handlers_) + { + cloned_custom_formatters[it.first] = it.second->clone(); + } + auto cloned = details::make_unique(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters)); + cloned->need_localtime(need_localtime_); +#if defined(__GNUC__) && __GNUC__ < 5 + return std::move(cloned); +#else + return cloned; +#endif +} + +SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest) +{ + if (need_localtime_) + { + const auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); + if (secs != last_log_secs_) + { + cached_tm_ = get_time_(msg); + last_log_secs_ = secs; + } + } + + for (auto &f : formatters_) + { + f->format(msg, cached_tm_, dest); + } + // write eol + details::fmt_helper::append_string_view(eol_, dest); +} + +SPDLOG_INLINE void pattern_formatter::set_pattern(std::string pattern) +{ + pattern_ = std::move(pattern); + need_localtime_ = false; + compile_pattern_(pattern_); +} + +SPDLOG_INLINE void pattern_formatter::need_localtime(bool need) +{ + need_localtime_ = need; +} + +SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) +{ + if (pattern_time_type_ == pattern_time_type::local) + { + return details::os::localtime(log_clock::to_time_t(msg.time)); + } + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} + +template +SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) +{ + // process custom flags + auto it = custom_handlers_.find(flag); + if (it != custom_handlers_.end()) + { + auto custom_handler = it->second->clone(); + custom_handler->set_padding_info(padding); + formatters_.push_back(std::move(custom_handler)); + return; + } + + // process built-in flags + switch (flag) + { + case ('+'): // default formatter + formatters_.push_back(details::make_unique(padding)); + need_localtime_ = true; + break; + + case 'n': // logger name + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'l': // level + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'L': // short level + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('t'): // thread id + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('v'): // the message text + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('a'): // weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('A'): // short weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('b'): + case ('h'): // month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('B'): // short month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('c'): // datetime + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('C'): // year 2 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('Y'): // year 4 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('D'): + case ('x'): // datetime MM/DD/YY + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('m'): // month 1-12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('d'): // day of month 1-31 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('H'): // hours 24 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('I'): // hours 12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('M'): // minutes + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('S'): // seconds + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('e'): // milliseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('f'): // microseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('F'): // nanoseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('E'): // seconds since epoch + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('p'): // am/pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('r'): // 12 hour clock 02:55:02 pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('R'): // 24-hour HH:MM time + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('T'): + case ('X'): // ISO 8601 time format (HH:MM:SS) + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('z'): // timezone + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('P'): // pid + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('^'): // color range start + formatters_.push_back(details::make_unique(padding)); + break; + + case ('$'): // color range end + formatters_.push_back(details::make_unique(padding)); + break; + + case ('@'): // source location (filename:filenumber) + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('s'): // short source filename - without directory name + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('g'): // full source filename + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('#'): // source line number + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('!'): // source funcname + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('%'): // % char + formatters_.push_back(details::make_unique('%')); + break; + + case ('u'): // elapsed time since last log message in nanos + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('i'): // elapsed time since last log message in micros + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('o'): // elapsed time since last log message in millis + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('O'): // elapsed time since last log message in seconds + formatters_.push_back(details::make_unique>(padding)); + break; + + default: // Unknown flag appears as is + auto unknown_flag = details::make_unique(); + + if (!padding.truncate_) + { + unknown_flag->add_ch('%'); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + // fix issue #1617 (prev char was '!' and should have been treated as funcname flag instead of truncating flag) + // spdlog::set_pattern("[%10!] %v") => "[ main] some message" + // spdlog::set_pattern("[%3!!] %v") => "[mai] some message" + else + { + padding.truncate_ = false; + formatters_.push_back(details::make_unique>(padding)); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + + break; + } +} + +// Extract given pad spec (e.g. %8X, %=8X, %-8!X, %8!X, %=8!X, %-8!X, %+8!X) +// Advance the given it pass the end of the padding spec found (if any) +// Return padding. +SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) +{ + using details::padding_info; + using details::scoped_padder; + const size_t max_width = 64; + if (it == end) + { + return padding_info{}; + } + + padding_info::pad_side side; + switch (*it) + { + case '-': + side = padding_info::pad_side::right; + ++it; + break; + case '=': + side = padding_info::pad_side::center; + ++it; + break; + default: + side = details::padding_info::pad_side::left; + break; + } + + if (it == end || !std::isdigit(static_cast(*it))) + { + return padding_info{}; // no padding if no digit found here + } + + auto width = static_cast(*it) - '0'; + for (++it; it != end && std::isdigit(static_cast(*it)); ++it) + { + auto digit = static_cast(*it) - '0'; + width = width * 10 + digit; + } + + // search for the optional truncate marker '!' + bool truncate; + if (it != end && *it == '!') + { + truncate = true; + ++it; + } + else + { + truncate = false; + } + return details::padding_info{std::min(width, max_width), side, truncate}; +} + +SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) +{ + auto end = pattern.end(); + std::unique_ptr user_chars; + formatters_.clear(); + for (auto it = pattern.begin(); it != end; ++it) + { + if (*it == '%') + { + if (user_chars) // append user chars found so far + { + formatters_.push_back(std::move(user_chars)); + } + + auto padding = handle_padspec_(++it, end); + + if (it != end) + { + if (padding.enabled()) + { + handle_flag_(*it, padding); + } + else + { + handle_flag_(*it, padding); + } + } + else + { + break; + } + } + else // chars not following the % sign should be displayed as is + { + if (!user_chars) + { + user_chars = details::make_unique(); + } + user_chars->add_ch(*it); + } + } + if (user_chars) // append raw chars found so far + { + formatters_.push_back(std::move(user_chars)); + } +} +} // namespace spdlog diff --git a/spdlog/pattern_formatter.h b/spdlog/pattern_formatter.h new file mode 100644 index 0000000..acf1c53 --- /dev/null +++ b/spdlog/pattern_formatter.h @@ -0,0 +1,128 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { +namespace details { + +// padding information. +struct padding_info +{ + enum class pad_side + { + left, + right, + center + }; + + padding_info() = default; + padding_info(size_t width, padding_info::pad_side side, bool truncate) + : width_(width) + , side_(side) + , truncate_(truncate) + , enabled_(true) + {} + + bool enabled() const + { + return enabled_; + } + size_t width_ = 0; + pad_side side_ = pad_side::left; + bool truncate_ = false; + bool enabled_ = false; +}; + +class SPDLOG_API flag_formatter +{ +public: + explicit flag_formatter(padding_info padinfo) + : padinfo_(padinfo) + {} + flag_formatter() = default; + virtual ~flag_formatter() = default; + virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0; + +protected: + padding_info padinfo_; +}; + +} // namespace details + +class SPDLOG_API custom_flag_formatter : public details::flag_formatter +{ +public: + virtual std::unique_ptr clone() const = 0; + + void set_padding_info(const details::padding_info &padding) + { + flag_formatter::padinfo_ = padding; + } +}; + +class SPDLOG_API pattern_formatter final : public formatter +{ +public: + using custom_flags = std::unordered_map>; + + explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local, + std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags()); + + // use default pattern is not given + explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol); + + pattern_formatter(const pattern_formatter &other) = delete; + pattern_formatter &operator=(const pattern_formatter &other) = delete; + + std::unique_ptr clone() const override; + void format(const details::log_msg &msg, memory_buf_t &dest) override; + + template + pattern_formatter &add_flag(char flag, Args &&... args) + { + custom_handlers_[flag] = details::make_unique(std::forward(args)...); + return *this; + } + void set_pattern(std::string pattern); + void need_localtime(bool need = true); + +private: + std::string pattern_; + std::string eol_; + pattern_time_type pattern_time_type_; + bool need_localtime_; + std::tm cached_tm_; + std::chrono::seconds last_log_secs_; + std::vector> formatters_; + custom_flags custom_handlers_; + + std::tm get_time_(const details::log_msg &msg); + template + void handle_flag_(char flag, details::padding_info padding); + + // Extract given pad spec (e.g. %8X) + // Advance the given it pass the end of the padding spec found (if any) + // Return padding. + static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end); + + void compile_pattern_(const std::string &pattern); +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "pattern_formatter-inl.h" +#endif diff --git a/spdlog/spdlog-inl.h b/spdlog/spdlog-inl.h new file mode 100644 index 0000000..708399c --- /dev/null +++ b/spdlog/spdlog-inl.h @@ -0,0 +1,120 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { + +SPDLOG_INLINE void initialize_logger(std::shared_ptr logger) +{ + details::registry::instance().initialize_logger(std::move(logger)); +} + +SPDLOG_INLINE std::shared_ptr get(const std::string &name) +{ + return details::registry::instance().get(name); +} + +SPDLOG_INLINE void set_formatter(std::unique_ptr formatter) +{ + details::registry::instance().set_formatter(std::move(formatter)); +} + +SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type) +{ + set_formatter(std::unique_ptr(new pattern_formatter(std::move(pattern), time_type))); +} + +SPDLOG_INLINE void enable_backtrace(size_t n_messages) +{ + details::registry::instance().enable_backtrace(n_messages); +} + +SPDLOG_INLINE void disable_backtrace() +{ + details::registry::instance().disable_backtrace(); +} + +SPDLOG_INLINE void dump_backtrace() +{ + default_logger_raw()->dump_backtrace(); +} + +SPDLOG_INLINE level::level_enum get_level() +{ + return default_logger_raw()->level(); +} + +SPDLOG_INLINE bool should_log(level::level_enum log_level) +{ + return default_logger_raw()->should_log(log_level); +} + +SPDLOG_INLINE void set_level(level::level_enum log_level) +{ + details::registry::instance().set_level(log_level); +} + +SPDLOG_INLINE void flush_on(level::level_enum log_level) +{ + details::registry::instance().flush_on(log_level); +} + +SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg)) +{ + details::registry::instance().set_error_handler(handler); +} + +SPDLOG_INLINE void register_logger(std::shared_ptr logger) +{ + details::registry::instance().register_logger(std::move(logger)); +} + +SPDLOG_INLINE void apply_all(const std::function)> &fun) +{ + details::registry::instance().apply_all(fun); +} + +SPDLOG_INLINE void drop(const std::string &name) +{ + details::registry::instance().drop(name); +} + +SPDLOG_INLINE void drop_all() +{ + details::registry::instance().drop_all(); +} + +SPDLOG_INLINE void shutdown() +{ + details::registry::instance().shutdown(); +} + +SPDLOG_INLINE void set_automatic_registration(bool automatic_registration) +{ + details::registry::instance().set_automatic_registration(automatic_registration); +} + +SPDLOG_INLINE std::shared_ptr default_logger() +{ + return details::registry::instance().default_logger(); +} + +SPDLOG_INLINE spdlog::logger *default_logger_raw() +{ + return details::registry::instance().get_default_raw(); +} + +SPDLOG_INLINE void set_default_logger(std::shared_ptr default_logger) +{ + details::registry::instance().set_default_logger(std::move(default_logger)); +} + +} // namespace spdlog diff --git a/spdlog/spdlog.h b/spdlog/spdlog.h new file mode 100644 index 0000000..ee83e8d --- /dev/null +++ b/spdlog/spdlog.h @@ -0,0 +1,354 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +// spdlog main header file. +// see example.cpp for usage example + +#ifndef SPDLOG_H +#define SPDLOG_H + +#pragma once + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +namespace spdlog { + +using default_factory = synchronous_factory; + +// Create and register a logger with a templated sink type +// The logger's level, formatter and flush level will be set according the +// global settings. +// +// Example: +// spdlog::create("logger_name", "dailylog_filename", 11, 59); +template +inline std::shared_ptr create(std::string logger_name, SinkArgs &&... sink_args) +{ + return default_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +// Initialize and register a logger, +// formatter and flush level will be set according the global settings. +// +// Useful for initializing manually created loggers with the global settings. +// +// Example: +// auto mylogger = std::make_shared("mylogger", ...); +// spdlog::initialize_logger(mylogger); +SPDLOG_API void initialize_logger(std::shared_ptr logger); + +// Return an existing logger or nullptr if a logger with such name doesn't +// exist. +// example: spdlog::get("my_logger")->info("hello {}", "world"); +SPDLOG_API std::shared_ptr get(const std::string &name); + +// Set global formatter. Each sink in each logger will get a clone of this object +SPDLOG_API void set_formatter(std::unique_ptr formatter); + +// Set global format string. +// example: spdlog::set_pattern("%Y-%m-%d %H:%M:%S.%e %l : %v"); +SPDLOG_API void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + +// enable global backtrace support +SPDLOG_API void enable_backtrace(size_t n_messages); + +// disable global backtrace support +SPDLOG_API void disable_backtrace(); + +// call dump backtrace on default logger +SPDLOG_API void dump_backtrace(); + +// Get global logging level +SPDLOG_API level::level_enum get_level(); + +// Set global logging level +SPDLOG_API void set_level(level::level_enum log_level); + +// Determine whether the default logger should log messages with a certain level +SPDLOG_API bool should_log(level::level_enum lvl); + +// Set global flush level +SPDLOG_API void flush_on(level::level_enum log_level); + +// Start/Restart a periodic flusher thread +// Warning: Use only if all your loggers are thread safe! +template +inline void flush_every(std::chrono::duration interval) +{ + details::registry::instance().flush_every(interval); +} + +// Set global error handler +SPDLOG_API void set_error_handler(void (*handler)(const std::string &msg)); + +// Register the given logger with the given name +SPDLOG_API void register_logger(std::shared_ptr logger); + +// Apply a user defined function on all registered loggers +// Example: +// spdlog::apply_all([&](std::shared_ptr l) {l->flush();}); +SPDLOG_API void apply_all(const std::function)> &fun); + +// Drop the reference to the given logger +SPDLOG_API void drop(const std::string &name); + +// Drop all references from the registry +SPDLOG_API void drop_all(); + +// stop any running threads started by spdlog and clean registry loggers +SPDLOG_API void shutdown(); + +// Automatic registration of loggers when using spdlog::create() or spdlog::create_async +SPDLOG_API void set_automatic_registration(bool automatic_registration); + +// API for using default logger (stdout_color_mt), +// e.g: spdlog::info("Message {}", 1); +// +// The default logger object can be accessed using the spdlog::default_logger(): +// For example, to add another sink to it: +// spdlog::default_logger()->sinks().push_back(some_sink); +// +// The default logger can replaced using spdlog::set_default_logger(new_logger). +// For example, to replace it with a file logger. +// +// IMPORTANT: +// The default API is thread safe (for _mt loggers), but: +// set_default_logger() *should not* be used concurrently with the default API. +// e.g do not call set_default_logger() from one thread while calling spdlog::info() from another. + +SPDLOG_API std::shared_ptr default_logger(); + +SPDLOG_API spdlog::logger *default_logger_raw(); + +SPDLOG_API void set_default_logger(std::shared_ptr default_logger); + +template +inline void log(source_loc source, level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} + +template +inline void log(source_loc source, level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(source, lvl, msg); +} + +template +inline void log(level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(lvl, msg); +} + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +template +inline void log(source_loc source, level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} +#endif + +template +inline void trace(const T &msg) +{ + default_logger_raw()->trace(msg); +} + +template +inline void debug(const T &msg) +{ + default_logger_raw()->debug(msg); +} + +template +inline void info(const T &msg) +{ + default_logger_raw()->info(msg); +} + +template +inline void warn(const T &msg) +{ + default_logger_raw()->warn(msg); +} + +template +inline void error(const T &msg) +{ + default_logger_raw()->error(msg); +} + +template +inline void critical(const T &msg) +{ + default_logger_raw()->critical(msg); +} + +} // namespace spdlog + +// +// enable/disable log calls at compile time according to global level. +// +// define SPDLOG_ACTIVE_LEVEL to one of those (before including spdlog.h): +// SPDLOG_LEVEL_TRACE, +// SPDLOG_LEVEL_DEBUG, +// SPDLOG_LEVEL_INFO, +// SPDLOG_LEVEL_WARN, +// SPDLOG_LEVEL_ERROR, +// SPDLOG_LEVEL_CRITICAL, +// SPDLOG_LEVEL_OFF +// + +#ifndef SPDLOG_NO_SOURCE_LOC +# define SPDLOG_LOGGER_CALL(logger, level, ...) \ + (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CALL(logger, level, ...) (logger)->log(spdlog::source_loc{}, level, __VA_ARGS__) +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE +# define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__) +# define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_TRACE(logger, ...) (void)0 +# define SPDLOG_TRACE(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_DEBUG +# define SPDLOG_LOGGER_DEBUG(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::debug, __VA_ARGS__) +# define SPDLOG_DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_DEBUG(logger, ...) (void)0 +# define SPDLOG_DEBUG(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_INFO +# define SPDLOG_LOGGER_INFO(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::info, __VA_ARGS__) +# define SPDLOG_INFO(...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_INFO(logger, ...) (void)0 +# define SPDLOG_INFO(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_WARN +# define SPDLOG_LOGGER_WARN(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::warn, __VA_ARGS__) +# define SPDLOG_WARN(...) SPDLOG_LOGGER_WARN(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_WARN(logger, ...) (void)0 +# define SPDLOG_WARN(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_ERROR +# define SPDLOG_LOGGER_ERROR(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::err, __VA_ARGS__) +# define SPDLOG_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_ERROR(logger, ...) (void)0 +# define SPDLOG_ERROR(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_CRITICAL +# define SPDLOG_LOGGER_CRITICAL(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::critical, __VA_ARGS__) +# define SPDLOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CRITICAL(logger, ...) (void)0 +# define SPDLOG_CRITICAL(...) (void)0 +#endif + +#ifdef SPDLOG_HEADER_ONLY +# include "spdlog-inl.h" +#endif + +#endif // SPDLOG_H diff --git a/spdlog/stopwatch.h b/spdlog/stopwatch.h new file mode 100644 index 0000000..5d1f2dc --- /dev/null +++ b/spdlog/stopwatch.h @@ -0,0 +1,69 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +// Stopwatch support for spdlog (using std::chrono::steady_clock). +// Displays elapsed seconds since construction as double. +// +// Usage: +// +// spdlog::stopwatch sw; +// ... +// spdlog::debug("Elapsed: {} seconds", sw); => "Elapsed 0.005116733 seconds" +// spdlog::info("Elapsed: {:.6} seconds", sw); => "Elapsed 0.005163 seconds" +// +// +// If other units are needed (e.g. millis instead of double), include "fmt/chrono.h" and use "duration_cast<..>(sw.elapsed())": +// +// #include +//.. +// using std::chrono::duration_cast; +// using std::chrono::milliseconds; +// spdlog::info("Elapsed {}", duration_cast(sw.elapsed())); => "Elapsed 5ms" + +namespace spdlog { +class stopwatch +{ + using clock = std::chrono::steady_clock; + std::chrono::time_point start_tp_; + +public: + stopwatch() + : start_tp_{clock::now()} + {} + + std::chrono::duration elapsed() const + { + return std::chrono::duration(clock::now() - start_tp_); + } + + void reset() + { + start_tp_ = clock::now(); + } +}; +} // namespace spdlog + +// Support for fmt formatting (e.g. "{:012.9}" or just "{}") +namespace +#ifdef SPDLOG_USE_STD_FORMAT + std +#else + fmt +#endif +{ + +template<> +struct formatter : formatter +{ + template + auto format(const spdlog::stopwatch &sw, FormatContext &ctx) -> decltype(ctx.out()) + { + return formatter::format(sw.elapsed().count(), ctx); + } +}; +} // namespace std diff --git a/spdlog/tweakme.h b/spdlog/tweakme.h new file mode 100644 index 0000000..5bcb5ff --- /dev/null +++ b/spdlog/tweakme.h @@ -0,0 +1,140 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +/////////////////////////////////////////////////////////////////////////////// +// +// Edit this file to squeeze more performance, and to customize supported +// features +// +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Under Linux, the much faster CLOCK_REALTIME_COARSE clock can be used. +// This clock is less accurate - can be off by dozens of millis - depending on +// the kernel HZ. +// Uncomment to use it instead of the regular clock. +// +// #define SPDLOG_CLOCK_COARSE +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if source location logging is not needed. +// This will prevent spdlog from using __FILE__, __LINE__ and SPDLOG_FUNCTION +// +// #define SPDLOG_NO_SOURCE_LOC +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if thread id logging is not needed (i.e. no %t in the log pattern). +// This will prevent spdlog from querying the thread id on each log call. +// +// WARNING: If the log pattern contains thread id (i.e, %t) while this flag is +// on, zero will be logged as thread id. +// +// #define SPDLOG_NO_THREAD_ID +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent spdlog from using thread local storage. +// +// WARNING: if your program forks, UNCOMMENT this flag to prevent undefined +// thread ids in the children logs. +// +// #define SPDLOG_NO_TLS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to avoid spdlog's usage of atomic log levels +// Use only if your code never modifies a logger's log levels concurrently by +// different threads. +// +// #define SPDLOG_NO_ATOMIC_LEVELS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable usage of wchar_t for file names on Windows. +// +// #define SPDLOG_WCHAR_FILENAMES +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default eol ("\n" or "\r\n" under Linux/Windows) +// +// #define SPDLOG_EOL ";-)\n" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default folder separators ("/" or "\\/" under +// Linux/Windows). Each character in the string is treated as a different +// separator. +// +// #define SPDLOG_FOLDER_SEPS "\\" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use your own copy of the fmt library instead of spdlog's copy. +// In this case spdlog will try to include so set your -I flag +// accordingly. +// +// #define SPDLOG_FMT_EXTERNAL +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use C++20 std::format instead of fmt. +// +// #define SPDLOG_USE_STD_FORMAT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable wchar_t support (convert to utf8) +// +// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent child processes from inheriting log file descriptors +// +// #define SPDLOG_PREVENT_CHILD_FD +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize level names (e.g. "MY TRACE") +// +// #define SPDLOG_LEVEL_NAMES { "MY TRACE", "MY DEBUG", "MY INFO", "MY WARNING", "MY ERROR", "MY CRITICAL", "OFF" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize short level names (e.g. "MT") +// These can be longer than one character. +// +// #define SPDLOG_SHORT_LEVEL_NAMES { "T", "D", "I", "W", "E", "C", "O" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to disable default logger creation. +// This might save some (very) small initialization time if no default logger is needed. +// +// #define SPDLOG_DISABLE_DEFAULT_LOGGER +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment and set to compile time level with zero cost (default is INFO). +// Macros like SPDLOG_DEBUG(..), SPDLOG_INFO(..) will expand to empty statements if not enabled +// +// #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment (and change if desired) macro to use for function names. +// This is compiler dependent. +// __PRETTY_FUNCTION__ might be nicer in clang/gcc, and __FUNCTION__ in msvc. +// Defaults to __FUNCTION__ (should work on all compilers) if not defined. +// +// #ifdef __PRETTY_FUNCTION__ +// # define SPDLOG_FUNCTION __PRETTY_FUNCTION__ +// #else +// # define SPDLOG_FUNCTION __FUNCTION__ +// #endif +/////////////////////////////////////////////////////////////////////////////// diff --git a/spdlog/version.h b/spdlog/version.h new file mode 100644 index 0000000..5717bea --- /dev/null +++ b/spdlog/version.h @@ -0,0 +1,10 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#define SPDLOG_VER_MAJOR 1 +#define SPDLOG_VER_MINOR 11 +#define SPDLOG_VER_PATCH 0 + +#define SPDLOG_VERSION (SPDLOG_VER_MAJOR * 10000 + SPDLOG_VER_MINOR * 100 + SPDLOG_VER_PATCH) diff --git a/utils/SettingConfig.cpp b/utils/SettingConfig.cpp index f10b016..4b177fc 100644 --- a/utils/SettingConfig.cpp +++ b/utils/SettingConfig.cpp @@ -43,6 +43,9 @@ PORT_NAME = getProperty("com", "motoPortName").toString(); RECOG_TYPE = getProperty("recognize", "recogType").toInt(); + + LOG_FILE = getProperty("log", "logFile").toString(); + LOG_LEVEL = getProperty("log", "logLevel").toString(); } diff --git a/utils/SettingConfig.h b/utils/SettingConfig.h index 89541ca..be5bbfe 100644 --- a/utils/SettingConfig.h +++ b/utils/SettingConfig.h @@ -64,6 +64,9 @@ int RECOG_TYPE = 0; + QString LOG_FILE; + QString LOG_LEVEL; + private: SettingConfig(); diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/spdlog/pattern_formatter-inl.h b/spdlog/pattern_formatter-inl.h new file mode 100644 index 0000000..01afbe6 --- /dev/null +++ b/spdlog/pattern_formatter-inl.h @@ -0,0 +1,1436 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace spdlog { +namespace details { + +/////////////////////////////////////////////////////////////////////// +// name & level pattern appender +/////////////////////////////////////////////////////////////////////// + +class scoped_padder +{ +public: + scoped_padder(size_t wrapped_size, const padding_info &padinfo, memory_buf_t &dest) + : padinfo_(padinfo) + , dest_(dest) + { + remaining_pad_ = static_cast(padinfo.width_) - static_cast(wrapped_size); + if (remaining_pad_ <= 0) + { + return; + } + + if (padinfo_.side_ == padding_info::pad_side::left) + { + pad_it(remaining_pad_); + remaining_pad_ = 0; + } + else if (padinfo_.side_ == padding_info::pad_side::center) + { + auto half_pad = remaining_pad_ / 2; + auto reminder = remaining_pad_ & 1; + pad_it(half_pad); + remaining_pad_ = half_pad + reminder; // for the right side + } + } + + template + static unsigned int count_digits(T n) + { + return fmt_helper::count_digits(n); + } + + ~scoped_padder() + { + if (remaining_pad_ >= 0) + { + pad_it(remaining_pad_); + } + else if (padinfo_.truncate_) + { + long new_size = static_cast(dest_.size()) + remaining_pad_; + dest_.resize(static_cast(new_size)); + } + } + +private: + void pad_it(long count) + { + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); + } + + const padding_info &padinfo_; + memory_buf_t &dest_; + long remaining_pad_; + string_view_t spaces_{" ", 64}; +}; + +struct null_scoped_padder +{ + null_scoped_padder(size_t /*wrapped_size*/, const padding_info & /*padinfo*/, memory_buf_t & /*dest*/) {} + + template + static unsigned int count_digits(T /* number */) + { + return 0; + } +}; + +template +class name_formatter final : public flag_formatter +{ +public: + explicit name_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.logger_name.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.logger_name, dest); + } +}; + +// log level appender +template +class level_formatter final : public flag_formatter +{ +public: + explicit level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const string_view_t &level_name = level::to_string_view(msg.level); + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +// short log level appender +template +class short_level_formatter final : public flag_formatter +{ +public: + explicit short_level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + string_view_t level_name{level::to_short_c_str(msg.level)}; + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +/////////////////////////////////////////////////////////////////////// +// Date time pattern appenders +/////////////////////////////////////////////////////////////////////// + +static const char *ampm(const tm &t) +{ + return t.tm_hour >= 12 ? "PM" : "AM"; +} + +static int to12h(const tm &t) +{ + return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour; +} + +// Abbreviated weekday name +static std::array days{{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}}; + +template +class a_formatter final : public flag_formatter +{ +public: + explicit a_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full weekday name +static std::array full_days{{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}}; + +template +class A_formatter : public flag_formatter +{ +public: + explicit A_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Abbreviated month +static const std::array months{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}}; + +template +class b_formatter final : public flag_formatter +{ +public: + explicit b_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full month name +static const std::array full_months{ + {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}}; + +template +class B_formatter final : public flag_formatter +{ +public: + explicit B_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Date and time representation (Thu Aug 23 15:35:46 2014) +template +class c_formatter final : public flag_formatter +{ +public: + explicit c_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 24; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::append_string_view(days[static_cast(tm_time.tm_wday)], dest); + dest.push_back(' '); + fmt_helper::append_string_view(months[static_cast(tm_time.tm_mon)], dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_mday, dest); + dest.push_back(' '); + // time + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// year - 2 digit +template +class C_formatter final : public flag_formatter +{ +public: + explicit C_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01 +template +class D_formatter final : public flag_formatter +{ +public: + explicit D_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_mday, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// year - 4 digit +template +class Y_formatter final : public flag_formatter +{ +public: + explicit Y_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 4; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// month 1-12 +template +class m_formatter final : public flag_formatter +{ +public: + explicit m_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + } +}; + +// day of month 1-31 +template +class d_formatter final : public flag_formatter +{ +public: + explicit d_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mday, dest); + } +}; + +// hours in 24 format 0-23 +template +class H_formatter final : public flag_formatter +{ +public: + explicit H_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_hour, dest); + } +}; + +// hours in 12 format 1-12 +template +class I_formatter final : public flag_formatter +{ +public: + explicit I_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(to12h(tm_time), dest); + } +}; + +// minutes 0-59 +template +class M_formatter final : public flag_formatter +{ +public: + explicit M_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// seconds 0-59 +template +class S_formatter final : public flag_formatter +{ +public: + explicit S_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// milliseconds +template +class e_formatter final : public flag_formatter +{ +public: + explicit e_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto millis = fmt_helper::time_fraction(msg.time); + const size_t field_size = 3; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad3(static_cast(millis.count()), dest); + } +}; + +// microseconds +template +class f_formatter final : public flag_formatter +{ +public: + explicit f_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto micros = fmt_helper::time_fraction(msg.time); + + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad6(static_cast(micros.count()), dest); + } +}; + +// nanoseconds +template +class F_formatter final : public flag_formatter +{ +public: + explicit F_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto ns = fmt_helper::time_fraction(msg.time); + const size_t field_size = 9; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad9(static_cast(ns.count()), dest); + } +}; + +// seconds since epoch +template +class E_formatter final : public flag_formatter +{ +public: + explicit E_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + auto duration = msg.time.time_since_epoch(); + auto seconds = std::chrono::duration_cast(duration).count(); + fmt_helper::append_int(seconds, dest); + } +}; + +// AM/PM +template +class p_formatter final : public flag_formatter +{ +public: + explicit p_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 12 hour clock 02:55:02 pm +template +class r_formatter final : public flag_formatter +{ +public: + explicit r_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 11; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(to12h(tm_time), dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 24-hour HH:MM time, equivalent to %H:%M +template +class R_formatter final : public flag_formatter +{ +public: + explicit R_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 5; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S +template +class T_formatter final : public flag_formatter +{ +public: + explicit T_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// ISO 8601 offset from UTC in timezone (+-HH:MM) +template +class z_formatter final : public flag_formatter +{ +public: + explicit z_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + z_formatter() = default; + z_formatter(const z_formatter &) = delete; + z_formatter &operator=(const z_formatter &) = delete; + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + + auto total_minutes = get_cached_offset(msg, tm_time); + bool is_negative = total_minutes < 0; + if (is_negative) + { + total_minutes = -total_minutes; + dest.push_back('-'); + } + else + { + dest.push_back('+'); + } + + fmt_helper::pad2(total_minutes / 60, dest); // hours + dest.push_back(':'); + fmt_helper::pad2(total_minutes % 60, dest); // minutes + } + +private: + log_clock::time_point last_update_{std::chrono::seconds(0)}; + int offset_minutes_{0}; + + int get_cached_offset(const log_msg &msg, const std::tm &tm_time) + { + // refresh every 10 seconds + if (msg.time - last_update_ >= std::chrono::seconds(10)) + { + offset_minutes_ = os::utc_minutes_offset(tm_time); + last_update_ = msg.time; + } + return offset_minutes_; + } +}; + +// Thread id +template +class t_formatter final : public flag_formatter +{ +public: + explicit t_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const auto field_size = ScopedPadder::count_digits(msg.thread_id); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.thread_id, dest); + } +}; + +// Current pid +template +class pid_formatter final : public flag_formatter +{ +public: + explicit pid_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + const auto pid = static_cast(details::os::pid()); + auto field_size = ScopedPadder::count_digits(pid); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(pid, dest); + } +}; + +template +class v_formatter final : public flag_formatter +{ +public: + explicit v_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.payload.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.payload, dest); + } +}; + +class ch_formatter final : public flag_formatter +{ +public: + explicit ch_formatter(char ch) + : ch_(ch) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + dest.push_back(ch_); + } + +private: + char ch_; +}; + +// aggregate user chars to display as is +class aggregate_formatter final : public flag_formatter +{ +public: + aggregate_formatter() = default; + + void add_ch(char ch) + { + str_ += ch; + } + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + fmt_helper::append_string_view(str_, dest); + } + +private: + std::string str_; +}; + +// mark the color range. expect it to be in the form of "%^colored text%$" +class color_start_formatter final : public flag_formatter +{ +public: + explicit color_start_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_start = dest.size(); + } +}; + +class color_stop_formatter final : public flag_formatter +{ +public: + explicit color_stop_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_end = dest.size(); + } +}; + +// print source location +template +class source_location_formatter final : public flag_formatter +{ +public: + explicit source_location_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + size_t text_size; + if (padinfo_.enabled()) + { + // calc text size for padding based on "filename:line" + text_size = std::char_traits::length(msg.source.filename) + ScopedPadder::count_digits(msg.source.line) + 1; + } + else + { + text_size = 0; + } + + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source filename +template +class source_filename_formatter final : public flag_formatter +{ +public: + explicit source_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + } +}; + +template +class short_filename_formatter final : public flag_formatter +{ +public: + explicit short_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4127) // consider using 'if constexpr' instead +#endif // _MSC_VER + static const char *basename(const char *filename) + { + // if the size is 2 (1 character + null terminator) we can use the more efficient strrchr + // the branch will be elided by optimizations + if (sizeof(os::folder_seps) == 2) + { + const char *rv = std::strrchr(filename, os::folder_seps[0]); + return rv != nullptr ? rv + 1 : filename; + } + else + { + const std::reverse_iterator begin(filename + std::strlen(filename)); + const std::reverse_iterator end(filename); + + const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1); + return it != end ? it.base() : filename; + } + } +#ifdef _MSC_VER +# pragma warning(pop) +#endif // _MSC_VER + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + auto filename = basename(msg.source.filename); + size_t text_size = padinfo_.enabled() ? std::char_traits::length(filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(filename, dest); + } +}; + +template +class source_linenum_formatter final : public flag_formatter +{ +public: + explicit source_linenum_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + auto field_size = ScopedPadder::count_digits(msg.source.line); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source funcname +template +class source_funcname_formatter final : public flag_formatter +{ +public: + explicit source_funcname_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.funcname) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.funcname, dest); + } +}; + +// print elapsed time since last message +template +class elapsed_formatter final : public flag_formatter +{ +public: + using DurationUnits = Units; + + explicit elapsed_formatter(padding_info padinfo) + : flag_formatter(padinfo) + , last_message_time_(log_clock::now()) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta_units = std::chrono::duration_cast(delta); + last_message_time_ = msg.time; + auto delta_count = static_cast(delta_units.count()); + auto n_digits = static_cast(ScopedPadder::count_digits(delta_count)); + ScopedPadder p(n_digits, padinfo_, dest); + fmt_helper::append_int(delta_count, dest); + } + +private: + log_clock::time_point last_message_time_; +}; + +// Full info formatter +// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v +class full_formatter final : public flag_formatter +{ +public: + explicit full_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + using std::chrono::duration_cast; + using std::chrono::milliseconds; + using std::chrono::seconds; + + // cache the date/time part for the next second. + auto duration = msg.time.time_since_epoch(); + auto secs = duration_cast(duration); + + if (cache_timestamp_ != secs || cached_datetime_.size() == 0) + { + cached_datetime_.clear(); + cached_datetime_.push_back('['); + fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mday, cached_datetime_); + cached_datetime_.push_back(' '); + + fmt_helper::pad2(tm_time.tm_hour, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_min, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_sec, cached_datetime_); + cached_datetime_.push_back('.'); + + cache_timestamp_ = secs; + } + dest.append(cached_datetime_.begin(), cached_datetime_.end()); + + auto millis = fmt_helper::time_fraction(msg.time); + fmt_helper::pad3(static_cast(millis.count()), dest); + dest.push_back(']'); + dest.push_back(' '); + + // append logger name if exists + if (msg.logger_name.size() > 0) + { + dest.push_back('['); + fmt_helper::append_string_view(msg.logger_name, dest); + dest.push_back(']'); + dest.push_back(' '); + } + + dest.push_back('['); + // wrap the level name with color + msg.color_range_start = dest.size(); + // fmt_helper::append_string_view(level::to_c_str(msg.level), dest); + fmt_helper::append_string_view(level::to_string_view(msg.level), dest); + msg.color_range_end = dest.size(); + dest.push_back(']'); + dest.push_back(' '); + + // add source location if present + if (!msg.source.empty()) + { + dest.push_back('['); + const char *filename = details::short_filename_formatter::basename(msg.source.filename); + fmt_helper::append_string_view(filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + dest.push_back(']'); + dest.push_back(' '); + } + // fmt_helper::append_string_view(msg.msg(), dest); + fmt_helper::append_string_view(msg.payload, dest); + } + +private: + std::chrono::seconds cache_timestamp_{0}; + memory_buf_t cached_datetime_; +}; + +} // namespace details + +SPDLOG_INLINE pattern_formatter::pattern_formatter( + std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags) + : pattern_(std::move(pattern)) + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(false) + , last_log_secs_(0) + , custom_handlers_(std::move(custom_user_flags)) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + compile_pattern_(pattern_); +} + +// use by default full formatter for if pattern is not given +SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + : pattern_("%+") + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(true) + , last_log_secs_(0) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + formatters_.push_back(details::make_unique(details::padding_info{})); +} + +SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const +{ + custom_flags cloned_custom_formatters; + for (auto &it : custom_handlers_) + { + cloned_custom_formatters[it.first] = it.second->clone(); + } + auto cloned = details::make_unique(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters)); + cloned->need_localtime(need_localtime_); +#if defined(__GNUC__) && __GNUC__ < 5 + return std::move(cloned); +#else + return cloned; +#endif +} + +SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest) +{ + if (need_localtime_) + { + const auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); + if (secs != last_log_secs_) + { + cached_tm_ = get_time_(msg); + last_log_secs_ = secs; + } + } + + for (auto &f : formatters_) + { + f->format(msg, cached_tm_, dest); + } + // write eol + details::fmt_helper::append_string_view(eol_, dest); +} + +SPDLOG_INLINE void pattern_formatter::set_pattern(std::string pattern) +{ + pattern_ = std::move(pattern); + need_localtime_ = false; + compile_pattern_(pattern_); +} + +SPDLOG_INLINE void pattern_formatter::need_localtime(bool need) +{ + need_localtime_ = need; +} + +SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) +{ + if (pattern_time_type_ == pattern_time_type::local) + { + return details::os::localtime(log_clock::to_time_t(msg.time)); + } + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} + +template +SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) +{ + // process custom flags + auto it = custom_handlers_.find(flag); + if (it != custom_handlers_.end()) + { + auto custom_handler = it->second->clone(); + custom_handler->set_padding_info(padding); + formatters_.push_back(std::move(custom_handler)); + return; + } + + // process built-in flags + switch (flag) + { + case ('+'): // default formatter + formatters_.push_back(details::make_unique(padding)); + need_localtime_ = true; + break; + + case 'n': // logger name + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'l': // level + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'L': // short level + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('t'): // thread id + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('v'): // the message text + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('a'): // weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('A'): // short weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('b'): + case ('h'): // month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('B'): // short month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('c'): // datetime + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('C'): // year 2 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('Y'): // year 4 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('D'): + case ('x'): // datetime MM/DD/YY + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('m'): // month 1-12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('d'): // day of month 1-31 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('H'): // hours 24 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('I'): // hours 12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('M'): // minutes + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('S'): // seconds + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('e'): // milliseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('f'): // microseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('F'): // nanoseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('E'): // seconds since epoch + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('p'): // am/pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('r'): // 12 hour clock 02:55:02 pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('R'): // 24-hour HH:MM time + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('T'): + case ('X'): // ISO 8601 time format (HH:MM:SS) + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('z'): // timezone + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('P'): // pid + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('^'): // color range start + formatters_.push_back(details::make_unique(padding)); + break; + + case ('$'): // color range end + formatters_.push_back(details::make_unique(padding)); + break; + + case ('@'): // source location (filename:filenumber) + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('s'): // short source filename - without directory name + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('g'): // full source filename + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('#'): // source line number + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('!'): // source funcname + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('%'): // % char + formatters_.push_back(details::make_unique('%')); + break; + + case ('u'): // elapsed time since last log message in nanos + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('i'): // elapsed time since last log message in micros + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('o'): // elapsed time since last log message in millis + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('O'): // elapsed time since last log message in seconds + formatters_.push_back(details::make_unique>(padding)); + break; + + default: // Unknown flag appears as is + auto unknown_flag = details::make_unique(); + + if (!padding.truncate_) + { + unknown_flag->add_ch('%'); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + // fix issue #1617 (prev char was '!' and should have been treated as funcname flag instead of truncating flag) + // spdlog::set_pattern("[%10!] %v") => "[ main] some message" + // spdlog::set_pattern("[%3!!] %v") => "[mai] some message" + else + { + padding.truncate_ = false; + formatters_.push_back(details::make_unique>(padding)); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + + break; + } +} + +// Extract given pad spec (e.g. %8X, %=8X, %-8!X, %8!X, %=8!X, %-8!X, %+8!X) +// Advance the given it pass the end of the padding spec found (if any) +// Return padding. +SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) +{ + using details::padding_info; + using details::scoped_padder; + const size_t max_width = 64; + if (it == end) + { + return padding_info{}; + } + + padding_info::pad_side side; + switch (*it) + { + case '-': + side = padding_info::pad_side::right; + ++it; + break; + case '=': + side = padding_info::pad_side::center; + ++it; + break; + default: + side = details::padding_info::pad_side::left; + break; + } + + if (it == end || !std::isdigit(static_cast(*it))) + { + return padding_info{}; // no padding if no digit found here + } + + auto width = static_cast(*it) - '0'; + for (++it; it != end && std::isdigit(static_cast(*it)); ++it) + { + auto digit = static_cast(*it) - '0'; + width = width * 10 + digit; + } + + // search for the optional truncate marker '!' + bool truncate; + if (it != end && *it == '!') + { + truncate = true; + ++it; + } + else + { + truncate = false; + } + return details::padding_info{std::min(width, max_width), side, truncate}; +} + +SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) +{ + auto end = pattern.end(); + std::unique_ptr user_chars; + formatters_.clear(); + for (auto it = pattern.begin(); it != end; ++it) + { + if (*it == '%') + { + if (user_chars) // append user chars found so far + { + formatters_.push_back(std::move(user_chars)); + } + + auto padding = handle_padspec_(++it, end); + + if (it != end) + { + if (padding.enabled()) + { + handle_flag_(*it, padding); + } + else + { + handle_flag_(*it, padding); + } + } + else + { + break; + } + } + else // chars not following the % sign should be displayed as is + { + if (!user_chars) + { + user_chars = details::make_unique(); + } + user_chars->add_ch(*it); + } + } + if (user_chars) // append raw chars found so far + { + formatters_.push_back(std::move(user_chars)); + } +} +} // namespace spdlog diff --git a/spdlog/pattern_formatter.h b/spdlog/pattern_formatter.h new file mode 100644 index 0000000..acf1c53 --- /dev/null +++ b/spdlog/pattern_formatter.h @@ -0,0 +1,128 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { +namespace details { + +// padding information. +struct padding_info +{ + enum class pad_side + { + left, + right, + center + }; + + padding_info() = default; + padding_info(size_t width, padding_info::pad_side side, bool truncate) + : width_(width) + , side_(side) + , truncate_(truncate) + , enabled_(true) + {} + + bool enabled() const + { + return enabled_; + } + size_t width_ = 0; + pad_side side_ = pad_side::left; + bool truncate_ = false; + bool enabled_ = false; +}; + +class SPDLOG_API flag_formatter +{ +public: + explicit flag_formatter(padding_info padinfo) + : padinfo_(padinfo) + {} + flag_formatter() = default; + virtual ~flag_formatter() = default; + virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0; + +protected: + padding_info padinfo_; +}; + +} // namespace details + +class SPDLOG_API custom_flag_formatter : public details::flag_formatter +{ +public: + virtual std::unique_ptr clone() const = 0; + + void set_padding_info(const details::padding_info &padding) + { + flag_formatter::padinfo_ = padding; + } +}; + +class SPDLOG_API pattern_formatter final : public formatter +{ +public: + using custom_flags = std::unordered_map>; + + explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local, + std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags()); + + // use default pattern is not given + explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol); + + pattern_formatter(const pattern_formatter &other) = delete; + pattern_formatter &operator=(const pattern_formatter &other) = delete; + + std::unique_ptr clone() const override; + void format(const details::log_msg &msg, memory_buf_t &dest) override; + + template + pattern_formatter &add_flag(char flag, Args &&... args) + { + custom_handlers_[flag] = details::make_unique(std::forward(args)...); + return *this; + } + void set_pattern(std::string pattern); + void need_localtime(bool need = true); + +private: + std::string pattern_; + std::string eol_; + pattern_time_type pattern_time_type_; + bool need_localtime_; + std::tm cached_tm_; + std::chrono::seconds last_log_secs_; + std::vector> formatters_; + custom_flags custom_handlers_; + + std::tm get_time_(const details::log_msg &msg); + template + void handle_flag_(char flag, details::padding_info padding); + + // Extract given pad spec (e.g. %8X) + // Advance the given it pass the end of the padding spec found (if any) + // Return padding. + static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end); + + void compile_pattern_(const std::string &pattern); +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "pattern_formatter-inl.h" +#endif diff --git a/spdlog/spdlog-inl.h b/spdlog/spdlog-inl.h new file mode 100644 index 0000000..708399c --- /dev/null +++ b/spdlog/spdlog-inl.h @@ -0,0 +1,120 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { + +SPDLOG_INLINE void initialize_logger(std::shared_ptr logger) +{ + details::registry::instance().initialize_logger(std::move(logger)); +} + +SPDLOG_INLINE std::shared_ptr get(const std::string &name) +{ + return details::registry::instance().get(name); +} + +SPDLOG_INLINE void set_formatter(std::unique_ptr formatter) +{ + details::registry::instance().set_formatter(std::move(formatter)); +} + +SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type) +{ + set_formatter(std::unique_ptr(new pattern_formatter(std::move(pattern), time_type))); +} + +SPDLOG_INLINE void enable_backtrace(size_t n_messages) +{ + details::registry::instance().enable_backtrace(n_messages); +} + +SPDLOG_INLINE void disable_backtrace() +{ + details::registry::instance().disable_backtrace(); +} + +SPDLOG_INLINE void dump_backtrace() +{ + default_logger_raw()->dump_backtrace(); +} + +SPDLOG_INLINE level::level_enum get_level() +{ + return default_logger_raw()->level(); +} + +SPDLOG_INLINE bool should_log(level::level_enum log_level) +{ + return default_logger_raw()->should_log(log_level); +} + +SPDLOG_INLINE void set_level(level::level_enum log_level) +{ + details::registry::instance().set_level(log_level); +} + +SPDLOG_INLINE void flush_on(level::level_enum log_level) +{ + details::registry::instance().flush_on(log_level); +} + +SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg)) +{ + details::registry::instance().set_error_handler(handler); +} + +SPDLOG_INLINE void register_logger(std::shared_ptr logger) +{ + details::registry::instance().register_logger(std::move(logger)); +} + +SPDLOG_INLINE void apply_all(const std::function)> &fun) +{ + details::registry::instance().apply_all(fun); +} + +SPDLOG_INLINE void drop(const std::string &name) +{ + details::registry::instance().drop(name); +} + +SPDLOG_INLINE void drop_all() +{ + details::registry::instance().drop_all(); +} + +SPDLOG_INLINE void shutdown() +{ + details::registry::instance().shutdown(); +} + +SPDLOG_INLINE void set_automatic_registration(bool automatic_registration) +{ + details::registry::instance().set_automatic_registration(automatic_registration); +} + +SPDLOG_INLINE std::shared_ptr default_logger() +{ + return details::registry::instance().default_logger(); +} + +SPDLOG_INLINE spdlog::logger *default_logger_raw() +{ + return details::registry::instance().get_default_raw(); +} + +SPDLOG_INLINE void set_default_logger(std::shared_ptr default_logger) +{ + details::registry::instance().set_default_logger(std::move(default_logger)); +} + +} // namespace spdlog diff --git a/spdlog/spdlog.h b/spdlog/spdlog.h new file mode 100644 index 0000000..ee83e8d --- /dev/null +++ b/spdlog/spdlog.h @@ -0,0 +1,354 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +// spdlog main header file. +// see example.cpp for usage example + +#ifndef SPDLOG_H +#define SPDLOG_H + +#pragma once + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +namespace spdlog { + +using default_factory = synchronous_factory; + +// Create and register a logger with a templated sink type +// The logger's level, formatter and flush level will be set according the +// global settings. +// +// Example: +// spdlog::create("logger_name", "dailylog_filename", 11, 59); +template +inline std::shared_ptr create(std::string logger_name, SinkArgs &&... sink_args) +{ + return default_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +// Initialize and register a logger, +// formatter and flush level will be set according the global settings. +// +// Useful for initializing manually created loggers with the global settings. +// +// Example: +// auto mylogger = std::make_shared("mylogger", ...); +// spdlog::initialize_logger(mylogger); +SPDLOG_API void initialize_logger(std::shared_ptr logger); + +// Return an existing logger or nullptr if a logger with such name doesn't +// exist. +// example: spdlog::get("my_logger")->info("hello {}", "world"); +SPDLOG_API std::shared_ptr get(const std::string &name); + +// Set global formatter. Each sink in each logger will get a clone of this object +SPDLOG_API void set_formatter(std::unique_ptr formatter); + +// Set global format string. +// example: spdlog::set_pattern("%Y-%m-%d %H:%M:%S.%e %l : %v"); +SPDLOG_API void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + +// enable global backtrace support +SPDLOG_API void enable_backtrace(size_t n_messages); + +// disable global backtrace support +SPDLOG_API void disable_backtrace(); + +// call dump backtrace on default logger +SPDLOG_API void dump_backtrace(); + +// Get global logging level +SPDLOG_API level::level_enum get_level(); + +// Set global logging level +SPDLOG_API void set_level(level::level_enum log_level); + +// Determine whether the default logger should log messages with a certain level +SPDLOG_API bool should_log(level::level_enum lvl); + +// Set global flush level +SPDLOG_API void flush_on(level::level_enum log_level); + +// Start/Restart a periodic flusher thread +// Warning: Use only if all your loggers are thread safe! +template +inline void flush_every(std::chrono::duration interval) +{ + details::registry::instance().flush_every(interval); +} + +// Set global error handler +SPDLOG_API void set_error_handler(void (*handler)(const std::string &msg)); + +// Register the given logger with the given name +SPDLOG_API void register_logger(std::shared_ptr logger); + +// Apply a user defined function on all registered loggers +// Example: +// spdlog::apply_all([&](std::shared_ptr l) {l->flush();}); +SPDLOG_API void apply_all(const std::function)> &fun); + +// Drop the reference to the given logger +SPDLOG_API void drop(const std::string &name); + +// Drop all references from the registry +SPDLOG_API void drop_all(); + +// stop any running threads started by spdlog and clean registry loggers +SPDLOG_API void shutdown(); + +// Automatic registration of loggers when using spdlog::create() or spdlog::create_async +SPDLOG_API void set_automatic_registration(bool automatic_registration); + +// API for using default logger (stdout_color_mt), +// e.g: spdlog::info("Message {}", 1); +// +// The default logger object can be accessed using the spdlog::default_logger(): +// For example, to add another sink to it: +// spdlog::default_logger()->sinks().push_back(some_sink); +// +// The default logger can replaced using spdlog::set_default_logger(new_logger). +// For example, to replace it with a file logger. +// +// IMPORTANT: +// The default API is thread safe (for _mt loggers), but: +// set_default_logger() *should not* be used concurrently with the default API. +// e.g do not call set_default_logger() from one thread while calling spdlog::info() from another. + +SPDLOG_API std::shared_ptr default_logger(); + +SPDLOG_API spdlog::logger *default_logger_raw(); + +SPDLOG_API void set_default_logger(std::shared_ptr default_logger); + +template +inline void log(source_loc source, level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} + +template +inline void log(source_loc source, level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(source, lvl, msg); +} + +template +inline void log(level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(lvl, msg); +} + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +template +inline void log(source_loc source, level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} +#endif + +template +inline void trace(const T &msg) +{ + default_logger_raw()->trace(msg); +} + +template +inline void debug(const T &msg) +{ + default_logger_raw()->debug(msg); +} + +template +inline void info(const T &msg) +{ + default_logger_raw()->info(msg); +} + +template +inline void warn(const T &msg) +{ + default_logger_raw()->warn(msg); +} + +template +inline void error(const T &msg) +{ + default_logger_raw()->error(msg); +} + +template +inline void critical(const T &msg) +{ + default_logger_raw()->critical(msg); +} + +} // namespace spdlog + +// +// enable/disable log calls at compile time according to global level. +// +// define SPDLOG_ACTIVE_LEVEL to one of those (before including spdlog.h): +// SPDLOG_LEVEL_TRACE, +// SPDLOG_LEVEL_DEBUG, +// SPDLOG_LEVEL_INFO, +// SPDLOG_LEVEL_WARN, +// SPDLOG_LEVEL_ERROR, +// SPDLOG_LEVEL_CRITICAL, +// SPDLOG_LEVEL_OFF +// + +#ifndef SPDLOG_NO_SOURCE_LOC +# define SPDLOG_LOGGER_CALL(logger, level, ...) \ + (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CALL(logger, level, ...) (logger)->log(spdlog::source_loc{}, level, __VA_ARGS__) +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE +# define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__) +# define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_TRACE(logger, ...) (void)0 +# define SPDLOG_TRACE(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_DEBUG +# define SPDLOG_LOGGER_DEBUG(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::debug, __VA_ARGS__) +# define SPDLOG_DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_DEBUG(logger, ...) (void)0 +# define SPDLOG_DEBUG(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_INFO +# define SPDLOG_LOGGER_INFO(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::info, __VA_ARGS__) +# define SPDLOG_INFO(...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_INFO(logger, ...) (void)0 +# define SPDLOG_INFO(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_WARN +# define SPDLOG_LOGGER_WARN(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::warn, __VA_ARGS__) +# define SPDLOG_WARN(...) SPDLOG_LOGGER_WARN(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_WARN(logger, ...) (void)0 +# define SPDLOG_WARN(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_ERROR +# define SPDLOG_LOGGER_ERROR(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::err, __VA_ARGS__) +# define SPDLOG_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_ERROR(logger, ...) (void)0 +# define SPDLOG_ERROR(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_CRITICAL +# define SPDLOG_LOGGER_CRITICAL(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::critical, __VA_ARGS__) +# define SPDLOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CRITICAL(logger, ...) (void)0 +# define SPDLOG_CRITICAL(...) (void)0 +#endif + +#ifdef SPDLOG_HEADER_ONLY +# include "spdlog-inl.h" +#endif + +#endif // SPDLOG_H diff --git a/spdlog/stopwatch.h b/spdlog/stopwatch.h new file mode 100644 index 0000000..5d1f2dc --- /dev/null +++ b/spdlog/stopwatch.h @@ -0,0 +1,69 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +// Stopwatch support for spdlog (using std::chrono::steady_clock). +// Displays elapsed seconds since construction as double. +// +// Usage: +// +// spdlog::stopwatch sw; +// ... +// spdlog::debug("Elapsed: {} seconds", sw); => "Elapsed 0.005116733 seconds" +// spdlog::info("Elapsed: {:.6} seconds", sw); => "Elapsed 0.005163 seconds" +// +// +// If other units are needed (e.g. millis instead of double), include "fmt/chrono.h" and use "duration_cast<..>(sw.elapsed())": +// +// #include +//.. +// using std::chrono::duration_cast; +// using std::chrono::milliseconds; +// spdlog::info("Elapsed {}", duration_cast(sw.elapsed())); => "Elapsed 5ms" + +namespace spdlog { +class stopwatch +{ + using clock = std::chrono::steady_clock; + std::chrono::time_point start_tp_; + +public: + stopwatch() + : start_tp_{clock::now()} + {} + + std::chrono::duration elapsed() const + { + return std::chrono::duration(clock::now() - start_tp_); + } + + void reset() + { + start_tp_ = clock::now(); + } +}; +} // namespace spdlog + +// Support for fmt formatting (e.g. "{:012.9}" or just "{}") +namespace +#ifdef SPDLOG_USE_STD_FORMAT + std +#else + fmt +#endif +{ + +template<> +struct formatter : formatter +{ + template + auto format(const spdlog::stopwatch &sw, FormatContext &ctx) -> decltype(ctx.out()) + { + return formatter::format(sw.elapsed().count(), ctx); + } +}; +} // namespace std diff --git a/spdlog/tweakme.h b/spdlog/tweakme.h new file mode 100644 index 0000000..5bcb5ff --- /dev/null +++ b/spdlog/tweakme.h @@ -0,0 +1,140 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +/////////////////////////////////////////////////////////////////////////////// +// +// Edit this file to squeeze more performance, and to customize supported +// features +// +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Under Linux, the much faster CLOCK_REALTIME_COARSE clock can be used. +// This clock is less accurate - can be off by dozens of millis - depending on +// the kernel HZ. +// Uncomment to use it instead of the regular clock. +// +// #define SPDLOG_CLOCK_COARSE +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if source location logging is not needed. +// This will prevent spdlog from using __FILE__, __LINE__ and SPDLOG_FUNCTION +// +// #define SPDLOG_NO_SOURCE_LOC +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if thread id logging is not needed (i.e. no %t in the log pattern). +// This will prevent spdlog from querying the thread id on each log call. +// +// WARNING: If the log pattern contains thread id (i.e, %t) while this flag is +// on, zero will be logged as thread id. +// +// #define SPDLOG_NO_THREAD_ID +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent spdlog from using thread local storage. +// +// WARNING: if your program forks, UNCOMMENT this flag to prevent undefined +// thread ids in the children logs. +// +// #define SPDLOG_NO_TLS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to avoid spdlog's usage of atomic log levels +// Use only if your code never modifies a logger's log levels concurrently by +// different threads. +// +// #define SPDLOG_NO_ATOMIC_LEVELS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable usage of wchar_t for file names on Windows. +// +// #define SPDLOG_WCHAR_FILENAMES +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default eol ("\n" or "\r\n" under Linux/Windows) +// +// #define SPDLOG_EOL ";-)\n" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default folder separators ("/" or "\\/" under +// Linux/Windows). Each character in the string is treated as a different +// separator. +// +// #define SPDLOG_FOLDER_SEPS "\\" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use your own copy of the fmt library instead of spdlog's copy. +// In this case spdlog will try to include so set your -I flag +// accordingly. +// +// #define SPDLOG_FMT_EXTERNAL +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use C++20 std::format instead of fmt. +// +// #define SPDLOG_USE_STD_FORMAT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable wchar_t support (convert to utf8) +// +// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent child processes from inheriting log file descriptors +// +// #define SPDLOG_PREVENT_CHILD_FD +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize level names (e.g. "MY TRACE") +// +// #define SPDLOG_LEVEL_NAMES { "MY TRACE", "MY DEBUG", "MY INFO", "MY WARNING", "MY ERROR", "MY CRITICAL", "OFF" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize short level names (e.g. "MT") +// These can be longer than one character. +// +// #define SPDLOG_SHORT_LEVEL_NAMES { "T", "D", "I", "W", "E", "C", "O" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to disable default logger creation. +// This might save some (very) small initialization time if no default logger is needed. +// +// #define SPDLOG_DISABLE_DEFAULT_LOGGER +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment and set to compile time level with zero cost (default is INFO). +// Macros like SPDLOG_DEBUG(..), SPDLOG_INFO(..) will expand to empty statements if not enabled +// +// #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment (and change if desired) macro to use for function names. +// This is compiler dependent. +// __PRETTY_FUNCTION__ might be nicer in clang/gcc, and __FUNCTION__ in msvc. +// Defaults to __FUNCTION__ (should work on all compilers) if not defined. +// +// #ifdef __PRETTY_FUNCTION__ +// # define SPDLOG_FUNCTION __PRETTY_FUNCTION__ +// #else +// # define SPDLOG_FUNCTION __FUNCTION__ +// #endif +/////////////////////////////////////////////////////////////////////////////// diff --git a/spdlog/version.h b/spdlog/version.h new file mode 100644 index 0000000..5717bea --- /dev/null +++ b/spdlog/version.h @@ -0,0 +1,10 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#define SPDLOG_VER_MAJOR 1 +#define SPDLOG_VER_MINOR 11 +#define SPDLOG_VER_PATCH 0 + +#define SPDLOG_VERSION (SPDLOG_VER_MAJOR * 10000 + SPDLOG_VER_MINOR * 100 + SPDLOG_VER_PATCH) diff --git a/utils/SettingConfig.cpp b/utils/SettingConfig.cpp index f10b016..4b177fc 100644 --- a/utils/SettingConfig.cpp +++ b/utils/SettingConfig.cpp @@ -43,6 +43,9 @@ PORT_NAME = getProperty("com", "motoPortName").toString(); RECOG_TYPE = getProperty("recognize", "recogType").toInt(); + + LOG_FILE = getProperty("log", "logFile").toString(); + LOG_LEVEL = getProperty("log", "logLevel").toString(); } diff --git a/utils/SettingConfig.h b/utils/SettingConfig.h index 89541ca..be5bbfe 100644 --- a/utils/SettingConfig.h +++ b/utils/SettingConfig.h @@ -64,6 +64,9 @@ int RECOG_TYPE = 0; + QString LOG_FILE; + QString LOG_LEVEL; + private: SettingConfig(); diff --git a/utils/SpdLogUtil.h b/utils/SpdLogUtil.h new file mode 100644 index 0000000..65574e2 --- /dev/null +++ b/utils/SpdLogUtil.h @@ -0,0 +1,87 @@ +#ifndef SPDLOGUTIL_H +#define SPDLOGUTIL_H + +#include "spdlog/spdlog.h" +#include "spdlog/sinks/daily_file_sink.h" + +#include "SettingConfig.h" + +// use embedded macro to support file and line number +#define LOG_TRACE(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::trace, __VA_ARGS__) +#define LOG_DEBUG(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::debug, __VA_ARGS__) +#define LOG_INFO(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::info, __VA_ARGS__) +#define LOG_WARN(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::warn, __VA_ARGS__) +#define LOG_ERROR(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::err, __VA_ARGS__) + + +class SpdLogUtil +{ +public: + ~SpdLogUtil() + { + spdlog::drop_all(); + } + + SpdLogUtil(const SpdLogUtil&)=delete; + SpdLogUtil& operator=(const SpdLogUtil&)=delete; //禁止生成默认赋值函数 + + // magic singleton static + static SpdLogUtil* getInstance() { + static SpdLogUtil instance; + return &instance; + } + + std::shared_ptr getLogger() + { + return m_logger; + } + +private: + SpdLogUtil() + { + try { + + // Create a daily logger - a new file is created every day on 00:00am + m_logger = spdlog::daily_logger_mt("CasicBioRec", SettingConfig::getInstance().LOG_FILE.toStdString(), 0, 0); + + m_logger->set_pattern("[%Y-%m-%d %H:%M:%S.%e][%l] %v"); + + std::string level = SettingConfig::getInstance().LOG_LEVEL.toStdString(); + if (level == "trace") + { + m_logger->set_level(spdlog::level::trace); + m_logger->flush_on(spdlog::level::trace); + } + else if (level == "debug") + { + m_logger->set_level(spdlog::level::debug); + m_logger->flush_on(spdlog::level::debug); + } + else if (level == "info") + { + m_logger->set_level(spdlog::level::info); + m_logger->flush_on(spdlog::level::info); + } + else if (level == "warn") + { + m_logger->set_level(spdlog::level::warn); + m_logger->flush_on(spdlog::level::warn); + } + else if (level == "error") + { + m_logger->set_level(spdlog::level::err); + m_logger->flush_on(spdlog::level::err); + } + } + catch (const spdlog::spdlog_ex& ex) + { + spdlog::error("init log failed: {}",ex.what()); + + } + } + + std::shared_ptr m_logger; + +}; + +#endif // SPDLOGUTIL_H diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/spdlog/pattern_formatter-inl.h b/spdlog/pattern_formatter-inl.h new file mode 100644 index 0000000..01afbe6 --- /dev/null +++ b/spdlog/pattern_formatter-inl.h @@ -0,0 +1,1436 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace spdlog { +namespace details { + +/////////////////////////////////////////////////////////////////////// +// name & level pattern appender +/////////////////////////////////////////////////////////////////////// + +class scoped_padder +{ +public: + scoped_padder(size_t wrapped_size, const padding_info &padinfo, memory_buf_t &dest) + : padinfo_(padinfo) + , dest_(dest) + { + remaining_pad_ = static_cast(padinfo.width_) - static_cast(wrapped_size); + if (remaining_pad_ <= 0) + { + return; + } + + if (padinfo_.side_ == padding_info::pad_side::left) + { + pad_it(remaining_pad_); + remaining_pad_ = 0; + } + else if (padinfo_.side_ == padding_info::pad_side::center) + { + auto half_pad = remaining_pad_ / 2; + auto reminder = remaining_pad_ & 1; + pad_it(half_pad); + remaining_pad_ = half_pad + reminder; // for the right side + } + } + + template + static unsigned int count_digits(T n) + { + return fmt_helper::count_digits(n); + } + + ~scoped_padder() + { + if (remaining_pad_ >= 0) + { + pad_it(remaining_pad_); + } + else if (padinfo_.truncate_) + { + long new_size = static_cast(dest_.size()) + remaining_pad_; + dest_.resize(static_cast(new_size)); + } + } + +private: + void pad_it(long count) + { + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); + } + + const padding_info &padinfo_; + memory_buf_t &dest_; + long remaining_pad_; + string_view_t spaces_{" ", 64}; +}; + +struct null_scoped_padder +{ + null_scoped_padder(size_t /*wrapped_size*/, const padding_info & /*padinfo*/, memory_buf_t & /*dest*/) {} + + template + static unsigned int count_digits(T /* number */) + { + return 0; + } +}; + +template +class name_formatter final : public flag_formatter +{ +public: + explicit name_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.logger_name.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.logger_name, dest); + } +}; + +// log level appender +template +class level_formatter final : public flag_formatter +{ +public: + explicit level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const string_view_t &level_name = level::to_string_view(msg.level); + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +// short log level appender +template +class short_level_formatter final : public flag_formatter +{ +public: + explicit short_level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + string_view_t level_name{level::to_short_c_str(msg.level)}; + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +/////////////////////////////////////////////////////////////////////// +// Date time pattern appenders +/////////////////////////////////////////////////////////////////////// + +static const char *ampm(const tm &t) +{ + return t.tm_hour >= 12 ? "PM" : "AM"; +} + +static int to12h(const tm &t) +{ + return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour; +} + +// Abbreviated weekday name +static std::array days{{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}}; + +template +class a_formatter final : public flag_formatter +{ +public: + explicit a_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full weekday name +static std::array full_days{{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}}; + +template +class A_formatter : public flag_formatter +{ +public: + explicit A_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Abbreviated month +static const std::array months{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}}; + +template +class b_formatter final : public flag_formatter +{ +public: + explicit b_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full month name +static const std::array full_months{ + {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}}; + +template +class B_formatter final : public flag_formatter +{ +public: + explicit B_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Date and time representation (Thu Aug 23 15:35:46 2014) +template +class c_formatter final : public flag_formatter +{ +public: + explicit c_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 24; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::append_string_view(days[static_cast(tm_time.tm_wday)], dest); + dest.push_back(' '); + fmt_helper::append_string_view(months[static_cast(tm_time.tm_mon)], dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_mday, dest); + dest.push_back(' '); + // time + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// year - 2 digit +template +class C_formatter final : public flag_formatter +{ +public: + explicit C_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01 +template +class D_formatter final : public flag_formatter +{ +public: + explicit D_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_mday, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// year - 4 digit +template +class Y_formatter final : public flag_formatter +{ +public: + explicit Y_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 4; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// month 1-12 +template +class m_formatter final : public flag_formatter +{ +public: + explicit m_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + } +}; + +// day of month 1-31 +template +class d_formatter final : public flag_formatter +{ +public: + explicit d_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mday, dest); + } +}; + +// hours in 24 format 0-23 +template +class H_formatter final : public flag_formatter +{ +public: + explicit H_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_hour, dest); + } +}; + +// hours in 12 format 1-12 +template +class I_formatter final : public flag_formatter +{ +public: + explicit I_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(to12h(tm_time), dest); + } +}; + +// minutes 0-59 +template +class M_formatter final : public flag_formatter +{ +public: + explicit M_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// seconds 0-59 +template +class S_formatter final : public flag_formatter +{ +public: + explicit S_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// milliseconds +template +class e_formatter final : public flag_formatter +{ +public: + explicit e_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto millis = fmt_helper::time_fraction(msg.time); + const size_t field_size = 3; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad3(static_cast(millis.count()), dest); + } +}; + +// microseconds +template +class f_formatter final : public flag_formatter +{ +public: + explicit f_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto micros = fmt_helper::time_fraction(msg.time); + + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad6(static_cast(micros.count()), dest); + } +}; + +// nanoseconds +template +class F_formatter final : public flag_formatter +{ +public: + explicit F_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto ns = fmt_helper::time_fraction(msg.time); + const size_t field_size = 9; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad9(static_cast(ns.count()), dest); + } +}; + +// seconds since epoch +template +class E_formatter final : public flag_formatter +{ +public: + explicit E_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + auto duration = msg.time.time_since_epoch(); + auto seconds = std::chrono::duration_cast(duration).count(); + fmt_helper::append_int(seconds, dest); + } +}; + +// AM/PM +template +class p_formatter final : public flag_formatter +{ +public: + explicit p_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 12 hour clock 02:55:02 pm +template +class r_formatter final : public flag_formatter +{ +public: + explicit r_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 11; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(to12h(tm_time), dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 24-hour HH:MM time, equivalent to %H:%M +template +class R_formatter final : public flag_formatter +{ +public: + explicit R_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 5; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S +template +class T_formatter final : public flag_formatter +{ +public: + explicit T_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// ISO 8601 offset from UTC in timezone (+-HH:MM) +template +class z_formatter final : public flag_formatter +{ +public: + explicit z_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + z_formatter() = default; + z_formatter(const z_formatter &) = delete; + z_formatter &operator=(const z_formatter &) = delete; + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + + auto total_minutes = get_cached_offset(msg, tm_time); + bool is_negative = total_minutes < 0; + if (is_negative) + { + total_minutes = -total_minutes; + dest.push_back('-'); + } + else + { + dest.push_back('+'); + } + + fmt_helper::pad2(total_minutes / 60, dest); // hours + dest.push_back(':'); + fmt_helper::pad2(total_minutes % 60, dest); // minutes + } + +private: + log_clock::time_point last_update_{std::chrono::seconds(0)}; + int offset_minutes_{0}; + + int get_cached_offset(const log_msg &msg, const std::tm &tm_time) + { + // refresh every 10 seconds + if (msg.time - last_update_ >= std::chrono::seconds(10)) + { + offset_minutes_ = os::utc_minutes_offset(tm_time); + last_update_ = msg.time; + } + return offset_minutes_; + } +}; + +// Thread id +template +class t_formatter final : public flag_formatter +{ +public: + explicit t_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const auto field_size = ScopedPadder::count_digits(msg.thread_id); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.thread_id, dest); + } +}; + +// Current pid +template +class pid_formatter final : public flag_formatter +{ +public: + explicit pid_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + const auto pid = static_cast(details::os::pid()); + auto field_size = ScopedPadder::count_digits(pid); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(pid, dest); + } +}; + +template +class v_formatter final : public flag_formatter +{ +public: + explicit v_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.payload.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.payload, dest); + } +}; + +class ch_formatter final : public flag_formatter +{ +public: + explicit ch_formatter(char ch) + : ch_(ch) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + dest.push_back(ch_); + } + +private: + char ch_; +}; + +// aggregate user chars to display as is +class aggregate_formatter final : public flag_formatter +{ +public: + aggregate_formatter() = default; + + void add_ch(char ch) + { + str_ += ch; + } + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + fmt_helper::append_string_view(str_, dest); + } + +private: + std::string str_; +}; + +// mark the color range. expect it to be in the form of "%^colored text%$" +class color_start_formatter final : public flag_formatter +{ +public: + explicit color_start_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_start = dest.size(); + } +}; + +class color_stop_formatter final : public flag_formatter +{ +public: + explicit color_stop_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_end = dest.size(); + } +}; + +// print source location +template +class source_location_formatter final : public flag_formatter +{ +public: + explicit source_location_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + size_t text_size; + if (padinfo_.enabled()) + { + // calc text size for padding based on "filename:line" + text_size = std::char_traits::length(msg.source.filename) + ScopedPadder::count_digits(msg.source.line) + 1; + } + else + { + text_size = 0; + } + + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source filename +template +class source_filename_formatter final : public flag_formatter +{ +public: + explicit source_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + } +}; + +template +class short_filename_formatter final : public flag_formatter +{ +public: + explicit short_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4127) // consider using 'if constexpr' instead +#endif // _MSC_VER + static const char *basename(const char *filename) + { + // if the size is 2 (1 character + null terminator) we can use the more efficient strrchr + // the branch will be elided by optimizations + if (sizeof(os::folder_seps) == 2) + { + const char *rv = std::strrchr(filename, os::folder_seps[0]); + return rv != nullptr ? rv + 1 : filename; + } + else + { + const std::reverse_iterator begin(filename + std::strlen(filename)); + const std::reverse_iterator end(filename); + + const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1); + return it != end ? it.base() : filename; + } + } +#ifdef _MSC_VER +# pragma warning(pop) +#endif // _MSC_VER + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + auto filename = basename(msg.source.filename); + size_t text_size = padinfo_.enabled() ? std::char_traits::length(filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(filename, dest); + } +}; + +template +class source_linenum_formatter final : public flag_formatter +{ +public: + explicit source_linenum_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + auto field_size = ScopedPadder::count_digits(msg.source.line); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source funcname +template +class source_funcname_formatter final : public flag_formatter +{ +public: + explicit source_funcname_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.funcname) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.funcname, dest); + } +}; + +// print elapsed time since last message +template +class elapsed_formatter final : public flag_formatter +{ +public: + using DurationUnits = Units; + + explicit elapsed_formatter(padding_info padinfo) + : flag_formatter(padinfo) + , last_message_time_(log_clock::now()) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta_units = std::chrono::duration_cast(delta); + last_message_time_ = msg.time; + auto delta_count = static_cast(delta_units.count()); + auto n_digits = static_cast(ScopedPadder::count_digits(delta_count)); + ScopedPadder p(n_digits, padinfo_, dest); + fmt_helper::append_int(delta_count, dest); + } + +private: + log_clock::time_point last_message_time_; +}; + +// Full info formatter +// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v +class full_formatter final : public flag_formatter +{ +public: + explicit full_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + using std::chrono::duration_cast; + using std::chrono::milliseconds; + using std::chrono::seconds; + + // cache the date/time part for the next second. + auto duration = msg.time.time_since_epoch(); + auto secs = duration_cast(duration); + + if (cache_timestamp_ != secs || cached_datetime_.size() == 0) + { + cached_datetime_.clear(); + cached_datetime_.push_back('['); + fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mday, cached_datetime_); + cached_datetime_.push_back(' '); + + fmt_helper::pad2(tm_time.tm_hour, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_min, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_sec, cached_datetime_); + cached_datetime_.push_back('.'); + + cache_timestamp_ = secs; + } + dest.append(cached_datetime_.begin(), cached_datetime_.end()); + + auto millis = fmt_helper::time_fraction(msg.time); + fmt_helper::pad3(static_cast(millis.count()), dest); + dest.push_back(']'); + dest.push_back(' '); + + // append logger name if exists + if (msg.logger_name.size() > 0) + { + dest.push_back('['); + fmt_helper::append_string_view(msg.logger_name, dest); + dest.push_back(']'); + dest.push_back(' '); + } + + dest.push_back('['); + // wrap the level name with color + msg.color_range_start = dest.size(); + // fmt_helper::append_string_view(level::to_c_str(msg.level), dest); + fmt_helper::append_string_view(level::to_string_view(msg.level), dest); + msg.color_range_end = dest.size(); + dest.push_back(']'); + dest.push_back(' '); + + // add source location if present + if (!msg.source.empty()) + { + dest.push_back('['); + const char *filename = details::short_filename_formatter::basename(msg.source.filename); + fmt_helper::append_string_view(filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + dest.push_back(']'); + dest.push_back(' '); + } + // fmt_helper::append_string_view(msg.msg(), dest); + fmt_helper::append_string_view(msg.payload, dest); + } + +private: + std::chrono::seconds cache_timestamp_{0}; + memory_buf_t cached_datetime_; +}; + +} // namespace details + +SPDLOG_INLINE pattern_formatter::pattern_formatter( + std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags) + : pattern_(std::move(pattern)) + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(false) + , last_log_secs_(0) + , custom_handlers_(std::move(custom_user_flags)) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + compile_pattern_(pattern_); +} + +// use by default full formatter for if pattern is not given +SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + : pattern_("%+") + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(true) + , last_log_secs_(0) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + formatters_.push_back(details::make_unique(details::padding_info{})); +} + +SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const +{ + custom_flags cloned_custom_formatters; + for (auto &it : custom_handlers_) + { + cloned_custom_formatters[it.first] = it.second->clone(); + } + auto cloned = details::make_unique(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters)); + cloned->need_localtime(need_localtime_); +#if defined(__GNUC__) && __GNUC__ < 5 + return std::move(cloned); +#else + return cloned; +#endif +} + +SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest) +{ + if (need_localtime_) + { + const auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); + if (secs != last_log_secs_) + { + cached_tm_ = get_time_(msg); + last_log_secs_ = secs; + } + } + + for (auto &f : formatters_) + { + f->format(msg, cached_tm_, dest); + } + // write eol + details::fmt_helper::append_string_view(eol_, dest); +} + +SPDLOG_INLINE void pattern_formatter::set_pattern(std::string pattern) +{ + pattern_ = std::move(pattern); + need_localtime_ = false; + compile_pattern_(pattern_); +} + +SPDLOG_INLINE void pattern_formatter::need_localtime(bool need) +{ + need_localtime_ = need; +} + +SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) +{ + if (pattern_time_type_ == pattern_time_type::local) + { + return details::os::localtime(log_clock::to_time_t(msg.time)); + } + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} + +template +SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) +{ + // process custom flags + auto it = custom_handlers_.find(flag); + if (it != custom_handlers_.end()) + { + auto custom_handler = it->second->clone(); + custom_handler->set_padding_info(padding); + formatters_.push_back(std::move(custom_handler)); + return; + } + + // process built-in flags + switch (flag) + { + case ('+'): // default formatter + formatters_.push_back(details::make_unique(padding)); + need_localtime_ = true; + break; + + case 'n': // logger name + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'l': // level + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'L': // short level + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('t'): // thread id + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('v'): // the message text + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('a'): // weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('A'): // short weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('b'): + case ('h'): // month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('B'): // short month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('c'): // datetime + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('C'): // year 2 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('Y'): // year 4 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('D'): + case ('x'): // datetime MM/DD/YY + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('m'): // month 1-12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('d'): // day of month 1-31 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('H'): // hours 24 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('I'): // hours 12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('M'): // minutes + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('S'): // seconds + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('e'): // milliseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('f'): // microseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('F'): // nanoseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('E'): // seconds since epoch + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('p'): // am/pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('r'): // 12 hour clock 02:55:02 pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('R'): // 24-hour HH:MM time + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('T'): + case ('X'): // ISO 8601 time format (HH:MM:SS) + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('z'): // timezone + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('P'): // pid + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('^'): // color range start + formatters_.push_back(details::make_unique(padding)); + break; + + case ('$'): // color range end + formatters_.push_back(details::make_unique(padding)); + break; + + case ('@'): // source location (filename:filenumber) + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('s'): // short source filename - without directory name + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('g'): // full source filename + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('#'): // source line number + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('!'): // source funcname + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('%'): // % char + formatters_.push_back(details::make_unique('%')); + break; + + case ('u'): // elapsed time since last log message in nanos + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('i'): // elapsed time since last log message in micros + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('o'): // elapsed time since last log message in millis + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('O'): // elapsed time since last log message in seconds + formatters_.push_back(details::make_unique>(padding)); + break; + + default: // Unknown flag appears as is + auto unknown_flag = details::make_unique(); + + if (!padding.truncate_) + { + unknown_flag->add_ch('%'); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + // fix issue #1617 (prev char was '!' and should have been treated as funcname flag instead of truncating flag) + // spdlog::set_pattern("[%10!] %v") => "[ main] some message" + // spdlog::set_pattern("[%3!!] %v") => "[mai] some message" + else + { + padding.truncate_ = false; + formatters_.push_back(details::make_unique>(padding)); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + + break; + } +} + +// Extract given pad spec (e.g. %8X, %=8X, %-8!X, %8!X, %=8!X, %-8!X, %+8!X) +// Advance the given it pass the end of the padding spec found (if any) +// Return padding. +SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) +{ + using details::padding_info; + using details::scoped_padder; + const size_t max_width = 64; + if (it == end) + { + return padding_info{}; + } + + padding_info::pad_side side; + switch (*it) + { + case '-': + side = padding_info::pad_side::right; + ++it; + break; + case '=': + side = padding_info::pad_side::center; + ++it; + break; + default: + side = details::padding_info::pad_side::left; + break; + } + + if (it == end || !std::isdigit(static_cast(*it))) + { + return padding_info{}; // no padding if no digit found here + } + + auto width = static_cast(*it) - '0'; + for (++it; it != end && std::isdigit(static_cast(*it)); ++it) + { + auto digit = static_cast(*it) - '0'; + width = width * 10 + digit; + } + + // search for the optional truncate marker '!' + bool truncate; + if (it != end && *it == '!') + { + truncate = true; + ++it; + } + else + { + truncate = false; + } + return details::padding_info{std::min(width, max_width), side, truncate}; +} + +SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) +{ + auto end = pattern.end(); + std::unique_ptr user_chars; + formatters_.clear(); + for (auto it = pattern.begin(); it != end; ++it) + { + if (*it == '%') + { + if (user_chars) // append user chars found so far + { + formatters_.push_back(std::move(user_chars)); + } + + auto padding = handle_padspec_(++it, end); + + if (it != end) + { + if (padding.enabled()) + { + handle_flag_(*it, padding); + } + else + { + handle_flag_(*it, padding); + } + } + else + { + break; + } + } + else // chars not following the % sign should be displayed as is + { + if (!user_chars) + { + user_chars = details::make_unique(); + } + user_chars->add_ch(*it); + } + } + if (user_chars) // append raw chars found so far + { + formatters_.push_back(std::move(user_chars)); + } +} +} // namespace spdlog diff --git a/spdlog/pattern_formatter.h b/spdlog/pattern_formatter.h new file mode 100644 index 0000000..acf1c53 --- /dev/null +++ b/spdlog/pattern_formatter.h @@ -0,0 +1,128 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { +namespace details { + +// padding information. +struct padding_info +{ + enum class pad_side + { + left, + right, + center + }; + + padding_info() = default; + padding_info(size_t width, padding_info::pad_side side, bool truncate) + : width_(width) + , side_(side) + , truncate_(truncate) + , enabled_(true) + {} + + bool enabled() const + { + return enabled_; + } + size_t width_ = 0; + pad_side side_ = pad_side::left; + bool truncate_ = false; + bool enabled_ = false; +}; + +class SPDLOG_API flag_formatter +{ +public: + explicit flag_formatter(padding_info padinfo) + : padinfo_(padinfo) + {} + flag_formatter() = default; + virtual ~flag_formatter() = default; + virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0; + +protected: + padding_info padinfo_; +}; + +} // namespace details + +class SPDLOG_API custom_flag_formatter : public details::flag_formatter +{ +public: + virtual std::unique_ptr clone() const = 0; + + void set_padding_info(const details::padding_info &padding) + { + flag_formatter::padinfo_ = padding; + } +}; + +class SPDLOG_API pattern_formatter final : public formatter +{ +public: + using custom_flags = std::unordered_map>; + + explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local, + std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags()); + + // use default pattern is not given + explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol); + + pattern_formatter(const pattern_formatter &other) = delete; + pattern_formatter &operator=(const pattern_formatter &other) = delete; + + std::unique_ptr clone() const override; + void format(const details::log_msg &msg, memory_buf_t &dest) override; + + template + pattern_formatter &add_flag(char flag, Args &&... args) + { + custom_handlers_[flag] = details::make_unique(std::forward(args)...); + return *this; + } + void set_pattern(std::string pattern); + void need_localtime(bool need = true); + +private: + std::string pattern_; + std::string eol_; + pattern_time_type pattern_time_type_; + bool need_localtime_; + std::tm cached_tm_; + std::chrono::seconds last_log_secs_; + std::vector> formatters_; + custom_flags custom_handlers_; + + std::tm get_time_(const details::log_msg &msg); + template + void handle_flag_(char flag, details::padding_info padding); + + // Extract given pad spec (e.g. %8X) + // Advance the given it pass the end of the padding spec found (if any) + // Return padding. + static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end); + + void compile_pattern_(const std::string &pattern); +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "pattern_formatter-inl.h" +#endif diff --git a/spdlog/spdlog-inl.h b/spdlog/spdlog-inl.h new file mode 100644 index 0000000..708399c --- /dev/null +++ b/spdlog/spdlog-inl.h @@ -0,0 +1,120 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { + +SPDLOG_INLINE void initialize_logger(std::shared_ptr logger) +{ + details::registry::instance().initialize_logger(std::move(logger)); +} + +SPDLOG_INLINE std::shared_ptr get(const std::string &name) +{ + return details::registry::instance().get(name); +} + +SPDLOG_INLINE void set_formatter(std::unique_ptr formatter) +{ + details::registry::instance().set_formatter(std::move(formatter)); +} + +SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type) +{ + set_formatter(std::unique_ptr(new pattern_formatter(std::move(pattern), time_type))); +} + +SPDLOG_INLINE void enable_backtrace(size_t n_messages) +{ + details::registry::instance().enable_backtrace(n_messages); +} + +SPDLOG_INLINE void disable_backtrace() +{ + details::registry::instance().disable_backtrace(); +} + +SPDLOG_INLINE void dump_backtrace() +{ + default_logger_raw()->dump_backtrace(); +} + +SPDLOG_INLINE level::level_enum get_level() +{ + return default_logger_raw()->level(); +} + +SPDLOG_INLINE bool should_log(level::level_enum log_level) +{ + return default_logger_raw()->should_log(log_level); +} + +SPDLOG_INLINE void set_level(level::level_enum log_level) +{ + details::registry::instance().set_level(log_level); +} + +SPDLOG_INLINE void flush_on(level::level_enum log_level) +{ + details::registry::instance().flush_on(log_level); +} + +SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg)) +{ + details::registry::instance().set_error_handler(handler); +} + +SPDLOG_INLINE void register_logger(std::shared_ptr logger) +{ + details::registry::instance().register_logger(std::move(logger)); +} + +SPDLOG_INLINE void apply_all(const std::function)> &fun) +{ + details::registry::instance().apply_all(fun); +} + +SPDLOG_INLINE void drop(const std::string &name) +{ + details::registry::instance().drop(name); +} + +SPDLOG_INLINE void drop_all() +{ + details::registry::instance().drop_all(); +} + +SPDLOG_INLINE void shutdown() +{ + details::registry::instance().shutdown(); +} + +SPDLOG_INLINE void set_automatic_registration(bool automatic_registration) +{ + details::registry::instance().set_automatic_registration(automatic_registration); +} + +SPDLOG_INLINE std::shared_ptr default_logger() +{ + return details::registry::instance().default_logger(); +} + +SPDLOG_INLINE spdlog::logger *default_logger_raw() +{ + return details::registry::instance().get_default_raw(); +} + +SPDLOG_INLINE void set_default_logger(std::shared_ptr default_logger) +{ + details::registry::instance().set_default_logger(std::move(default_logger)); +} + +} // namespace spdlog diff --git a/spdlog/spdlog.h b/spdlog/spdlog.h new file mode 100644 index 0000000..ee83e8d --- /dev/null +++ b/spdlog/spdlog.h @@ -0,0 +1,354 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +// spdlog main header file. +// see example.cpp for usage example + +#ifndef SPDLOG_H +#define SPDLOG_H + +#pragma once + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +namespace spdlog { + +using default_factory = synchronous_factory; + +// Create and register a logger with a templated sink type +// The logger's level, formatter and flush level will be set according the +// global settings. +// +// Example: +// spdlog::create("logger_name", "dailylog_filename", 11, 59); +template +inline std::shared_ptr create(std::string logger_name, SinkArgs &&... sink_args) +{ + return default_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +// Initialize and register a logger, +// formatter and flush level will be set according the global settings. +// +// Useful for initializing manually created loggers with the global settings. +// +// Example: +// auto mylogger = std::make_shared("mylogger", ...); +// spdlog::initialize_logger(mylogger); +SPDLOG_API void initialize_logger(std::shared_ptr logger); + +// Return an existing logger or nullptr if a logger with such name doesn't +// exist. +// example: spdlog::get("my_logger")->info("hello {}", "world"); +SPDLOG_API std::shared_ptr get(const std::string &name); + +// Set global formatter. Each sink in each logger will get a clone of this object +SPDLOG_API void set_formatter(std::unique_ptr formatter); + +// Set global format string. +// example: spdlog::set_pattern("%Y-%m-%d %H:%M:%S.%e %l : %v"); +SPDLOG_API void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + +// enable global backtrace support +SPDLOG_API void enable_backtrace(size_t n_messages); + +// disable global backtrace support +SPDLOG_API void disable_backtrace(); + +// call dump backtrace on default logger +SPDLOG_API void dump_backtrace(); + +// Get global logging level +SPDLOG_API level::level_enum get_level(); + +// Set global logging level +SPDLOG_API void set_level(level::level_enum log_level); + +// Determine whether the default logger should log messages with a certain level +SPDLOG_API bool should_log(level::level_enum lvl); + +// Set global flush level +SPDLOG_API void flush_on(level::level_enum log_level); + +// Start/Restart a periodic flusher thread +// Warning: Use only if all your loggers are thread safe! +template +inline void flush_every(std::chrono::duration interval) +{ + details::registry::instance().flush_every(interval); +} + +// Set global error handler +SPDLOG_API void set_error_handler(void (*handler)(const std::string &msg)); + +// Register the given logger with the given name +SPDLOG_API void register_logger(std::shared_ptr logger); + +// Apply a user defined function on all registered loggers +// Example: +// spdlog::apply_all([&](std::shared_ptr l) {l->flush();}); +SPDLOG_API void apply_all(const std::function)> &fun); + +// Drop the reference to the given logger +SPDLOG_API void drop(const std::string &name); + +// Drop all references from the registry +SPDLOG_API void drop_all(); + +// stop any running threads started by spdlog and clean registry loggers +SPDLOG_API void shutdown(); + +// Automatic registration of loggers when using spdlog::create() or spdlog::create_async +SPDLOG_API void set_automatic_registration(bool automatic_registration); + +// API for using default logger (stdout_color_mt), +// e.g: spdlog::info("Message {}", 1); +// +// The default logger object can be accessed using the spdlog::default_logger(): +// For example, to add another sink to it: +// spdlog::default_logger()->sinks().push_back(some_sink); +// +// The default logger can replaced using spdlog::set_default_logger(new_logger). +// For example, to replace it with a file logger. +// +// IMPORTANT: +// The default API is thread safe (for _mt loggers), but: +// set_default_logger() *should not* be used concurrently with the default API. +// e.g do not call set_default_logger() from one thread while calling spdlog::info() from another. + +SPDLOG_API std::shared_ptr default_logger(); + +SPDLOG_API spdlog::logger *default_logger_raw(); + +SPDLOG_API void set_default_logger(std::shared_ptr default_logger); + +template +inline void log(source_loc source, level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} + +template +inline void log(source_loc source, level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(source, lvl, msg); +} + +template +inline void log(level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(lvl, msg); +} + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +template +inline void log(source_loc source, level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} +#endif + +template +inline void trace(const T &msg) +{ + default_logger_raw()->trace(msg); +} + +template +inline void debug(const T &msg) +{ + default_logger_raw()->debug(msg); +} + +template +inline void info(const T &msg) +{ + default_logger_raw()->info(msg); +} + +template +inline void warn(const T &msg) +{ + default_logger_raw()->warn(msg); +} + +template +inline void error(const T &msg) +{ + default_logger_raw()->error(msg); +} + +template +inline void critical(const T &msg) +{ + default_logger_raw()->critical(msg); +} + +} // namespace spdlog + +// +// enable/disable log calls at compile time according to global level. +// +// define SPDLOG_ACTIVE_LEVEL to one of those (before including spdlog.h): +// SPDLOG_LEVEL_TRACE, +// SPDLOG_LEVEL_DEBUG, +// SPDLOG_LEVEL_INFO, +// SPDLOG_LEVEL_WARN, +// SPDLOG_LEVEL_ERROR, +// SPDLOG_LEVEL_CRITICAL, +// SPDLOG_LEVEL_OFF +// + +#ifndef SPDLOG_NO_SOURCE_LOC +# define SPDLOG_LOGGER_CALL(logger, level, ...) \ + (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CALL(logger, level, ...) (logger)->log(spdlog::source_loc{}, level, __VA_ARGS__) +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE +# define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__) +# define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_TRACE(logger, ...) (void)0 +# define SPDLOG_TRACE(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_DEBUG +# define SPDLOG_LOGGER_DEBUG(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::debug, __VA_ARGS__) +# define SPDLOG_DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_DEBUG(logger, ...) (void)0 +# define SPDLOG_DEBUG(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_INFO +# define SPDLOG_LOGGER_INFO(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::info, __VA_ARGS__) +# define SPDLOG_INFO(...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_INFO(logger, ...) (void)0 +# define SPDLOG_INFO(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_WARN +# define SPDLOG_LOGGER_WARN(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::warn, __VA_ARGS__) +# define SPDLOG_WARN(...) SPDLOG_LOGGER_WARN(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_WARN(logger, ...) (void)0 +# define SPDLOG_WARN(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_ERROR +# define SPDLOG_LOGGER_ERROR(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::err, __VA_ARGS__) +# define SPDLOG_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_ERROR(logger, ...) (void)0 +# define SPDLOG_ERROR(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_CRITICAL +# define SPDLOG_LOGGER_CRITICAL(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::critical, __VA_ARGS__) +# define SPDLOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CRITICAL(logger, ...) (void)0 +# define SPDLOG_CRITICAL(...) (void)0 +#endif + +#ifdef SPDLOG_HEADER_ONLY +# include "spdlog-inl.h" +#endif + +#endif // SPDLOG_H diff --git a/spdlog/stopwatch.h b/spdlog/stopwatch.h new file mode 100644 index 0000000..5d1f2dc --- /dev/null +++ b/spdlog/stopwatch.h @@ -0,0 +1,69 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +// Stopwatch support for spdlog (using std::chrono::steady_clock). +// Displays elapsed seconds since construction as double. +// +// Usage: +// +// spdlog::stopwatch sw; +// ... +// spdlog::debug("Elapsed: {} seconds", sw); => "Elapsed 0.005116733 seconds" +// spdlog::info("Elapsed: {:.6} seconds", sw); => "Elapsed 0.005163 seconds" +// +// +// If other units are needed (e.g. millis instead of double), include "fmt/chrono.h" and use "duration_cast<..>(sw.elapsed())": +// +// #include +//.. +// using std::chrono::duration_cast; +// using std::chrono::milliseconds; +// spdlog::info("Elapsed {}", duration_cast(sw.elapsed())); => "Elapsed 5ms" + +namespace spdlog { +class stopwatch +{ + using clock = std::chrono::steady_clock; + std::chrono::time_point start_tp_; + +public: + stopwatch() + : start_tp_{clock::now()} + {} + + std::chrono::duration elapsed() const + { + return std::chrono::duration(clock::now() - start_tp_); + } + + void reset() + { + start_tp_ = clock::now(); + } +}; +} // namespace spdlog + +// Support for fmt formatting (e.g. "{:012.9}" or just "{}") +namespace +#ifdef SPDLOG_USE_STD_FORMAT + std +#else + fmt +#endif +{ + +template<> +struct formatter : formatter +{ + template + auto format(const spdlog::stopwatch &sw, FormatContext &ctx) -> decltype(ctx.out()) + { + return formatter::format(sw.elapsed().count(), ctx); + } +}; +} // namespace std diff --git a/spdlog/tweakme.h b/spdlog/tweakme.h new file mode 100644 index 0000000..5bcb5ff --- /dev/null +++ b/spdlog/tweakme.h @@ -0,0 +1,140 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +/////////////////////////////////////////////////////////////////////////////// +// +// Edit this file to squeeze more performance, and to customize supported +// features +// +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Under Linux, the much faster CLOCK_REALTIME_COARSE clock can be used. +// This clock is less accurate - can be off by dozens of millis - depending on +// the kernel HZ. +// Uncomment to use it instead of the regular clock. +// +// #define SPDLOG_CLOCK_COARSE +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if source location logging is not needed. +// This will prevent spdlog from using __FILE__, __LINE__ and SPDLOG_FUNCTION +// +// #define SPDLOG_NO_SOURCE_LOC +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if thread id logging is not needed (i.e. no %t in the log pattern). +// This will prevent spdlog from querying the thread id on each log call. +// +// WARNING: If the log pattern contains thread id (i.e, %t) while this flag is +// on, zero will be logged as thread id. +// +// #define SPDLOG_NO_THREAD_ID +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent spdlog from using thread local storage. +// +// WARNING: if your program forks, UNCOMMENT this flag to prevent undefined +// thread ids in the children logs. +// +// #define SPDLOG_NO_TLS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to avoid spdlog's usage of atomic log levels +// Use only if your code never modifies a logger's log levels concurrently by +// different threads. +// +// #define SPDLOG_NO_ATOMIC_LEVELS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable usage of wchar_t for file names on Windows. +// +// #define SPDLOG_WCHAR_FILENAMES +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default eol ("\n" or "\r\n" under Linux/Windows) +// +// #define SPDLOG_EOL ";-)\n" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default folder separators ("/" or "\\/" under +// Linux/Windows). Each character in the string is treated as a different +// separator. +// +// #define SPDLOG_FOLDER_SEPS "\\" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use your own copy of the fmt library instead of spdlog's copy. +// In this case spdlog will try to include so set your -I flag +// accordingly. +// +// #define SPDLOG_FMT_EXTERNAL +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use C++20 std::format instead of fmt. +// +// #define SPDLOG_USE_STD_FORMAT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable wchar_t support (convert to utf8) +// +// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent child processes from inheriting log file descriptors +// +// #define SPDLOG_PREVENT_CHILD_FD +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize level names (e.g. "MY TRACE") +// +// #define SPDLOG_LEVEL_NAMES { "MY TRACE", "MY DEBUG", "MY INFO", "MY WARNING", "MY ERROR", "MY CRITICAL", "OFF" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize short level names (e.g. "MT") +// These can be longer than one character. +// +// #define SPDLOG_SHORT_LEVEL_NAMES { "T", "D", "I", "W", "E", "C", "O" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to disable default logger creation. +// This might save some (very) small initialization time if no default logger is needed. +// +// #define SPDLOG_DISABLE_DEFAULT_LOGGER +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment and set to compile time level with zero cost (default is INFO). +// Macros like SPDLOG_DEBUG(..), SPDLOG_INFO(..) will expand to empty statements if not enabled +// +// #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment (and change if desired) macro to use for function names. +// This is compiler dependent. +// __PRETTY_FUNCTION__ might be nicer in clang/gcc, and __FUNCTION__ in msvc. +// Defaults to __FUNCTION__ (should work on all compilers) if not defined. +// +// #ifdef __PRETTY_FUNCTION__ +// # define SPDLOG_FUNCTION __PRETTY_FUNCTION__ +// #else +// # define SPDLOG_FUNCTION __FUNCTION__ +// #endif +/////////////////////////////////////////////////////////////////////////////// diff --git a/spdlog/version.h b/spdlog/version.h new file mode 100644 index 0000000..5717bea --- /dev/null +++ b/spdlog/version.h @@ -0,0 +1,10 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#define SPDLOG_VER_MAJOR 1 +#define SPDLOG_VER_MINOR 11 +#define SPDLOG_VER_PATCH 0 + +#define SPDLOG_VERSION (SPDLOG_VER_MAJOR * 10000 + SPDLOG_VER_MINOR * 100 + SPDLOG_VER_PATCH) diff --git a/utils/SettingConfig.cpp b/utils/SettingConfig.cpp index f10b016..4b177fc 100644 --- a/utils/SettingConfig.cpp +++ b/utils/SettingConfig.cpp @@ -43,6 +43,9 @@ PORT_NAME = getProperty("com", "motoPortName").toString(); RECOG_TYPE = getProperty("recognize", "recogType").toInt(); + + LOG_FILE = getProperty("log", "logFile").toString(); + LOG_LEVEL = getProperty("log", "logLevel").toString(); } diff --git a/utils/SettingConfig.h b/utils/SettingConfig.h index 89541ca..be5bbfe 100644 --- a/utils/SettingConfig.h +++ b/utils/SettingConfig.h @@ -64,6 +64,9 @@ int RECOG_TYPE = 0; + QString LOG_FILE; + QString LOG_LEVEL; + private: SettingConfig(); diff --git a/utils/SpdLogUtil.h b/utils/SpdLogUtil.h new file mode 100644 index 0000000..65574e2 --- /dev/null +++ b/utils/SpdLogUtil.h @@ -0,0 +1,87 @@ +#ifndef SPDLOGUTIL_H +#define SPDLOGUTIL_H + +#include "spdlog/spdlog.h" +#include "spdlog/sinks/daily_file_sink.h" + +#include "SettingConfig.h" + +// use embedded macro to support file and line number +#define LOG_TRACE(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::trace, __VA_ARGS__) +#define LOG_DEBUG(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::debug, __VA_ARGS__) +#define LOG_INFO(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::info, __VA_ARGS__) +#define LOG_WARN(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::warn, __VA_ARGS__) +#define LOG_ERROR(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::err, __VA_ARGS__) + + +class SpdLogUtil +{ +public: + ~SpdLogUtil() + { + spdlog::drop_all(); + } + + SpdLogUtil(const SpdLogUtil&)=delete; + SpdLogUtil& operator=(const SpdLogUtil&)=delete; //禁止生成默认赋值函数 + + // magic singleton static + static SpdLogUtil* getInstance() { + static SpdLogUtil instance; + return &instance; + } + + std::shared_ptr getLogger() + { + return m_logger; + } + +private: + SpdLogUtil() + { + try { + + // Create a daily logger - a new file is created every day on 00:00am + m_logger = spdlog::daily_logger_mt("CasicBioRec", SettingConfig::getInstance().LOG_FILE.toStdString(), 0, 0); + + m_logger->set_pattern("[%Y-%m-%d %H:%M:%S.%e][%l] %v"); + + std::string level = SettingConfig::getInstance().LOG_LEVEL.toStdString(); + if (level == "trace") + { + m_logger->set_level(spdlog::level::trace); + m_logger->flush_on(spdlog::level::trace); + } + else if (level == "debug") + { + m_logger->set_level(spdlog::level::debug); + m_logger->flush_on(spdlog::level::debug); + } + else if (level == "info") + { + m_logger->set_level(spdlog::level::info); + m_logger->flush_on(spdlog::level::info); + } + else if (level == "warn") + { + m_logger->set_level(spdlog::level::warn); + m_logger->flush_on(spdlog::level::warn); + } + else if (level == "error") + { + m_logger->set_level(spdlog::level::err); + m_logger->flush_on(spdlog::level::err); + } + } + catch (const spdlog::spdlog_ex& ex) + { + spdlog::error("init log failed: {}",ex.what()); + + } + } + + std::shared_ptr m_logger; + +}; + +#endif // SPDLOGUTIL_H diff --git a/utils/UtilInclude.h b/utils/UtilInclude.h index 70bb714..3eed801 100644 --- a/utils/UtilInclude.h +++ b/utils/UtilInclude.h @@ -12,5 +12,6 @@ #include "SpeakerUtil.h" #include "TimeCounterUtil.h" #include "SocketClientUtil.h" +#include "SpdLogUtil.h" #endif // UTILINCLUDE_H diff --git a/AddPersonForm.cpp b/AddPersonForm.cpp index 97d812c..0a6af47 100644 --- a/AddPersonForm.cpp +++ b/AddPersonForm.cpp @@ -166,7 +166,7 @@ if (this->faceLabel->isVisible() == true) { //LOG(TRACE) << "DRAW IMAGE ON FORM " << imageDisp.width() << "*" << imageDisp.height(); - + LOG_TRACE("DRAW IMAGE ON FORM {} * {}",imageDisp.width(),imageDisp.height()); faceLabel->setPixmap(QPixmap::fromImage(imageDisp)); } } @@ -211,6 +211,7 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; //LOG(DEBUG) << "人脸采集成功"; + LOG_DEBUG("人脸采集成功"); if (personIdByFace == "") { // 人脸库中没有 @@ -240,6 +241,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸重复注册，请重试")); //LOG(DEBUG) << "人脸已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已经注册 {}",ui->inputName->text().toStdString()); } else { if (this->personId == personIdByFace) @@ -264,6 +266,7 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("人脸已注册其他人，请重试")); //LOG(DEBUG) << "人脸已注册其他人" << ui->inputName->text().toStdString(); + LOG_DEBUG("人脸已注册其他人 {}", ui->inputName->text().toStdString()); } } } @@ -302,16 +305,20 @@ // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已经注册，请重试")); //LOG(DEBUG) << "虹膜已经注册" << ui->inputName->text().toStdString(); + LOG_DEBUG("虹膜已经注册 {}",ui->inputName->text().toStdString()); } else { // 语音提示 SpeakerUtil::getInstance().speak(QString("虹膜已注册其他人，请重试")); //LOG(DEBUG) << "虹膜已注册其他人" << personIdByIris.toStdString(); + LOG_DEBUG("虹膜已注册其他人 {}",personIdByIris.toStdString()); } } void AddPersonForm::onSuccessCaptureIrisWithoutMatch(CasicIrisInfo * irisInfo) { //LOG(INFO) << QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString(); + LOG_INFO(QString("[AddPersonForm]虹膜编码成功[%1][%2]").arg(irisInfo->leftOrRight).arg(CasicIrisRecState::getInstance().state).toStdString()); + updateIrisImage(irisInfo); if (irisInfo->leftOrRight == "left") @@ -481,6 +488,7 @@ int ret = tipsDlg.exec(); //LOG(INFO) << QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员注册%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); if (ret == 1) { @@ -621,6 +629,8 @@ tipsDlg.exec(); //LOG(INFO) << QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString(); + LOG_INFO(QString("%1 人员信息编辑%2").arg(ui->inputName->text()).arg(succ == true ? "成功" : "失败").toStdString()); + } void AddPersonForm::updateIrisImage(CasicIrisInfo * irisInfo) @@ -692,11 +702,13 @@ CasicFaceRecState::getInstance().state = CasicFaceRecState::REC_NOT_START; //LOG(TRACE) << "FACE IMAGE DOUBLE CLICKED"; + LOG_TRACE("FACE IMAGE DOUBLE CLICKED"); } void AddPersonForm::onPhotoIrisDoubleClicked() { //LOG(TRACE) << "DOUBLE CLICKED IRIS " << personId.toStdString(); + LOG_TRACE("DOUBLE CLICKED IRIS {}", personId.toStdString()); // 编辑时先发指令重新加载虹膜库 去掉自己 ProMemory::getInstance().initIrisFeatures(personId); diff --git a/CasicBioRecWin.cpp b/CasicBioRecWin.cpp index 5635659..bf6ffe3 100644 --- a/CasicBioRecWin.cpp +++ b/CasicBioRecWin.cpp @@ -58,6 +58,7 @@ // 打印日志 //LOG(INFO) << QString("应用程序启动成功[Application Startup Success]").toStdString(); + LOG_INFO(QString("应用程序启动成功[Application Startup Success]").toStdString()); ProMemory::getInstance().widgeFrame = CasicBioRecConst::WidgeFrameName::MAIN_PAGE; } @@ -100,6 +101,7 @@ switch (event->key()) { case Qt::Key_Escape: //LOG(INFO) << "" << std::endl; + LOG_INFO(" \n\r"); QTimer::singleShot(100, qApp, SLOT(quit())); default: diff --git a/RecognizeResultForm.cpp b/RecognizeResultForm.cpp index 9fefa12..e6e661c 100644 --- a/RecognizeResultForm.cpp +++ b/RecognizeResultForm.cpp @@ -161,6 +161,7 @@ ProMemory::getInstance().clearFaceQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 人脸识别成功 [%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -183,6 +184,7 @@ ProMemory::getInstance().clearIrisQueue(); //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜识别成功 [%1]").arg(CasicIrisRecState::getInstance().toString()).toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -217,6 +219,7 @@ logStr.arg("虹膜").arg(CasicIrisRecState::getInstance().toString()); } //LOG(DEBUG) << logStr.toStdString(); + LOG_DEBUG(logStr.toStdString()); // 识别记录存入数据库 RecognitionRecordDao recDao; @@ -260,11 +263,13 @@ { // 人脸和虹膜识别的不是同一人 识别失败 //LOG(DEBUG) << QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm] 虹膜与人脸识别结果不一致，识别失败 [face: %1][iris: %2]").arg(personIdByFace).arg(personIdByIris).toStdString()); SpeakerUtil::getInstance().speak("虹膜与人脸识别结果不一致，识别失败，请重试"); showRecogFailure(); } else { //LOG(DEBUG) << QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString(); + LOG_DEBUG(QString("[RecognizeResultForm]人脸虹膜识别成功").toStdString()); showRecognizeResult(personId); // 识别记录存入数据库 diff --git a/StartupForm.cpp b/StartupForm.cpp index 947a7a4..ab80e21 100644 --- a/StartupForm.cpp +++ b/StartupForm.cpp @@ -94,6 +94,7 @@ if (hasFace == true) { //LOG(INFO) << QString("检测到人脸，START RECOGNIZE 线程").toStdString(); + LOG_INFO(QString("检测到人脸，START RECOGNIZE 线程").toStdString()); ProMemory::getInstance().appState = CasicBioRecConst::ApplicationState::STATE_WORKING; // 启动识别线程 diff --git a/casic/face/CasicFaceInterface.cpp b/casic/face/CasicFaceInterface.cpp index 1e1005a..837cf4d 100644 --- a/casic/face/CasicFaceInterface.cpp +++ b/casic/face/CasicFaceInterface.cpp @@ -1,6 +1,7 @@ #include #include #include "CasicFaceInterface.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" casic::face::CasicFaceInterface::CasicFaceInterface() @@ -125,6 +126,11 @@ // .arg(timer.elapsed()).arg(faces.size) // .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) // .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString(); + LOG_DEBUG(QString("人脸检测算法[tm: %1 ms][count: %2][rect: (%3,%4), (%5,%6)][size: (%7,%8)]") + .arg(timer.elapsed()).arg(faces.size) + .arg(faces.data[0].pos.x).arg(faces.data[0].pos.y).arg(faces.data[0].pos.x + faces.data[0].pos.width).arg(faces.data[0].pos.y + faces.data[0].pos.height) + .arg(faces.data[0].pos.width).arg(faces.data[0].pos.height).toStdString()); + } CasicFaceInfo faceInfo; @@ -167,6 +173,7 @@ seeta::QualityResult brightResult = qBright.check(image, face, points, 5); // LOG(DEBUG) << QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString(); + LOG_DEBUG(QString("亮度评估[tm: %1 ms][bright: %2][score: %3]").arg(timer.elapsed()).arg(brightResult.level).arg(brightResult.score).toStdString()); if (brightResult.level != seeta::QualityLevel::HIGH) { @@ -182,6 +189,7 @@ seeta::QualityResult clarityResult = qClarity.check(image, face, points, 5); // LOG(DEBUG) << QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString(); + LOG_DEBUG(QString("清晰度评估[tm: %1 ms][clarity: %2]").arg(timer.elapsed()).arg(clarityResult.level).toStdString()); if (clarityResult.level != seeta::QualityLevel::HIGH) { @@ -212,6 +220,8 @@ seeta::QualityOfResolution qReso; seeta::QualityResult resoResult = qReso.check(image, face, points, 5); // LOG(DEBUG) << QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString(); + LOG_DEBUG(QString("分辨率评估[tm: %1 ms][reso: %2]").arg(timer.elapsed()).arg(resoResult.level).toStdString()); + if (resoResult.level != seeta::QualityLevel::HIGH) { // 分辨率不够, 直接返回 @@ -244,6 +254,7 @@ seeta::QualityResult poseResult = poseEx->check(image, face, points, 5); // LOG(DEBUG) << QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString(); + LOG_DEBUG(QString("姿势评估[tm: %1ms][pose: %2][score: %3]").arg(timer.elapsed()).arg(poseResult.score).arg(poseResult.level).toStdString()); if (poseResult.level != seeta::QualityLevel::HIGH) { @@ -290,6 +301,8 @@ processor->GetPreFrameScore(&faceInfo.antiClarity, &faceInfo.antiReality); // LOG(DEBUG) << QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString(); + LOG_DEBUG(QString("活体检测[tm: %1 ms][anti: %2][clarity: %3, reality: %4]").arg(timer.elapsed()).arg(status).arg(faceInfo.antiClarity).arg(faceInfo.antiReality).toStdString()); + } return faceInfo; @@ -362,10 +375,13 @@ if (rect.size() == 0) { // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); + return cv::Rect(0, 0, 0, 0); } // LOG(TRACE) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_TRACE(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -394,6 +410,7 @@ } // LOG(DEBUG) << QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("人脸分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -419,10 +436,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } @@ -449,10 +468,12 @@ if (rect.size() == 0) { // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][0]").arg(timer.elapsed()).toStdString()); return cv::Rect(0, 0, 0, 0); } // LOG(DEBUG) << QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛分类检测算法[戴眼镜][tm: %1 ms][%2, %3]").arg(timer.elapsed()).arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); return rect.at(0); } diff --git a/casic/iris/CasicIrisInterface.cpp b/casic/iris/CasicIrisInterface.cpp index 6ecfdd9..b35132e 100644 --- a/casic/iris/CasicIrisInterface.cpp +++ b/casic/iris/CasicIrisInterface.cpp @@ -54,6 +54,10 @@ // .arg(timer.elapsed()).arg(rect.size()) // .arg(rect.at(0).x).arg(rect.at(0).y) // .arg(rect.at(0).width).arg(rect.at(0).height).toStdString(); + LOG_DEBUG(QString("眼睛检测算法[tm: %1 ms][count: %2][rect: (%3, %4) %5 * %6]") + .arg(timer.elapsed()).arg(rect.size()) + .arg(rect.at(0).x).arg(rect.at(0).y) + .arg(rect.at(0).width).arg(rect.at(0).height).toStdString()); // 找到眼睛之后, 将眼部裁剪下来, 图像拉伸到640 * 480 cv::Point center; diff --git a/conf/config.ini b/conf/config.ini index 9423149..1aae3ac 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -73,3 +73,9 @@ irisWidth=640 #虹膜图像高度 irisHeight=480 + +[log] +#日志文件位置 +logFile="d://irisLogs//casic_log.txt" +#日志级别 +logLevel="trace" diff --git a/dao/BaseDao.h b/dao/BaseDao.h index 45fed6e..06686ac 100644 --- a/dao/BaseDao.h +++ b/dao/BaseDao.h @@ -7,6 +7,7 @@ #include #include "dao/util/ConnectionManager.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" class BaseDao : public QObject diff --git a/dao/FaceDataDao.cpp b/dao/FaceDataDao.cpp index 6ae000d..ccb8fe5 100644 --- a/dao/FaceDataDao.cpp +++ b/dao/FaceDataDao.cpp @@ -31,6 +31,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -58,6 +59,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,7 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -118,6 +122,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -145,6 +150,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -180,6 +186,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -203,6 +210,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/FaceDataImgDao.cpp b/dao/FaceDataImgDao.cpp index afbb7dc..f9819bc 100644 --- a/dao/FaceDataImgDao.cpp +++ b/dao/FaceDataImgDao.cpp @@ -30,6 +30,7 @@ } // LOG(DEBUG) << QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询FACE_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -57,6 +58,8 @@ } // LOG(DEBUG) << QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); + return result; } @@ -83,6 +86,8 @@ } // LOG(TRACE) << QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询FACE_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -118,6 +123,7 @@ } // LOG(DEBUG) << QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询FACE_DATA_IMAGE表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -147,6 +153,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 返回结果 if (success == true) @@ -180,6 +187,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -204,6 +212,7 @@ bool success = query.exec(sql); // LOG(DEBUG) << QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人脸图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataDao.cpp b/dao/IrisDataDao.cpp index fdcc845..62e990c 100644 --- a/dao/IrisDataDao.cpp +++ b/dao/IrisDataDao.cpp @@ -37,6 +37,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询IRIS_DATA表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -69,6 +70,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -100,6 +102,7 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); return result; } @@ -137,6 +140,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -173,6 +177,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜特征值[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/IrisDataImgDao.cpp b/dao/IrisDataImgDao.cpp index 34da728..6a49baa 100644 --- a/dao/IrisDataImgDao.cpp +++ b/dao/IrisDataImgDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString(); + LOG_DEBUG(QString("查询IRIS_DATA_IMAGE表的所有记录[%1]").arg(result.size()).toStdString()); return result; } @@ -66,6 +67,7 @@ } // LOG(DEBUG) << QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("根据id查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -92,6 +94,8 @@ } // LOG(TRACE) << QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString(); + LOG_TRACE(QString("根据personId查询IRIS_DATA_IMAGE表的记录[personId=%1][%2]").arg(personId).arg(sql).toStdString()); + return result; } @@ -131,6 +135,7 @@ } // LOG(DEBUG) << QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_DEBUG(QString("根据属性值查询IRIS_DATA_IMAGE表的记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -157,6 +162,7 @@ // 执行插入 bool success = query.exec(); // LOG(DEBUG) << QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("保存虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); @@ -195,6 +201,7 @@ bool success = query.exec(); // LOG(DEBUG) << QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑虹膜图片[%1][%2]").arg(success).arg(sql).toStdString()); // 结束事务 ConnectionManager::getInstance()->getConnection().commit(); diff --git a/dao/RecognitionRecordDao.cpp b/dao/RecognitionRecordDao.cpp index d2d0a74..17c26bd 100644 --- a/dao/RecognitionRecordDao.cpp +++ b/dao/RecognitionRecordDao.cpp @@ -29,6 +29,7 @@ } // LOG(DEBUG) << QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data(); + LOG_DEBUG(QString("查询RECOGNITION_RECORDS表的所有记录[%1]").arg(result.size()).toLocal8Bit().data()); return result; } @@ -72,6 +73,9 @@ // LOG(DEBUG) << sql.toStdString(); // LOG(DEBUG) << QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data(); + LOG_DEBUG(sql.toStdString()); + LOG_DEBUG(QString("根据属性值查询RECOGNITION_RECORDS表的记录[%1]").arg(count).toLocal8Bit().data()); + return result; } @@ -96,6 +100,8 @@ query.prepare(sql); // LOG(DEBUG) << sql.toStdString(); + LOG_DEBUG(sql.toStdString()); + // 插入识别的log日志 QString logStr = QString("INSERT INTO RECOGNITION_LOGS (ID, LOG_INFO) VALUES ('%1', '%2')") diff --git a/dao/SysDeptDao.cpp b/dao/SysDeptDao.cpp index 1b02b58..f0f7935 100644 --- a/dao/SysDeptDao.cpp +++ b/dao/SysDeptDao.cpp @@ -30,6 +30,7 @@ } // LOG(TRACE) << QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString(); + LOG_TRACE(QString("查询表[SYS_DEPT]的所有记录[%1][%2]").arg(result.size()).arg(sql).toStdString()); return result; } @@ -67,6 +68,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_DEPT表的记录[ID=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -105,6 +107,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_DEPT表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } diff --git a/dao/SysPersonDao.cpp b/dao/SysPersonDao.cpp index 7db87d3..9eca34e 100644 --- a/dao/SysPersonDao.cpp +++ b/dao/SysPersonDao.cpp @@ -45,6 +45,7 @@ } // LOG(TRACE) << QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString(); + LOG_TRACE(QString("查询SYS_PERSON表的所有记录[%1]").arg(count).toStdString()); return result; } @@ -88,6 +89,7 @@ } // LOG(TRACE) << QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_TRACE(QString("根据id查询SYS_PERSON表的记录[id=%1][%2]").arg(id).arg(sql).toStdString()); return result; } @@ -120,6 +122,7 @@ } // LOG(TRACE) << QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门查询SYS_PERSON记录总数[%1][%2]").arg(result).arg(sql).toStdString()); return result; } @@ -176,6 +179,7 @@ } // LOG(TRACE) << QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据姓名和部门分页查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -227,6 +231,8 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); + return result; } @@ -273,6 +279,7 @@ } // LOG(TRACE) << QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString(); + LOG_TRACE(QString("根据属性值查询SYS_PERSON表的记录[%1][%2]").arg(count).arg(sql).toStdString()); return result; } @@ -312,6 +319,7 @@ if (success == true) { // LOG(DEBUG) << QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("保存SYS_PERSON记录成功[ID = %1][%2]").arg(id).arg(sql).toStdString()); return QString("%1").arg(id); } else @@ -366,6 +374,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("编辑人员[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; @@ -403,6 +412,7 @@ ConnectionManager::getInstance()->getConnection().commit(); // LOG(DEBUG) << QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString(); + LOG_DEBUG(QString("删除人员SYS_PERSON[ID=%1][%2]").arg(id).arg(sql).toStdString()); // 返回结果 return success; diff --git a/dao/util/ConnectionManager.cpp b/dao/util/ConnectionManager.cpp index 4365556..2693492 100644 --- a/dao/util/ConnectionManager.cpp +++ b/dao/util/ConnectionManager.cpp @@ -19,9 +19,11 @@ if (succ == true) { // LOG(INFO) << QString("打开数据库操作正常[Open Database Success]").toStdString(); + LOG_INFO(QString("打开数据库操作正常[Open Database Success]").toStdString()); } else { // LOG(ERROR) << QString("打开数据库操作失败[Open Database Failed]").toStdString(); + LOG_ERROR(QString("打开数据库操作失败[Open Database Failed]").toStdString()); } } } diff --git a/dao/util/ConnectionManager.h b/dao/util/ConnectionManager.h index 7a707be..b480daf 100644 --- a/dao/util/ConnectionManager.h +++ b/dao/util/ConnectionManager.h @@ -4,6 +4,7 @@ #include #include #include "utils/id/IdWorker.h" +#include "utils/UtilInclude.h" //#include "utils/easyloggingpp/easylogging++.h" using namespace Jiawa::Core; diff --git a/device/FaceCameraController.cpp b/device/FaceCameraController.cpp index 4816527..0e9bfed 100644 --- a/device/FaceCameraController.cpp +++ b/device/FaceCameraController.cpp @@ -11,6 +11,11 @@ // .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) // .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) // .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString(); + + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]初始化相机[%1][%2 * %3]") + .arg(SettingConfig::getInstance().FACE_CAMERA_INDEX) + .arg(SettingConfig::getInstance().FACE_FRAME_WIDTH) + .arg(SettingConfig::getInstance().FACE_FRAME_HEIGHT).toStdString()); } FaceCameraController::~FaceCameraController() @@ -30,6 +35,8 @@ // 启动定时器 TimeCounterUtil::getInstance().faceCapCounter->start(mInterval); // LOG(DEBUG) << QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString(); + LOG_DEBUG(QString("[FaceCameraController][openFaceCamera]相机开始拍图[%1ms]").arg(mInterval).toStdString()); + } void FaceCameraController::stopTakingPhoto() @@ -53,6 +60,7 @@ faceCap->read(faceMat); // LOG(TRACE) << "TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("TAKE ONE FACE FRAME {} * {}", faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; @@ -88,6 +96,7 @@ faceCap->read(faceMat); // LOG(TRACE) << QThread::currentThreadId() << " TAKE ONE FACE FRAME " << faceMat.cols << " * " << faceMat.rows; + LOG_TRACE("{} TAKE ONE FACE FRAME {} * {}",QThread::currentThreadId(), faceMat.cols, faceMat.rows); // 左右翻转 cv::Mat imageMatMiir; diff --git a/device/IrisCameraController.cpp b/device/IrisCameraController.cpp index 2b8538e..14441aa 100644 --- a/device/IrisCameraController.cpp +++ b/device/IrisCameraController.cpp @@ -56,6 +56,8 @@ connect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][startCapture]虹膜相机拍图").toStdString()); + } void IrisCameraController::stopCapture() { @@ -63,6 +65,8 @@ disconnect(TimeCounterUtil::getInstance().irisCapCounter, &QTimer::timeout, this, &IrisCameraController::getOneFaceFrm); // LOG(DEBUG) << QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString(); + LOG_DEBUG(QString("[IrisCameraController][stopCapture]虹膜相机停止拍图").toStdString()); + } void IrisCameraController::getOneFaceFrm() diff --git a/device/MotoController.cpp b/device/MotoController.cpp index af053d3..3e77e5c 100644 --- a/device/MotoController.cpp +++ b/device/MotoController.cpp @@ -27,6 +27,7 @@ //连接信号和槽 // LOG(DEBUG) << QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString(); + LOG_DEBUG(QString("[MotoController][initSerialMCU]打开电机串口[%1][%2][%3]").arg(portName).arg(baudRate).arg(succ).toStdString()); return succ; } @@ -34,6 +35,7 @@ void MotoController::sendDataAutoEnding(QByteArray data) { // LOG(INFO) << QString("向串口发送数据[send] %1").arg(data.data()).toStdString(); + LOG_INFO(QString("向串口发送数据[send] %1").arg(data.data()).toStdString()); // 加上0x0D 0x0A换行结束 data.append(0x0D).append(0x0A); diff --git a/device/face/CasicFaceRecState.cpp b/device/face/CasicFaceRecState.cpp index 8fd822f..7acf914 100644 --- a/device/face/CasicFaceRecState.cpp +++ b/device/face/CasicFaceRecState.cpp @@ -17,6 +17,7 @@ this->noFaceCount = 0; // LOG(DEBUG) << QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecState][initRecognize] 人脸识别状态初始化").toStdString()); // 开始识别 this->state = FaceRecStateName::REC_DETECT; diff --git a/device/face/FaceRecogProcess.cpp b/device/face/FaceRecogProcess.cpp index 962d251..60980f4 100644 --- a/device/face/FaceRecogProcess.cpp +++ b/device/face/FaceRecogProcess.cpp @@ -28,6 +28,7 @@ void FaceRecogProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -71,6 +72,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRecognize][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -80,6 +82,7 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -96,6 +99,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -118,6 +123,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -135,6 +141,7 @@ CasicFaceRecState::getInstance().faceInfo = &faceInfo; // LOG(DEBUG) << QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRecognize] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 compareFaceInCollection(); @@ -161,6 +168,7 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/face/FaceRegistProcess.cpp b/device/face/FaceRegistProcess.cpp index 77e91f3..a0bb45f 100644 --- a/device/face/FaceRegistProcess.cpp +++ b/device/face/FaceRegistProcess.cpp @@ -23,6 +23,8 @@ void FaceRegistProcess::addOneTryCount() { // LOG(DEBUG) << QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[addOneTryCount]已尝试次数[%1]").arg(CasicFaceRecState::getInstance().tryCount).toStdString()); + if (CasicFaceRecState::getInstance().tryCount < SettingConfig::getInstance().MAX_FACE_TRY_COUNT) { CasicFaceRecState::getInstance().state = CasicFaceRecState::FaceRecStateName::REC_NOT_START; @@ -64,6 +66,7 @@ { addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(TRACE) << QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_TRACE(QString("[CasicFaceRegistThread][%1] 人脸图像栈空, 暂停200ms").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); this->msleep(200); // 200ms后再判断 continue; @@ -73,6 +76,8 @@ if (CasicFaceRecState::getInstance().state != CasicFaceRecState::FaceRecStateName::REC_NOT_START) { // LOG(DEBUG) << QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 已在一次识别过程中, 暂停200ms。当前状态为: %1").arg(CasicFaceRecState::getInstance().state).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -89,6 +94,8 @@ // 表示本次识别结束, 可以开始下一次识别过程 addOneNoFaceCount(); // 连续没找到脸的次数+1；注册过程有多调用opencv的分类器, 没有符合要求脸的图像不入栈 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 没有找到人脸, 暂停200ms。重置识别状态为REC_NOT_START[%1]").arg(CasicFaceRecState::getInstance().noFaceCount).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -111,6 +118,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸活体检测未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -128,6 +136,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 人脸质量评估未通过, 暂停200ms。[%1]").arg("CasicFaceRecState::getInstance().toString()").toStdString()); addOneTryCount(); // 判断是否超过次数, 重置识别状态 this->msleep(200); // 200ms后再判断 @@ -155,6 +164,7 @@ CasicFaceRecState::getInstance().imgBase64 = ba.toBase64(); // LOG(DEBUG) << QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString(); + LOG_DEBUG(QString("[CasicFaceRegistThread] 特征提取成功[%1]").arg(CasicFaceRecState::getInstance().toString()).toStdString()); this->setWorking(false); // 特征值提取成功的人脸 与人脸库中的人脸进行比较 @@ -188,6 +198,8 @@ float sim = casic::face::CasicFaceInterface::getInstance().faceSimCalculate(CasicFaceRecState::getInstance().faceInfo->feature, ffArr); // LOG(DEBUG) << QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString(); + LOG_DEBUG(QString("[compareFaceInCollection] 特征值比对结果[%1]").arg(sim).toStdString()); + if (sim > 0.62) { CasicFaceRecState::getInstance().faceInfo->sim = sim; diff --git a/device/iris/CasicIrisRecState.cpp b/device/iris/CasicIrisRecState.cpp index 4edfdb1..d1479c7 100644 --- a/device/iris/CasicIrisRecState.cpp +++ b/device/iris/CasicIrisRecState.cpp @@ -25,6 +25,8 @@ this->noEyeCount = 0; // LOG(DEBUG) << QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString(); + LOG_DEBUG(QString("[CasicIrisRecState][initRecognize] 虹膜识别状态初始化").toStdString()); + } QString CasicIrisRecState::toString() diff --git a/device/iris/IrisRecogProcess.cpp b/device/iris/IrisRecogProcess.cpp index d843c51..efbd240 100644 --- a/device/iris/IrisRecogProcess.cpp +++ b/device/iris/IrisRecogProcess.cpp @@ -43,6 +43,7 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(TRACE) << QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 虹膜图像栈空, 暂停200ms").toStdString()); this->msleep(200); // 200ms后再判断 continue; } @@ -55,12 +56,15 @@ // this->msleep(200); // 200ms后再判断 // continue; // } + // LOG(TRACE) << QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString(); + LOG_TRACE(QString("[IrisRecogProcess] 准备取出虹膜图像[%1]").arg(ProMemory::getInstance().isIrisQueueEmpty()).toStdString()); // 取出虹膜图像栈中的一条数据 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[IrisRecogProcess] 取出虹膜图像").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 取出虹膜图像").toStdString()); // 调用找眼分类器算法 casic::iris::CasicIrisInterface::getInstance().setMinEyeSize(360); @@ -71,6 +75,7 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); addOneNoEyeCount(); this->msleep(200); // 200ms后再判断 @@ -78,6 +83,7 @@ } // LOG(DEBUG) << QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString(); + LOG_DEBUG(QString("[IrisRecogProcess] 找到眼睛调用远程算法进行识别").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -116,6 +122,7 @@ QByteArray matchResponse = clientUtil->getResponse(); // LOG(INFO) << QString("算法匹配结果").toStdString() << matchResponse.toStdString(); + LOG_INFO("算法匹配结果 {}",matchResponse.toStdString()); // 算法调用返回成功 if (matchResponse.size() > 0) @@ -129,6 +136,7 @@ CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_SEARCH_SUCC; // LOG(INFO) << QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString(); + LOG_INFO(QString("匹配成功[tm: %1 ms][id: %2]").arg(timer.elapsed()).arg(personId).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); @@ -140,6 +148,7 @@ { // 匹配失败 // LOG(INFO) << QString("匹配失败: ").toStdString() << matchResponse.toStdString(); + LOG_INFO("匹配失败: {}", matchResponse.toStdString()); // 匹配失败则尝试次数+1 addOneTryCount(); @@ -147,7 +156,7 @@ { // 编码失败 // LOG(INFO) << QString("编码失败: ").toStdString() << matchResponse.toStdString(); - + LOG_INFO("编码失败: {}", matchResponse.toStdString()); // 编码失败则尝试次数+1 addOneTryCount(); } @@ -170,6 +179,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRecogProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); CasicIrisRecState::getInstance().state = CasicIrisRecState::IrisRecStateName::REC_NOT_START; if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) diff --git a/device/iris/IrisRegistProcess.cpp b/device/iris/IrisRegistProcess.cpp index d04ced9..7ebd0c1 100644 --- a/device/iris/IrisRegistProcess.cpp +++ b/device/iris/IrisRegistProcess.cpp @@ -31,6 +31,7 @@ { CasicIrisRecState::getInstance().tryCount++; // LOG(DEBUG) << QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistProcess]已尝试次数[%1]").arg(CasicIrisRecState::getInstance().tryCount).toStdString()); if (CasicIrisRecState::getInstance().tryCount >= SettingConfig::getInstance().MAX_IRIS_TRY_COUNT) { @@ -66,6 +67,8 @@ if (ProMemory::getInstance().isIrisQueueEmpty() == true) { // LOG(DEBUG) << QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]虹膜图像栈空 暂停200ms").toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -73,18 +76,23 @@ // 取出一幅图像 CasicIrisInfo irisInfo = ProMemory::getInstance().popCasicIris(); // LOG(DEBUG) << QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]取出一幅虹膜图").toStdString()); if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_LEFT_FIND_EYE && irisInfo.leftOrRight == "left") { // 左眼已经编码成功则不再判断左眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]左眼已经编码成功则不再判断左眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } else if (CasicIrisRecState::getInstance().state == CasicIrisRecState::IrisRecStateName::REC_RIGHT_FIND_EYE && irisInfo.leftOrRight == "right"){ // 右眼已经编码成功则不再判断右眼 // LOG(DEBUG) << QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]右眼已经编码成功则不再判断右眼[%1][%2]").arg(CasicIrisRecState::getInstance().state).arg(irisInfo.leftOrRight).toStdString()); + this->msleep(200); // 200ms后再判断 continue; } @@ -97,6 +105,8 @@ { // 表示本次识别结束, 可以开始下一次识别过程 // LOG(DEBUG) << QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString(); + LOG_DEBUG(QString("[CasicIrisRegistThread]分类器没有找到眼睛，暂停200ms[%1]").arg(CasicIrisRecState::getInstance().noEyeCount).toStdString()); + addOneNoEyeCount(); // 双眼都要注册, 没找到眼不重置状态 @@ -107,6 +117,7 @@ // 找到眼睛则暂停线程工作 ProMemory::getInstance().irisRegistPro->setWorking(false); // LOG(DEBUG) << QString("找到眼睛暂停线程工作").toStdString(); + LOG_DEBUG(QString("找到眼睛暂停线程工作").toStdString()); // 找到眼睛则开始质量评估和编码 // 调用远程算法进行编码 @@ -147,6 +158,7 @@ if (encodeResponse.size() == 1024) { // LOG(DEBUG) << QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString(); + LOG_DEBUG(QString("虹膜特征值提取[耗时%1ms][%2]").arg(timer.elapsed()).arg(irisInfo.leftOrRight).toStdString()); // 保存图像文件 // cv::imwrite(QString("D:\\irisLogs\\%1-%2.bmp").arg(QDateTime::currentDateTime().toString("HHmmsszzz")).arg(irisInfo.leftOrRight).toStdString(), irisInfo.matData); diff --git a/spdlog/async.h b/spdlog/async.h new file mode 100644 index 0000000..d6e2134 --- /dev/null +++ b/spdlog/async.h @@ -0,0 +1,99 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// +// Async logging using global thread pool +// All loggers created here share same global thread pool. +// Each log message is pushed to a queue along with a shared pointer to the +// logger. +// If a logger deleted while having pending messages in the queue, it's actual +// destruction will defer +// until all its messages are processed by the thread pool. +// This is because each message in the queue holds a shared_ptr to the +// originating logger. + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { + +namespace details { +static const size_t default_async_q_size = 8192; +} + +// async logger factory - creates async loggers backed with thread pool. +// if a global thread pool doesn't already exist, create it with default queue +// size of 8192 items and single thread. +template +struct async_factory_impl +{ + template + static std::shared_ptr create(std::string logger_name, SinkArgs &&... args) + { + auto ®istry_inst = details::registry::instance(); + + // create global thread pool if not already exists.. + + auto &mutex = registry_inst.tp_mutex(); + std::lock_guard tp_lock(mutex); + auto tp = registry_inst.get_tp(); + if (tp == nullptr) + { + tp = std::make_shared(details::default_async_q_size, 1U); + registry_inst.set_tp(tp); + } + + auto sink = std::make_shared(std::forward(args)...); + auto new_logger = std::make_shared(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy); + registry_inst.initialize_logger(new_logger); + return new_logger; + } +}; + +using async_factory = async_factory_impl; +using async_factory_nonblock = async_factory_impl; + +template +inline std::shared_ptr create_async(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +template +inline std::shared_ptr create_async_nb(std::string logger_name, SinkArgs &&... sink_args) +{ + return async_factory_nonblock::create(std::move(logger_name), std::forward(sink_args)...); +} + +// set global thread pool. +inline void init_thread_pool( + size_t q_size, size_t thread_count, std::function on_thread_start, std::function on_thread_stop) +{ + auto tp = std::make_shared(q_size, thread_count, on_thread_start, on_thread_stop); + details::registry::instance().set_tp(std::move(tp)); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count, std::function on_thread_start) +{ + init_thread_pool(q_size, thread_count, on_thread_start, [] {}); +} + +inline void init_thread_pool(size_t q_size, size_t thread_count) +{ + init_thread_pool( + q_size, thread_count, [] {}, [] {}); +} + +// get the global thread pool. +inline std::shared_ptr thread_pool() +{ + return details::registry::instance().get_tp(); +} +} // namespace spdlog diff --git a/spdlog/async_logger-inl.h b/spdlog/async_logger-inl.h new file mode 100644 index 0000000..a1c27a5 --- /dev/null +++ b/spdlog/async_logger-inl.h @@ -0,0 +1,92 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +#include +#include + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy) +{} + +SPDLOG_INLINE spdlog::async_logger::async_logger( + std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, async_overflow_policy overflow_policy) + : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) +{} + +// send the log message to the thread pool +SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg) +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_log(shared_from_this(), msg, overflow_policy_); + } + else + { + throw_spdlog_ex("async log: thread pool doesn't exist anymore"); + } +} + +// send flush request to the thread pool +SPDLOG_INLINE void spdlog::async_logger::flush_() +{ + if (auto pool_ptr = thread_pool_.lock()) + { + pool_ptr->post_flush(shared_from_this(), overflow_policy_); + } + else + { + throw_spdlog_ex("async flush: thread pool doesn't exist anymore"); + } +} + +// +// backend functions - called from the thread pool to do the actual job +// +SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + backend_flush_(); + } +} + +SPDLOG_INLINE void spdlog::async_logger::backend_flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE std::shared_ptr spdlog::async_logger::clone(std::string new_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(new_name); + return cloned; +} diff --git a/spdlog/async_logger.h b/spdlog/async_logger.h new file mode 100644 index 0000000..91a93fc --- /dev/null +++ b/spdlog/async_logger.h @@ -0,0 +1,68 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Fast asynchronous logger. +// Uses pre allocated queue. +// Creates a single back thread to pop messages from the queue and log them. +// +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message +// 2. Push a new copy of the message to a queue (or block the caller until +// space is available in the queue) +// Upon destruction, logs all remaining messages in the queue before +// destructing.. + +#include + +namespace spdlog { + +// Async overflow policy - block by default. +enum class async_overflow_policy +{ + block, // Block until message can be enqueued + overrun_oldest // Discard oldest message in the queue if full when trying to + // add new item. +}; + +namespace details { +class thread_pool; +} + +class SPDLOG_API async_logger final : public std::enable_shared_from_this, public logger +{ + friend class details::thread_pool; + +public: + template + async_logger(std::string logger_name, It begin, It end, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block) + : logger(std::move(logger_name), begin, end) + , thread_pool_(std::move(tp)) + , overflow_policy_(overflow_policy) + {} + + async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr tp, + async_overflow_policy overflow_policy = async_overflow_policy::block); + + std::shared_ptr clone(std::string new_name) override; + +protected: + void sink_it_(const details::log_msg &msg) override; + void flush_() override; + void backend_sink_it_(const details::log_msg &incoming_log_msg); + void backend_flush_(); + +private: + std::weak_ptr thread_pool_; + async_overflow_policy overflow_policy_; +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "async_logger-inl.h" +#endif diff --git a/spdlog/common-inl.h b/spdlog/common-inl.h new file mode 100644 index 0000000..728f983 --- /dev/null +++ b/spdlog/common-inl.h @@ -0,0 +1,82 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { +namespace level { + +#if __cplusplus >= 201703L +constexpr +#endif + static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES; + +static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; + +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return level_string_views[l]; +} + +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +{ + return short_level_names[l]; +} + +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +{ + auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); + if (it != std::end(level_string_views)) + return static_cast(std::distance(std::begin(level_string_views), it)); + + // check also for "warn" and "err" before giving up.. + if (name == "warn") + { + return level::warn; + } + if (name == "err") + { + return level::err; + } + return level::off; +} +} // namespace level + +SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + : msg_(std::move(msg)) +{} + +SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) +{ +#ifdef SPDLOG_USE_STD_FORMAT + msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what(); +#else + memory_buf_t outbuf; + fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); +#endif +} + +SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +{ + return msg_.c_str(); +} + +SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) +{ + SPDLOG_THROW(spdlog_ex(msg, last_errno)); +} + +SPDLOG_INLINE void throw_spdlog_ex(std::string msg) +{ + SPDLOG_THROW(spdlog_ex(std::move(msg))); +} + +} // namespace spdlog diff --git a/spdlog/common.h b/spdlog/common.h new file mode 100644 index 0000000..e69201a --- /dev/null +++ b/spdlog/common.h @@ -0,0 +1,412 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SPDLOG_USE_STD_FORMAT +# include +# if __cpp_lib_format >= 202207L +# include +# else +# include +# endif +#endif + +#ifdef SPDLOG_COMPILED_LIB +# undef SPDLOG_HEADER_ONLY +# if defined(SPDLOG_SHARED_LIB) +# if defined(_WIN32) +# ifdef spdlog_EXPORTS +# define SPDLOG_API __declspec(dllexport) +# else // !spdlog_EXPORTS +# define SPDLOG_API __declspec(dllimport) +# endif +# else // !defined(_WIN32) +# define SPDLOG_API __attribute__((visibility("default"))) +# endif +# else // !defined(SPDLOG_SHARED_LIB) +# define SPDLOG_API +# endif +# define SPDLOG_INLINE +#else // !defined(SPDLOG_COMPILED_LIB) +# define SPDLOG_API +# define SPDLOG_HEADER_ONLY +# define SPDLOG_INLINE inline +#endif // #ifdef SPDLOG_COMPILED_LIB + +#include + +#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8 +# define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string) +# define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string) +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +# include +# endif +#else +# define SPDLOG_FMT_RUNTIME(format_string) format_string +# define SPDLOG_FMT_STRING(format_string) format_string +#endif + +// visual studio up to 2013 does not support noexcept nor constexpr +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define SPDLOG_NOEXCEPT _NOEXCEPT +# define SPDLOG_CONSTEXPR +# define SPDLOG_CONSTEXPR_FUNC inline +#else +# define SPDLOG_NOEXCEPT noexcept +# define SPDLOG_CONSTEXPR constexpr +# if __cplusplus >= 201402L +# define SPDLOG_CONSTEXPR_FUNC constexpr +# else +# define SPDLOG_CONSTEXPR_FUNC inline +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define SPDLOG_DEPRECATED __attribute__((deprecated)) +#elif defined(_MSC_VER) +# define SPDLOG_DEPRECATED __declspec(deprecated) +#else +# define SPDLOG_DEPRECATED +#endif + +// disable thread local on msvc 2013 +#ifndef SPDLOG_NO_TLS +# if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) +# define SPDLOG_NO_TLS 1 +# endif +#endif + +#ifndef SPDLOG_FUNCTION +# define SPDLOG_FUNCTION static_cast(__FUNCTION__) +#endif + +#ifdef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_TRY +# define SPDLOG_THROW(ex) \ + do \ + { \ + printf("spdlog fatal error: %s\n", ex.what()); \ + std::abort(); \ + } while (0) +# define SPDLOG_CATCH_STD +#else +# define SPDLOG_TRY try +# define SPDLOG_THROW(ex) throw(ex) +# define SPDLOG_CATCH_STD \ + catch (const std::exception &) {} +#endif + +namespace spdlog { + +class formatter; + +namespace sinks { +class sink; +} + +#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) +using filename_t = std::wstring; +// allow macro expansion to occur in SPDLOG_FILENAME_T +# define SPDLOG_FILENAME_T_INNER(s) L##s +# define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) +#else +using filename_t = std::string; +# define SPDLOG_FILENAME_T(s) s +#endif + +using log_clock = std::chrono::system_clock; +using sink_ptr = std::shared_ptr; +using sinks_init_list = std::initializer_list; +using err_handler = std::function; +#ifdef SPDLOG_USE_STD_FORMAT +namespace fmt_lib = std; + +using string_view_t = std::string_view; +using memory_buf_t = std::string; + +template +# if __cpp_lib_format >= 202207L +using format_string_t = std::format_string; +# else +using format_string_t = std::string_view; +# endif + +template +struct is_convertible_to_basic_format_string : std::integral_constant>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = std::wstring_view; +using wmemory_buf_t = std::wstring; + +template +# if __cpp_lib_format >= 202207L +using wformat_string_t = std::wformat_string; +# else +using wformat_string_t = std::wstring_view; +# endif +# endif +# define SPDLOG_BUF_TO_STRING(x) x +#else // use fmt lib instead of std::format +namespace fmt_lib = fmt; + +using string_view_t = fmt::basic_string_view; +using memory_buf_t = fmt::basic_memory_buffer; + +template +using format_string_t = fmt::format_string; + +template +using remove_cvref_t = typename std::remove_cv::type>::type; + +// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, +// in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view +template +struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> +{}; + +# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +using wstring_view_t = fmt::basic_string_view; +using wmemory_buf_t = fmt::basic_memory_buffer; + +template +using wformat_string_t = fmt::wformat_string; +# endif +# define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x) +#endif + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif // _WIN32 +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + +template +struct is_convertible_to_any_format_string : std::integral_constant::value || + is_convertible_to_basic_format_string::value> +{}; + +#if defined(SPDLOG_NO_ATOMIC_LEVELS) +using level_t = details::null_atomic_int; +#else +using level_t = std::atomic; +#endif + +#define SPDLOG_LEVEL_TRACE 0 +#define SPDLOG_LEVEL_DEBUG 1 +#define SPDLOG_LEVEL_INFO 2 +#define SPDLOG_LEVEL_WARN 3 +#define SPDLOG_LEVEL_ERROR 4 +#define SPDLOG_LEVEL_CRITICAL 5 +#define SPDLOG_LEVEL_OFF 6 + +#if !defined(SPDLOG_ACTIVE_LEVEL) +# define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +#endif + +// Log level enum +namespace level { +enum level_enum : int +{ + trace = SPDLOG_LEVEL_TRACE, + debug = SPDLOG_LEVEL_DEBUG, + info = SPDLOG_LEVEL_INFO, + warn = SPDLOG_LEVEL_WARN, + err = SPDLOG_LEVEL_ERROR, + critical = SPDLOG_LEVEL_CRITICAL, + off = SPDLOG_LEVEL_OFF, + n_levels +}; + +#define SPDLOG_LEVEL_NAME_TRACE spdlog::string_view_t("trace", 5) +#define SPDLOG_LEVEL_NAME_DEBUG spdlog::string_view_t("debug", 5) +#define SPDLOG_LEVEL_NAME_INFO spdlog::string_view_t("info", 4) +#define SPDLOG_LEVEL_NAME_WARNING spdlog::string_view_t("warning", 7) +#define SPDLOG_LEVEL_NAME_ERROR spdlog::string_view_t("error", 5) +#define SPDLOG_LEVEL_NAME_CRITICAL spdlog::string_view_t("critical", 8) +#define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3) + +#if !defined(SPDLOG_LEVEL_NAMES) +# define SPDLOG_LEVEL_NAMES \ + { \ + SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, \ + SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF \ + } +#endif + +#if !defined(SPDLOG_SHORT_LEVEL_NAMES) + +# define SPDLOG_SHORT_LEVEL_NAMES \ + { \ + "T", "D", "I", "W", "E", "C", "O" \ + } +#endif + +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; + +} // namespace level + +// +// Color mode used by sinks with color support. +// +enum class color_mode +{ + always, + automatic, + never +}; + +// +// Pattern time - specific time getting to use for pattern_formatter. +// local time by default +// +enum class pattern_time_type +{ + local, // log localtime + utc // log utc +}; + +// +// Log exception +// +class SPDLOG_API spdlog_ex : public std::exception +{ +public: + explicit spdlog_ex(std::string msg); + spdlog_ex(const std::string &msg, int last_errno); + const char *what() const SPDLOG_NOEXCEPT override; + +private: + std::string msg_; +}; + +[[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno); +[[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg); + +struct source_loc +{ + SPDLOG_CONSTEXPR source_loc() = default; + SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + : filename{filename_in} + , line{line_in} + , funcname{funcname_in} + {} + + SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + { + return line == 0; + } + const char *filename{nullptr}; + int line{0}; + const char *funcname{nullptr}; +}; + +struct file_event_handlers +{ + file_event_handlers() + : before_open(nullptr) + , after_open(nullptr) + , before_close(nullptr) + , after_close(nullptr) + {} + + std::function before_open; + std::function after_open; + std::function before_close; + std::function after_close; +}; + +namespace details { + +// to_string_view + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::string_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} + +#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +{ + return spdlog::wstring_view_t{buf.data(), buf.size()}; +} + +SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +{ + return str; +} +#endif + +#ifndef SPDLOG_USE_STD_FORMAT +template +inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) +{ + return fmt; +} +#elif __cpp_lib_format >= 202207L +template +SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +{ + return fmt.get(); +} +#endif + +// make_unique support for pre c++14 + +#if __cplusplus >= 201402L // C++14 and beyond +using std::enable_if_t; +using std::make_unique; +#else +template +using enable_if_t = typename std::enable_if::type; + +template +std::unique_ptr make_unique(Args &&... args) +{ + static_assert(!std::is_array::value, "arrays not supported"); + return std::unique_ptr(new T(std::forward(args)...)); +} +#endif + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +constexpr T conditional_static_cast(U value) +{ + return value; +} + +} // namespace details +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "common-inl.h" +#endif diff --git a/spdlog/formatter.h b/spdlog/formatter.h new file mode 100644 index 0000000..5086fb2 --- /dev/null +++ b/spdlog/formatter.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +namespace spdlog { + +class formatter +{ +public: + virtual ~formatter() = default; + virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0; + virtual std::unique_ptr clone() const = 0; +}; +} // namespace spdlog diff --git a/spdlog/fwd.h b/spdlog/fwd.h new file mode 100644 index 0000000..d258825 --- /dev/null +++ b/spdlog/fwd.h @@ -0,0 +1,18 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +namespace spdlog { +class logger; +class formatter; + +namespace sinks { +class sink; +} + +namespace level { +enum level_enum : int; +} + +} // namespace spdlog diff --git a/spdlog/logger-inl.h b/spdlog/logger-inl.h new file mode 100644 index 0000000..ff82db4 --- /dev/null +++ b/spdlog/logger-inl.h @@ -0,0 +1,257 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include + +#include + +namespace spdlog { + +// public methods +SPDLOG_INLINE logger::logger(const logger &other) + : name_(other.name_) + , sinks_(other.sinks_) + , level_(other.level_.load(std::memory_order_relaxed)) + , flush_level_(other.flush_level_.load(std::memory_order_relaxed)) + , custom_err_handler_(other.custom_err_handler_) + , tracer_(other.tracer_) +{} + +SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), + sinks_(std::move(other.sinks_)), + level_(other.level_.load(std::memory_order_relaxed)), + flush_level_(other.flush_level_.load(std::memory_order_relaxed)), + custom_err_handler_(std::move(other.custom_err_handler_)), + tracer_(std::move(other.tracer_)) + +{} + +SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +{ + this->swap(other); + return *this; +} + +SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +{ + name_.swap(other.name_); + sinks_.swap(other.sinks_); + + // swap level_ + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); + + // swap flush level_ + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); + + custom_err_handler_.swap(other.custom_err_handler_); + std::swap(tracer_, other.tracer_); +} + +SPDLOG_INLINE void swap(logger &a, logger &b) +{ + a.swap(b); +} + +SPDLOG_INLINE void logger::set_level(level::level_enum log_level) +{ + level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::level() const +{ + return static_cast(level_.load(std::memory_order_relaxed)); +} + +SPDLOG_INLINE const std::string &logger::name() const +{ + return name_; +} + +// set formatting for the sinks in this logger. +// each sink will get a separate instance of the formatter object. +SPDLOG_INLINE void logger::set_formatter(std::unique_ptr f) +{ + for (auto it = sinks_.begin(); it != sinks_.end(); ++it) + { + if (std::next(it) == sinks_.end()) + { + // last element - we can be move it. + (*it)->set_formatter(std::move(f)); + break; // to prevent clang-tidy warning + } + else + { + (*it)->set_formatter(f->clone()); + } + } +} + +SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) +{ + auto new_formatter = details::make_unique(std::move(pattern), time_type); + set_formatter(std::move(new_formatter)); +} + +// create new backtrace sink and move to it all our child sinks +SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) +{ + tracer_.enable(n_messages); +} + +// restore orig sinks and level and delete the backtrace sink +SPDLOG_INLINE void logger::disable_backtrace() +{ + tracer_.disable(); +} + +SPDLOG_INLINE void logger::dump_backtrace() +{ + dump_backtrace_(); +} + +// flush functions +SPDLOG_INLINE void logger::flush() +{ + flush_(); +} + +SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) +{ + flush_level_.store(log_level); +} + +SPDLOG_INLINE level::level_enum logger::flush_level() const +{ + return static_cast(flush_level_.load(std::memory_order_relaxed)); +} + +// sinks +SPDLOG_INLINE const std::vector &logger::sinks() const +{ + return sinks_; +} + +SPDLOG_INLINE std::vector &logger::sinks() +{ + return sinks_; +} + +// error handler +SPDLOG_INLINE void logger::set_error_handler(err_handler handler) +{ + custom_err_handler_ = std::move(handler); +} + +// create new logger with same sinks and configuration. +SPDLOG_INLINE std::shared_ptr logger::clone(std::string logger_name) +{ + auto cloned = std::make_shared(*this); + cloned->name_ = std::move(logger_name); + return cloned; +} + +// protected methods +SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled) +{ + if (log_enabled) + { + sink_it_(log_msg); + } + if (traceback_enabled) + { + tracer_.push_back(log_msg); + } +} + +SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) +{ + for (auto &sink : sinks_) + { + if (sink->should_log(msg.level)) + { + SPDLOG_TRY + { + sink->log(msg); + } + SPDLOG_LOGGER_CATCH(msg.source) + } + } + + if (should_flush_(msg)) + { + flush_(); + } +} + +SPDLOG_INLINE void logger::flush_() +{ + for (auto &sink : sinks_) + { + SPDLOG_TRY + { + sink->flush(); + } + SPDLOG_LOGGER_CATCH(source_loc()) + } +} + +SPDLOG_INLINE void logger::dump_backtrace_() +{ + using details::log_msg; + if (tracer_.enabled() && !tracer_.empty()) + { + sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"}); + tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); }); + sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"}); + } +} + +SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) +{ + auto flush_level = flush_level_.load(std::memory_order_relaxed); + return (msg.level >= flush_level) && (msg.level != level::off); +} + +SPDLOG_INLINE void logger::err_handler_(const std::string &msg) +{ + if (custom_err_handler_) + { + custom_err_handler_(msg); + } + else + { + using std::chrono::system_clock; + static std::mutex mutex; + static std::chrono::system_clock::time_point last_report_time; + static size_t err_counter = 0; + std::lock_guard lk{mutex}; + auto now = system_clock::now(); + err_counter++; + if (now - last_report_time < std::chrono::seconds(1)) + { + return; + } + last_report_time = now; + auto tm_time = details::os::localtime(system_clock::to_time_t(now)); + char date_buf[64]; + std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time); +#if defined(USING_R) && defined(R_R_H) // if in R environment + REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#else + std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str()); +#endif + } +} +} // namespace spdlog diff --git a/spdlog/logger.h b/spdlog/logger.h new file mode 100644 index 0000000..1fafdab --- /dev/null +++ b/spdlog/logger.h @@ -0,0 +1,428 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +// Thread safe logger (except for set_error_handler()) +// Has name, log level, vector of std::shared sink pointers and formatter +// Upon each log write the logger: +// 1. Checks if its log level is enough to log the message and if yes: +// 2. Call the underlying sinks to do the job. +// 3. Each sink use its own private copy of a formatter to format the message +// and send to its destination. +// +// The use of private formatter per sink provides the opportunity to cache some +// formatted data, and support for different format per sink. + +#include +#include +#include + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +# ifndef _WIN32 +# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows +# endif +# include +#endif + +#include + +#ifndef SPDLOG_NO_EXCEPTIONS +# define SPDLOG_LOGGER_CATCH(location) \ + catch (const std::exception &ex) \ + { \ + if (location.filename) \ + { \ + err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line)); \ + } \ + else \ + { \ + err_handler_(ex.what()); \ + } \ + } \ + catch (...) \ + { \ + err_handler_("Rethrowing unknown exception in logger"); \ + throw; \ + } +#else +# define SPDLOG_LOGGER_CATCH(location) +#endif + +namespace spdlog { + +class SPDLOG_API logger +{ +public: + // Empty logger + explicit logger(std::string name) + : name_(std::move(name)) + , sinks_() + {} + + // Logger with range on sinks + template + logger(std::string name, It begin, It end) + : name_(std::move(name)) + , sinks_(begin, end) + {} + + // Logger with single sink + logger(std::string name, sink_ptr single_sink) + : logger(std::move(name), {std::move(single_sink)}) + {} + + // Logger with sinks init list + logger(std::string name, sinks_init_list sinks) + : logger(std::move(name), sinks.begin(), sinks.end()) + {} + + virtual ~logger() = default; + + logger(const logger &other); + logger(logger &&other) SPDLOG_NOEXCEPT; + logger &operator=(logger other) SPDLOG_NOEXCEPT; + void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + + template + void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, format_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + template + void log(level::level_enum lvl, const T &msg) + { + log(source_loc{}, lvl, msg); + } + + // T cannot be statically converted to format string (including string_view/wstring_view) + template::value, int>::type = 0> + void log(source_loc loc, level::level_enum lvl, const T &msg) + { + log(loc, lvl, "{}", msg); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(log_time, loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, string_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + details::log_msg log_msg(loc, name_, lvl, msg); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, string_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(format_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(format_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(format_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(format_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(format_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(format_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log(source_loc loc, level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log_(loc, lvl, details::to_string_view(fmt), std::forward(args)...); + } + + template + void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) + { + log(source_loc{}, lvl, fmt, std::forward(args)...); + } + + void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(log_time, loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(msg.data(), msg.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + + void log(level::level_enum lvl, wstring_view_t msg) + { + log(source_loc{}, lvl, msg); + } + + template + void trace(wformat_string_t fmt, Args &&... args) + { + log(level::trace, fmt, std::forward(args)...); + } + + template + void debug(wformat_string_t fmt, Args &&... args) + { + log(level::debug, fmt, std::forward(args)...); + } + + template + void info(wformat_string_t fmt, Args &&... args) + { + log(level::info, fmt, std::forward(args)...); + } + + template + void warn(wformat_string_t fmt, Args &&... args) + { + log(level::warn, fmt, std::forward(args)...); + } + + template + void error(wformat_string_t fmt, Args &&... args) + { + log(level::err, fmt, std::forward(args)...); + } + + template + void critical(wformat_string_t fmt, Args &&... args) + { + log(level::critical, fmt, std::forward(args)...); + } +#endif + + template + void trace(const T &msg) + { + log(level::trace, msg); + } + + template + void debug(const T &msg) + { + log(level::debug, msg); + } + + template + void info(const T &msg) + { + log(level::info, msg); + } + + template + void warn(const T &msg) + { + log(level::warn, msg); + } + + template + void error(const T &msg) + { + log(level::err, msg); + } + + template + void critical(const T &msg) + { + log(level::critical, msg); + } + + // return true logging is enabled for the given level. + bool should_log(level::level_enum msg_level) const + { + return msg_level >= level_.load(std::memory_order_relaxed); + } + + // return true if backtrace logging is enabled. + bool should_backtrace() const + { + return tracer_.enabled(); + } + + void set_level(level::level_enum log_level); + + level::level_enum level() const; + + const std::string &name() const; + + // set formatting for the sinks in this logger. + // each sink will get a separate instance of the formatter object. + void set_formatter(std::unique_ptr f); + + // set formatting for the sinks in this logger. + // equivalent to + // set_formatter(make_unique(pattern, time_type)) + // Note: each sink will get a new instance of a formatter object, replacing the old one. + void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + + // backtrace support. + // efficiently store all debug/trace messages in a circular buffer until needed for debugging. + void enable_backtrace(size_t n_messages); + void disable_backtrace(); + void dump_backtrace(); + + // flush functions + void flush(); + void flush_on(level::level_enum log_level); + level::level_enum flush_level() const; + + // sinks + const std::vector &sinks() const; + + std::vector &sinks(); + + // error handler + void set_error_handler(err_handler); + + // create new logger with same sinks and configuration. + virtual std::shared_ptr clone(std::string logger_name); + +protected: + std::string name_; + std::vector sinks_; + spdlog::level_t level_{level::info}; + spdlog::level_t flush_level_{level::off}; + err_handler custom_err_handler_{nullptr}; + details::backtracer tracer_; + + // common implementation for after templated public api has been resolved + template + void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + memory_buf_t buf; +#ifdef SPDLOG_USE_STD_FORMAT + fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); +#else + fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); +#endif + + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT + template + void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args) + { + bool log_enabled = should_log(lvl); + bool traceback_enabled = tracer_.enabled(); + if (!log_enabled && !traceback_enabled) + { + return; + } + SPDLOG_TRY + { + // format to wmemory_buffer and convert to utf8 + wmemory_buf_t wbuf; + fmt_lib::vformat_to( + std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); + + memory_buf_t buf; + details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf); + details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); + log_it_(log_msg, log_enabled, traceback_enabled); + } + SPDLOG_LOGGER_CATCH(loc) + } +#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT + + // log the given message (if the given log level is high enough), + // and save backtrace (if backtrace is enabled). + void log_it_(const details::log_msg &log_msg, bool log_enabled, bool traceback_enabled); + virtual void sink_it_(const details::log_msg &msg); + virtual void flush_(); + void dump_backtrace_(); + bool should_flush_(const details::log_msg &msg); + + // handle errors during logging. + // default handler prints the error to stderr at max rate of 1 message/sec. + void err_handler_(const std::string &msg); +}; + +void swap(logger &a, logger &b); + +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "logger-inl.h" +#endif diff --git a/spdlog/pattern_formatter-inl.h b/spdlog/pattern_formatter-inl.h new file mode 100644 index 0000000..01afbe6 --- /dev/null +++ b/spdlog/pattern_formatter-inl.h @@ -0,0 +1,1436 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace spdlog { +namespace details { + +/////////////////////////////////////////////////////////////////////// +// name & level pattern appender +/////////////////////////////////////////////////////////////////////// + +class scoped_padder +{ +public: + scoped_padder(size_t wrapped_size, const padding_info &padinfo, memory_buf_t &dest) + : padinfo_(padinfo) + , dest_(dest) + { + remaining_pad_ = static_cast(padinfo.width_) - static_cast(wrapped_size); + if (remaining_pad_ <= 0) + { + return; + } + + if (padinfo_.side_ == padding_info::pad_side::left) + { + pad_it(remaining_pad_); + remaining_pad_ = 0; + } + else if (padinfo_.side_ == padding_info::pad_side::center) + { + auto half_pad = remaining_pad_ / 2; + auto reminder = remaining_pad_ & 1; + pad_it(half_pad); + remaining_pad_ = half_pad + reminder; // for the right side + } + } + + template + static unsigned int count_digits(T n) + { + return fmt_helper::count_digits(n); + } + + ~scoped_padder() + { + if (remaining_pad_ >= 0) + { + pad_it(remaining_pad_); + } + else if (padinfo_.truncate_) + { + long new_size = static_cast(dest_.size()) + remaining_pad_; + dest_.resize(static_cast(new_size)); + } + } + +private: + void pad_it(long count) + { + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); + } + + const padding_info &padinfo_; + memory_buf_t &dest_; + long remaining_pad_; + string_view_t spaces_{" ", 64}; +}; + +struct null_scoped_padder +{ + null_scoped_padder(size_t /*wrapped_size*/, const padding_info & /*padinfo*/, memory_buf_t & /*dest*/) {} + + template + static unsigned int count_digits(T /* number */) + { + return 0; + } +}; + +template +class name_formatter final : public flag_formatter +{ +public: + explicit name_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.logger_name.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.logger_name, dest); + } +}; + +// log level appender +template +class level_formatter final : public flag_formatter +{ +public: + explicit level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const string_view_t &level_name = level::to_string_view(msg.level); + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +// short log level appender +template +class short_level_formatter final : public flag_formatter +{ +public: + explicit short_level_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + string_view_t level_name{level::to_short_c_str(msg.level)}; + ScopedPadder p(level_name.size(), padinfo_, dest); + fmt_helper::append_string_view(level_name, dest); + } +}; + +/////////////////////////////////////////////////////////////////////// +// Date time pattern appenders +/////////////////////////////////////////////////////////////////////// + +static const char *ampm(const tm &t) +{ + return t.tm_hour >= 12 ? "PM" : "AM"; +} + +static int to12h(const tm &t) +{ + return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour; +} + +// Abbreviated weekday name +static std::array days{{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}}; + +template +class a_formatter final : public flag_formatter +{ +public: + explicit a_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full weekday name +static std::array full_days{{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}}; + +template +class A_formatter : public flag_formatter +{ +public: + explicit A_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_days[static_cast(tm_time.tm_wday)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Abbreviated month +static const std::array months{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}}; + +template +class b_formatter final : public flag_formatter +{ +public: + explicit b_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Full month name +static const std::array full_months{ + {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}}; + +template +class B_formatter final : public flag_formatter +{ +public: + explicit B_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + string_view_t field_value{full_months[static_cast(tm_time.tm_mon)]}; + ScopedPadder p(field_value.size(), padinfo_, dest); + fmt_helper::append_string_view(field_value, dest); + } +}; + +// Date and time representation (Thu Aug 23 15:35:46 2014) +template +class c_formatter final : public flag_formatter +{ +public: + explicit c_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 24; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::append_string_view(days[static_cast(tm_time.tm_wday)], dest); + dest.push_back(' '); + fmt_helper::append_string_view(months[static_cast(tm_time.tm_mon)], dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_mday, dest); + dest.push_back(' '); + // time + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// year - 2 digit +template +class C_formatter final : public flag_formatter +{ +public: + explicit C_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01 +template +class D_formatter final : public flag_formatter +{ +public: + explicit D_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_mday, dest); + dest.push_back('/'); + fmt_helper::pad2(tm_time.tm_year % 100, dest); + } +}; + +// year - 4 digit +template +class Y_formatter final : public flag_formatter +{ +public: + explicit Y_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 4; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(tm_time.tm_year + 1900, dest); + } +}; + +// month 1-12 +template +class m_formatter final : public flag_formatter +{ +public: + explicit m_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mon + 1, dest); + } +}; + +// day of month 1-31 +template +class d_formatter final : public flag_formatter +{ +public: + explicit d_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_mday, dest); + } +}; + +// hours in 24 format 0-23 +template +class H_formatter final : public flag_formatter +{ +public: + explicit H_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_hour, dest); + } +}; + +// hours in 12 format 1-12 +template +class I_formatter final : public flag_formatter +{ +public: + explicit I_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(to12h(tm_time), dest); + } +}; + +// minutes 0-59 +template +class M_formatter final : public flag_formatter +{ +public: + explicit M_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// seconds 0-59 +template +class S_formatter final : public flag_formatter +{ +public: + explicit S_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// milliseconds +template +class e_formatter final : public flag_formatter +{ +public: + explicit e_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto millis = fmt_helper::time_fraction(msg.time); + const size_t field_size = 3; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad3(static_cast(millis.count()), dest); + } +}; + +// microseconds +template +class f_formatter final : public flag_formatter +{ +public: + explicit f_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto micros = fmt_helper::time_fraction(msg.time); + + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad6(static_cast(micros.count()), dest); + } +}; + +// nanoseconds +template +class F_formatter final : public flag_formatter +{ +public: + explicit F_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto ns = fmt_helper::time_fraction(msg.time); + const size_t field_size = 9; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::pad9(static_cast(ns.count()), dest); + } +}; + +// seconds since epoch +template +class E_formatter final : public flag_formatter +{ +public: + explicit E_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const size_t field_size = 10; + ScopedPadder p(field_size, padinfo_, dest); + auto duration = msg.time.time_since_epoch(); + auto seconds = std::chrono::duration_cast(duration).count(); + fmt_helper::append_int(seconds, dest); + } +}; + +// AM/PM +template +class p_formatter final : public flag_formatter +{ +public: + explicit p_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 2; + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 12 hour clock 02:55:02 pm +template +class r_formatter final : public flag_formatter +{ +public: + explicit r_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 11; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(to12h(tm_time), dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + dest.push_back(' '); + fmt_helper::append_string_view(ampm(tm_time), dest); + } +}; + +// 24-hour HH:MM time, equivalent to %H:%M +template +class R_formatter final : public flag_formatter +{ +public: + explicit R_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 5; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + } +}; + +// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S +template +class T_formatter final : public flag_formatter +{ +public: + explicit T_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 8; + ScopedPadder p(field_size, padinfo_, dest); + + fmt_helper::pad2(tm_time.tm_hour, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_min, dest); + dest.push_back(':'); + fmt_helper::pad2(tm_time.tm_sec, dest); + } +}; + +// ISO 8601 offset from UTC in timezone (+-HH:MM) +template +class z_formatter final : public flag_formatter +{ +public: + explicit z_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + z_formatter() = default; + z_formatter(const z_formatter &) = delete; + z_formatter &operator=(const z_formatter &) = delete; + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + const size_t field_size = 6; + ScopedPadder p(field_size, padinfo_, dest); + + auto total_minutes = get_cached_offset(msg, tm_time); + bool is_negative = total_minutes < 0; + if (is_negative) + { + total_minutes = -total_minutes; + dest.push_back('-'); + } + else + { + dest.push_back('+'); + } + + fmt_helper::pad2(total_minutes / 60, dest); // hours + dest.push_back(':'); + fmt_helper::pad2(total_minutes % 60, dest); // minutes + } + +private: + log_clock::time_point last_update_{std::chrono::seconds(0)}; + int offset_minutes_{0}; + + int get_cached_offset(const log_msg &msg, const std::tm &tm_time) + { + // refresh every 10 seconds + if (msg.time - last_update_ >= std::chrono::seconds(10)) + { + offset_minutes_ = os::utc_minutes_offset(tm_time); + last_update_ = msg.time; + } + return offset_minutes_; + } +}; + +// Thread id +template +class t_formatter final : public flag_formatter +{ +public: + explicit t_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + const auto field_size = ScopedPadder::count_digits(msg.thread_id); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.thread_id, dest); + } +}; + +// Current pid +template +class pid_formatter final : public flag_formatter +{ +public: + explicit pid_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + const auto pid = static_cast(details::os::pid()); + auto field_size = ScopedPadder::count_digits(pid); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(pid, dest); + } +}; + +template +class v_formatter final : public flag_formatter +{ +public: + explicit v_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + ScopedPadder p(msg.payload.size(), padinfo_, dest); + fmt_helper::append_string_view(msg.payload, dest); + } +}; + +class ch_formatter final : public flag_formatter +{ +public: + explicit ch_formatter(char ch) + : ch_(ch) + {} + + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + dest.push_back(ch_); + } + +private: + char ch_; +}; + +// aggregate user chars to display as is +class aggregate_formatter final : public flag_formatter +{ +public: + aggregate_formatter() = default; + + void add_ch(char ch) + { + str_ += ch; + } + void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override + { + fmt_helper::append_string_view(str_, dest); + } + +private: + std::string str_; +}; + +// mark the color range. expect it to be in the form of "%^colored text%$" +class color_start_formatter final : public flag_formatter +{ +public: + explicit color_start_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_start = dest.size(); + } +}; + +class color_stop_formatter final : public flag_formatter +{ +public: + explicit color_stop_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + msg.color_range_end = dest.size(); + } +}; + +// print source location +template +class source_location_formatter final : public flag_formatter +{ +public: + explicit source_location_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + size_t text_size; + if (padinfo_.enabled()) + { + // calc text size for padding based on "filename:line" + text_size = std::char_traits::length(msg.source.filename) + ScopedPadder::count_digits(msg.source.line) + 1; + } + else + { + text_size = 0; + } + + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source filename +template +class source_filename_formatter final : public flag_formatter +{ +public: + explicit source_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.filename, dest); + } +}; + +template +class short_filename_formatter final : public flag_formatter +{ +public: + explicit short_filename_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4127) // consider using 'if constexpr' instead +#endif // _MSC_VER + static const char *basename(const char *filename) + { + // if the size is 2 (1 character + null terminator) we can use the more efficient strrchr + // the branch will be elided by optimizations + if (sizeof(os::folder_seps) == 2) + { + const char *rv = std::strrchr(filename, os::folder_seps[0]); + return rv != nullptr ? rv + 1 : filename; + } + else + { + const std::reverse_iterator begin(filename + std::strlen(filename)); + const std::reverse_iterator end(filename); + + const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1); + return it != end ? it.base() : filename; + } + } +#ifdef _MSC_VER +# pragma warning(pop) +#endif // _MSC_VER + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + auto filename = basename(msg.source.filename); + size_t text_size = padinfo_.enabled() ? std::char_traits::length(filename) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(filename, dest); + } +}; + +template +class source_linenum_formatter final : public flag_formatter +{ +public: + explicit source_linenum_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + + auto field_size = ScopedPadder::count_digits(msg.source.line); + ScopedPadder p(field_size, padinfo_, dest); + fmt_helper::append_int(msg.source.line, dest); + } +}; + +// print source funcname +template +class source_funcname_formatter final : public flag_formatter +{ +public: + explicit source_funcname_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + if (msg.source.empty()) + { + ScopedPadder p(0, padinfo_, dest); + return; + } + size_t text_size = padinfo_.enabled() ? std::char_traits::length(msg.source.funcname) : 0; + ScopedPadder p(text_size, padinfo_, dest); + fmt_helper::append_string_view(msg.source.funcname, dest); + } +}; + +// print elapsed time since last message +template +class elapsed_formatter final : public flag_formatter +{ +public: + using DurationUnits = Units; + + explicit elapsed_formatter(padding_info padinfo) + : flag_formatter(padinfo) + , last_message_time_(log_clock::now()) + {} + + void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override + { + auto delta = (std::max)(msg.time - last_message_time_, log_clock::duration::zero()); + auto delta_units = std::chrono::duration_cast(delta); + last_message_time_ = msg.time; + auto delta_count = static_cast(delta_units.count()); + auto n_digits = static_cast(ScopedPadder::count_digits(delta_count)); + ScopedPadder p(n_digits, padinfo_, dest); + fmt_helper::append_int(delta_count, dest); + } + +private: + log_clock::time_point last_message_time_; +}; + +// Full info formatter +// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v +class full_formatter final : public flag_formatter +{ +public: + explicit full_formatter(padding_info padinfo) + : flag_formatter(padinfo) + {} + + void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) override + { + using std::chrono::duration_cast; + using std::chrono::milliseconds; + using std::chrono::seconds; + + // cache the date/time part for the next second. + auto duration = msg.time.time_since_epoch(); + auto secs = duration_cast(duration); + + if (cache_timestamp_ != secs || cached_datetime_.size() == 0) + { + cached_datetime_.clear(); + cached_datetime_.push_back('['); + fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_); + cached_datetime_.push_back('-'); + + fmt_helper::pad2(tm_time.tm_mday, cached_datetime_); + cached_datetime_.push_back(' '); + + fmt_helper::pad2(tm_time.tm_hour, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_min, cached_datetime_); + cached_datetime_.push_back(':'); + + fmt_helper::pad2(tm_time.tm_sec, cached_datetime_); + cached_datetime_.push_back('.'); + + cache_timestamp_ = secs; + } + dest.append(cached_datetime_.begin(), cached_datetime_.end()); + + auto millis = fmt_helper::time_fraction(msg.time); + fmt_helper::pad3(static_cast(millis.count()), dest); + dest.push_back(']'); + dest.push_back(' '); + + // append logger name if exists + if (msg.logger_name.size() > 0) + { + dest.push_back('['); + fmt_helper::append_string_view(msg.logger_name, dest); + dest.push_back(']'); + dest.push_back(' '); + } + + dest.push_back('['); + // wrap the level name with color + msg.color_range_start = dest.size(); + // fmt_helper::append_string_view(level::to_c_str(msg.level), dest); + fmt_helper::append_string_view(level::to_string_view(msg.level), dest); + msg.color_range_end = dest.size(); + dest.push_back(']'); + dest.push_back(' '); + + // add source location if present + if (!msg.source.empty()) + { + dest.push_back('['); + const char *filename = details::short_filename_formatter::basename(msg.source.filename); + fmt_helper::append_string_view(filename, dest); + dest.push_back(':'); + fmt_helper::append_int(msg.source.line, dest); + dest.push_back(']'); + dest.push_back(' '); + } + // fmt_helper::append_string_view(msg.msg(), dest); + fmt_helper::append_string_view(msg.payload, dest); + } + +private: + std::chrono::seconds cache_timestamp_{0}; + memory_buf_t cached_datetime_; +}; + +} // namespace details + +SPDLOG_INLINE pattern_formatter::pattern_formatter( + std::string pattern, pattern_time_type time_type, std::string eol, custom_flags custom_user_flags) + : pattern_(std::move(pattern)) + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(false) + , last_log_secs_(0) + , custom_handlers_(std::move(custom_user_flags)) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + compile_pattern_(pattern_); +} + +// use by default full formatter for if pattern is not given +SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + : pattern_("%+") + , eol_(std::move(eol)) + , pattern_time_type_(time_type) + , need_localtime_(true) + , last_log_secs_(0) +{ + std::memset(&cached_tm_, 0, sizeof(cached_tm_)); + formatters_.push_back(details::make_unique(details::padding_info{})); +} + +SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const +{ + custom_flags cloned_custom_formatters; + for (auto &it : custom_handlers_) + { + cloned_custom_formatters[it.first] = it.second->clone(); + } + auto cloned = details::make_unique(pattern_, pattern_time_type_, eol_, std::move(cloned_custom_formatters)); + cloned->need_localtime(need_localtime_); +#if defined(__GNUC__) && __GNUC__ < 5 + return std::move(cloned); +#else + return cloned; +#endif +} + +SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, memory_buf_t &dest) +{ + if (need_localtime_) + { + const auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); + if (secs != last_log_secs_) + { + cached_tm_ = get_time_(msg); + last_log_secs_ = secs; + } + } + + for (auto &f : formatters_) + { + f->format(msg, cached_tm_, dest); + } + // write eol + details::fmt_helper::append_string_view(eol_, dest); +} + +SPDLOG_INLINE void pattern_formatter::set_pattern(std::string pattern) +{ + pattern_ = std::move(pattern); + need_localtime_ = false; + compile_pattern_(pattern_); +} + +SPDLOG_INLINE void pattern_formatter::need_localtime(bool need) +{ + need_localtime_ = need; +} + +SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) +{ + if (pattern_time_type_ == pattern_time_type::local) + { + return details::os::localtime(log_clock::to_time_t(msg.time)); + } + return details::os::gmtime(log_clock::to_time_t(msg.time)); +} + +template +SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) +{ + // process custom flags + auto it = custom_handlers_.find(flag); + if (it != custom_handlers_.end()) + { + auto custom_handler = it->second->clone(); + custom_handler->set_padding_info(padding); + formatters_.push_back(std::move(custom_handler)); + return; + } + + // process built-in flags + switch (flag) + { + case ('+'): // default formatter + formatters_.push_back(details::make_unique(padding)); + need_localtime_ = true; + break; + + case 'n': // logger name + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'l': // level + formatters_.push_back(details::make_unique>(padding)); + break; + + case 'L': // short level + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('t'): // thread id + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('v'): // the message text + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('a'): // weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('A'): // short weekday + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('b'): + case ('h'): // month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('B'): // short month + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('c'): // datetime + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('C'): // year 2 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('Y'): // year 4 digits + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('D'): + case ('x'): // datetime MM/DD/YY + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('m'): // month 1-12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('d'): // day of month 1-31 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('H'): // hours 24 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('I'): // hours 12 + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('M'): // minutes + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('S'): // seconds + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('e'): // milliseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('f'): // microseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('F'): // nanoseconds + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('E'): // seconds since epoch + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('p'): // am/pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('r'): // 12 hour clock 02:55:02 pm + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('R'): // 24-hour HH:MM time + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('T'): + case ('X'): // ISO 8601 time format (HH:MM:SS) + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('z'): // timezone + formatters_.push_back(details::make_unique>(padding)); + need_localtime_ = true; + break; + + case ('P'): // pid + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('^'): // color range start + formatters_.push_back(details::make_unique(padding)); + break; + + case ('$'): // color range end + formatters_.push_back(details::make_unique(padding)); + break; + + case ('@'): // source location (filename:filenumber) + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('s'): // short source filename - without directory name + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('g'): // full source filename + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('#'): // source line number + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('!'): // source funcname + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('%'): // % char + formatters_.push_back(details::make_unique('%')); + break; + + case ('u'): // elapsed time since last log message in nanos + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('i'): // elapsed time since last log message in micros + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('o'): // elapsed time since last log message in millis + formatters_.push_back(details::make_unique>(padding)); + break; + + case ('O'): // elapsed time since last log message in seconds + formatters_.push_back(details::make_unique>(padding)); + break; + + default: // Unknown flag appears as is + auto unknown_flag = details::make_unique(); + + if (!padding.truncate_) + { + unknown_flag->add_ch('%'); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + // fix issue #1617 (prev char was '!' and should have been treated as funcname flag instead of truncating flag) + // spdlog::set_pattern("[%10!] %v") => "[ main] some message" + // spdlog::set_pattern("[%3!!] %v") => "[mai] some message" + else + { + padding.truncate_ = false; + formatters_.push_back(details::make_unique>(padding)); + unknown_flag->add_ch(flag); + formatters_.push_back((std::move(unknown_flag))); + } + + break; + } +} + +// Extract given pad spec (e.g. %8X, %=8X, %-8!X, %8!X, %=8!X, %-8!X, %+8!X) +// Advance the given it pass the end of the padding spec found (if any) +// Return padding. +SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) +{ + using details::padding_info; + using details::scoped_padder; + const size_t max_width = 64; + if (it == end) + { + return padding_info{}; + } + + padding_info::pad_side side; + switch (*it) + { + case '-': + side = padding_info::pad_side::right; + ++it; + break; + case '=': + side = padding_info::pad_side::center; + ++it; + break; + default: + side = details::padding_info::pad_side::left; + break; + } + + if (it == end || !std::isdigit(static_cast(*it))) + { + return padding_info{}; // no padding if no digit found here + } + + auto width = static_cast(*it) - '0'; + for (++it; it != end && std::isdigit(static_cast(*it)); ++it) + { + auto digit = static_cast(*it) - '0'; + width = width * 10 + digit; + } + + // search for the optional truncate marker '!' + bool truncate; + if (it != end && *it == '!') + { + truncate = true; + ++it; + } + else + { + truncate = false; + } + return details::padding_info{std::min(width, max_width), side, truncate}; +} + +SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) +{ + auto end = pattern.end(); + std::unique_ptr user_chars; + formatters_.clear(); + for (auto it = pattern.begin(); it != end; ++it) + { + if (*it == '%') + { + if (user_chars) // append user chars found so far + { + formatters_.push_back(std::move(user_chars)); + } + + auto padding = handle_padspec_(++it, end); + + if (it != end) + { + if (padding.enabled()) + { + handle_flag_(*it, padding); + } + else + { + handle_flag_(*it, padding); + } + } + else + { + break; + } + } + else // chars not following the % sign should be displayed as is + { + if (!user_chars) + { + user_chars = details::make_unique(); + } + user_chars->add_ch(*it); + } + } + if (user_chars) // append raw chars found so far + { + formatters_.push_back(std::move(user_chars)); + } +} +} // namespace spdlog diff --git a/spdlog/pattern_formatter.h b/spdlog/pattern_formatter.h new file mode 100644 index 0000000..acf1c53 --- /dev/null +++ b/spdlog/pattern_formatter.h @@ -0,0 +1,128 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +namespace spdlog { +namespace details { + +// padding information. +struct padding_info +{ + enum class pad_side + { + left, + right, + center + }; + + padding_info() = default; + padding_info(size_t width, padding_info::pad_side side, bool truncate) + : width_(width) + , side_(side) + , truncate_(truncate) + , enabled_(true) + {} + + bool enabled() const + { + return enabled_; + } + size_t width_ = 0; + pad_side side_ = pad_side::left; + bool truncate_ = false; + bool enabled_ = false; +}; + +class SPDLOG_API flag_formatter +{ +public: + explicit flag_formatter(padding_info padinfo) + : padinfo_(padinfo) + {} + flag_formatter() = default; + virtual ~flag_formatter() = default; + virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0; + +protected: + padding_info padinfo_; +}; + +} // namespace details + +class SPDLOG_API custom_flag_formatter : public details::flag_formatter +{ +public: + virtual std::unique_ptr clone() const = 0; + + void set_padding_info(const details::padding_info &padding) + { + flag_formatter::padinfo_ = padding; + } +}; + +class SPDLOG_API pattern_formatter final : public formatter +{ +public: + using custom_flags = std::unordered_map>; + + explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local, + std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags()); + + // use default pattern is not given + explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol); + + pattern_formatter(const pattern_formatter &other) = delete; + pattern_formatter &operator=(const pattern_formatter &other) = delete; + + std::unique_ptr clone() const override; + void format(const details::log_msg &msg, memory_buf_t &dest) override; + + template + pattern_formatter &add_flag(char flag, Args &&... args) + { + custom_handlers_[flag] = details::make_unique(std::forward(args)...); + return *this; + } + void set_pattern(std::string pattern); + void need_localtime(bool need = true); + +private: + std::string pattern_; + std::string eol_; + pattern_time_type pattern_time_type_; + bool need_localtime_; + std::tm cached_tm_; + std::chrono::seconds last_log_secs_; + std::vector> formatters_; + custom_flags custom_handlers_; + + std::tm get_time_(const details::log_msg &msg); + template + void handle_flag_(char flag, details::padding_info padding); + + // Extract given pad spec (e.g. %8X) + // Advance the given it pass the end of the padding spec found (if any) + // Return padding. + static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end); + + void compile_pattern_(const std::string &pattern); +}; +} // namespace spdlog + +#ifdef SPDLOG_HEADER_ONLY +# include "pattern_formatter-inl.h" +#endif diff --git a/spdlog/spdlog-inl.h b/spdlog/spdlog-inl.h new file mode 100644 index 0000000..708399c --- /dev/null +++ b/spdlog/spdlog-inl.h @@ -0,0 +1,120 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#ifndef SPDLOG_HEADER_ONLY +# include +#endif + +#include +#include + +namespace spdlog { + +SPDLOG_INLINE void initialize_logger(std::shared_ptr logger) +{ + details::registry::instance().initialize_logger(std::move(logger)); +} + +SPDLOG_INLINE std::shared_ptr get(const std::string &name) +{ + return details::registry::instance().get(name); +} + +SPDLOG_INLINE void set_formatter(std::unique_ptr formatter) +{ + details::registry::instance().set_formatter(std::move(formatter)); +} + +SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type) +{ + set_formatter(std::unique_ptr(new pattern_formatter(std::move(pattern), time_type))); +} + +SPDLOG_INLINE void enable_backtrace(size_t n_messages) +{ + details::registry::instance().enable_backtrace(n_messages); +} + +SPDLOG_INLINE void disable_backtrace() +{ + details::registry::instance().disable_backtrace(); +} + +SPDLOG_INLINE void dump_backtrace() +{ + default_logger_raw()->dump_backtrace(); +} + +SPDLOG_INLINE level::level_enum get_level() +{ + return default_logger_raw()->level(); +} + +SPDLOG_INLINE bool should_log(level::level_enum log_level) +{ + return default_logger_raw()->should_log(log_level); +} + +SPDLOG_INLINE void set_level(level::level_enum log_level) +{ + details::registry::instance().set_level(log_level); +} + +SPDLOG_INLINE void flush_on(level::level_enum log_level) +{ + details::registry::instance().flush_on(log_level); +} + +SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg)) +{ + details::registry::instance().set_error_handler(handler); +} + +SPDLOG_INLINE void register_logger(std::shared_ptr logger) +{ + details::registry::instance().register_logger(std::move(logger)); +} + +SPDLOG_INLINE void apply_all(const std::function)> &fun) +{ + details::registry::instance().apply_all(fun); +} + +SPDLOG_INLINE void drop(const std::string &name) +{ + details::registry::instance().drop(name); +} + +SPDLOG_INLINE void drop_all() +{ + details::registry::instance().drop_all(); +} + +SPDLOG_INLINE void shutdown() +{ + details::registry::instance().shutdown(); +} + +SPDLOG_INLINE void set_automatic_registration(bool automatic_registration) +{ + details::registry::instance().set_automatic_registration(automatic_registration); +} + +SPDLOG_INLINE std::shared_ptr default_logger() +{ + return details::registry::instance().default_logger(); +} + +SPDLOG_INLINE spdlog::logger *default_logger_raw() +{ + return details::registry::instance().get_default_raw(); +} + +SPDLOG_INLINE void set_default_logger(std::shared_ptr default_logger) +{ + details::registry::instance().set_default_logger(std::move(default_logger)); +} + +} // namespace spdlog diff --git a/spdlog/spdlog.h b/spdlog/spdlog.h new file mode 100644 index 0000000..ee83e8d --- /dev/null +++ b/spdlog/spdlog.h @@ -0,0 +1,354 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +// spdlog main header file. +// see example.cpp for usage example + +#ifndef SPDLOG_H +#define SPDLOG_H + +#pragma once + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +namespace spdlog { + +using default_factory = synchronous_factory; + +// Create and register a logger with a templated sink type +// The logger's level, formatter and flush level will be set according the +// global settings. +// +// Example: +// spdlog::create("logger_name", "dailylog_filename", 11, 59); +template +inline std::shared_ptr create(std::string logger_name, SinkArgs &&... sink_args) +{ + return default_factory::create(std::move(logger_name), std::forward(sink_args)...); +} + +// Initialize and register a logger, +// formatter and flush level will be set according the global settings. +// +// Useful for initializing manually created loggers with the global settings. +// +// Example: +// auto mylogger = std::make_shared("mylogger", ...); +// spdlog::initialize_logger(mylogger); +SPDLOG_API void initialize_logger(std::shared_ptr logger); + +// Return an existing logger or nullptr if a logger with such name doesn't +// exist. +// example: spdlog::get("my_logger")->info("hello {}", "world"); +SPDLOG_API std::shared_ptr get(const std::string &name); + +// Set global formatter. Each sink in each logger will get a clone of this object +SPDLOG_API void set_formatter(std::unique_ptr formatter); + +// Set global format string. +// example: spdlog::set_pattern("%Y-%m-%d %H:%M:%S.%e %l : %v"); +SPDLOG_API void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); + +// enable global backtrace support +SPDLOG_API void enable_backtrace(size_t n_messages); + +// disable global backtrace support +SPDLOG_API void disable_backtrace(); + +// call dump backtrace on default logger +SPDLOG_API void dump_backtrace(); + +// Get global logging level +SPDLOG_API level::level_enum get_level(); + +// Set global logging level +SPDLOG_API void set_level(level::level_enum log_level); + +// Determine whether the default logger should log messages with a certain level +SPDLOG_API bool should_log(level::level_enum lvl); + +// Set global flush level +SPDLOG_API void flush_on(level::level_enum log_level); + +// Start/Restart a periodic flusher thread +// Warning: Use only if all your loggers are thread safe! +template +inline void flush_every(std::chrono::duration interval) +{ + details::registry::instance().flush_every(interval); +} + +// Set global error handler +SPDLOG_API void set_error_handler(void (*handler)(const std::string &msg)); + +// Register the given logger with the given name +SPDLOG_API void register_logger(std::shared_ptr logger); + +// Apply a user defined function on all registered loggers +// Example: +// spdlog::apply_all([&](std::shared_ptr l) {l->flush();}); +SPDLOG_API void apply_all(const std::function)> &fun); + +// Drop the reference to the given logger +SPDLOG_API void drop(const std::string &name); + +// Drop all references from the registry +SPDLOG_API void drop_all(); + +// stop any running threads started by spdlog and clean registry loggers +SPDLOG_API void shutdown(); + +// Automatic registration of loggers when using spdlog::create() or spdlog::create_async +SPDLOG_API void set_automatic_registration(bool automatic_registration); + +// API for using default logger (stdout_color_mt), +// e.g: spdlog::info("Message {}", 1); +// +// The default logger object can be accessed using the spdlog::default_logger(): +// For example, to add another sink to it: +// spdlog::default_logger()->sinks().push_back(some_sink); +// +// The default logger can replaced using spdlog::set_default_logger(new_logger). +// For example, to replace it with a file logger. +// +// IMPORTANT: +// The default API is thread safe (for _mt loggers), but: +// set_default_logger() *should not* be used concurrently with the default API. +// e.g do not call set_default_logger() from one thread while calling spdlog::info() from another. + +SPDLOG_API std::shared_ptr default_logger(); + +SPDLOG_API spdlog::logger *default_logger_raw(); + +SPDLOG_API void set_default_logger(std::shared_ptr default_logger); + +template +inline void log(source_loc source, level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, format_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(format_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} + +template +inline void log(source_loc source, level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(source, lvl, msg); +} + +template +inline void log(level::level_enum lvl, const T &msg) +{ + default_logger_raw()->log(lvl, msg); +} + +#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT +template +inline void log(source_loc source, level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source, lvl, fmt, std::forward(args)...); +} + +template +inline void log(level::level_enum lvl, wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward(args)...); +} + +template +inline void trace(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->trace(fmt, std::forward(args)...); +} + +template +inline void debug(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->debug(fmt, std::forward(args)...); +} + +template +inline void info(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->info(fmt, std::forward(args)...); +} + +template +inline void warn(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->warn(fmt, std::forward(args)...); +} + +template +inline void error(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->error(fmt, std::forward(args)...); +} + +template +inline void critical(wformat_string_t fmt, Args &&... args) +{ + default_logger_raw()->critical(fmt, std::forward(args)...); +} +#endif + +template +inline void trace(const T &msg) +{ + default_logger_raw()->trace(msg); +} + +template +inline void debug(const T &msg) +{ + default_logger_raw()->debug(msg); +} + +template +inline void info(const T &msg) +{ + default_logger_raw()->info(msg); +} + +template +inline void warn(const T &msg) +{ + default_logger_raw()->warn(msg); +} + +template +inline void error(const T &msg) +{ + default_logger_raw()->error(msg); +} + +template +inline void critical(const T &msg) +{ + default_logger_raw()->critical(msg); +} + +} // namespace spdlog + +// +// enable/disable log calls at compile time according to global level. +// +// define SPDLOG_ACTIVE_LEVEL to one of those (before including spdlog.h): +// SPDLOG_LEVEL_TRACE, +// SPDLOG_LEVEL_DEBUG, +// SPDLOG_LEVEL_INFO, +// SPDLOG_LEVEL_WARN, +// SPDLOG_LEVEL_ERROR, +// SPDLOG_LEVEL_CRITICAL, +// SPDLOG_LEVEL_OFF +// + +#ifndef SPDLOG_NO_SOURCE_LOC +# define SPDLOG_LOGGER_CALL(logger, level, ...) \ + (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CALL(logger, level, ...) (logger)->log(spdlog::source_loc{}, level, __VA_ARGS__) +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE +# define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__) +# define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_TRACE(logger, ...) (void)0 +# define SPDLOG_TRACE(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_DEBUG +# define SPDLOG_LOGGER_DEBUG(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::debug, __VA_ARGS__) +# define SPDLOG_DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_DEBUG(logger, ...) (void)0 +# define SPDLOG_DEBUG(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_INFO +# define SPDLOG_LOGGER_INFO(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::info, __VA_ARGS__) +# define SPDLOG_INFO(...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_INFO(logger, ...) (void)0 +# define SPDLOG_INFO(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_WARN +# define SPDLOG_LOGGER_WARN(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::warn, __VA_ARGS__) +# define SPDLOG_WARN(...) SPDLOG_LOGGER_WARN(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_WARN(logger, ...) (void)0 +# define SPDLOG_WARN(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_ERROR +# define SPDLOG_LOGGER_ERROR(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::err, __VA_ARGS__) +# define SPDLOG_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_ERROR(logger, ...) (void)0 +# define SPDLOG_ERROR(...) (void)0 +#endif + +#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_CRITICAL +# define SPDLOG_LOGGER_CRITICAL(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::critical, __VA_ARGS__) +# define SPDLOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(spdlog::default_logger_raw(), __VA_ARGS__) +#else +# define SPDLOG_LOGGER_CRITICAL(logger, ...) (void)0 +# define SPDLOG_CRITICAL(...) (void)0 +#endif + +#ifdef SPDLOG_HEADER_ONLY +# include "spdlog-inl.h" +#endif + +#endif // SPDLOG_H diff --git a/spdlog/stopwatch.h b/spdlog/stopwatch.h new file mode 100644 index 0000000..5d1f2dc --- /dev/null +++ b/spdlog/stopwatch.h @@ -0,0 +1,69 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#include +#include + +// Stopwatch support for spdlog (using std::chrono::steady_clock). +// Displays elapsed seconds since construction as double. +// +// Usage: +// +// spdlog::stopwatch sw; +// ... +// spdlog::debug("Elapsed: {} seconds", sw); => "Elapsed 0.005116733 seconds" +// spdlog::info("Elapsed: {:.6} seconds", sw); => "Elapsed 0.005163 seconds" +// +// +// If other units are needed (e.g. millis instead of double), include "fmt/chrono.h" and use "duration_cast<..>(sw.elapsed())": +// +// #include +//.. +// using std::chrono::duration_cast; +// using std::chrono::milliseconds; +// spdlog::info("Elapsed {}", duration_cast(sw.elapsed())); => "Elapsed 5ms" + +namespace spdlog { +class stopwatch +{ + using clock = std::chrono::steady_clock; + std::chrono::time_point start_tp_; + +public: + stopwatch() + : start_tp_{clock::now()} + {} + + std::chrono::duration elapsed() const + { + return std::chrono::duration(clock::now() - start_tp_); + } + + void reset() + { + start_tp_ = clock::now(); + } +}; +} // namespace spdlog + +// Support for fmt formatting (e.g. "{:012.9}" or just "{}") +namespace +#ifdef SPDLOG_USE_STD_FORMAT + std +#else + fmt +#endif +{ + +template<> +struct formatter : formatter +{ + template + auto format(const spdlog::stopwatch &sw, FormatContext &ctx) -> decltype(ctx.out()) + { + return formatter::format(sw.elapsed().count(), ctx); + } +}; +} // namespace std diff --git a/spdlog/tweakme.h b/spdlog/tweakme.h new file mode 100644 index 0000000..5bcb5ff --- /dev/null +++ b/spdlog/tweakme.h @@ -0,0 +1,140 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +/////////////////////////////////////////////////////////////////////////////// +// +// Edit this file to squeeze more performance, and to customize supported +// features +// +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Under Linux, the much faster CLOCK_REALTIME_COARSE clock can be used. +// This clock is less accurate - can be off by dozens of millis - depending on +// the kernel HZ. +// Uncomment to use it instead of the regular clock. +// +// #define SPDLOG_CLOCK_COARSE +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if source location logging is not needed. +// This will prevent spdlog from using __FILE__, __LINE__ and SPDLOG_FUNCTION +// +// #define SPDLOG_NO_SOURCE_LOC +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment if thread id logging is not needed (i.e. no %t in the log pattern). +// This will prevent spdlog from querying the thread id on each log call. +// +// WARNING: If the log pattern contains thread id (i.e, %t) while this flag is +// on, zero will be logged as thread id. +// +// #define SPDLOG_NO_THREAD_ID +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent spdlog from using thread local storage. +// +// WARNING: if your program forks, UNCOMMENT this flag to prevent undefined +// thread ids in the children logs. +// +// #define SPDLOG_NO_TLS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to avoid spdlog's usage of atomic log levels +// Use only if your code never modifies a logger's log levels concurrently by +// different threads. +// +// #define SPDLOG_NO_ATOMIC_LEVELS +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable usage of wchar_t for file names on Windows. +// +// #define SPDLOG_WCHAR_FILENAMES +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default eol ("\n" or "\r\n" under Linux/Windows) +// +// #define SPDLOG_EOL ";-)\n" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to override default folder separators ("/" or "\\/" under +// Linux/Windows). Each character in the string is treated as a different +// separator. +// +// #define SPDLOG_FOLDER_SEPS "\\" +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use your own copy of the fmt library instead of spdlog's copy. +// In this case spdlog will try to include so set your -I flag +// accordingly. +// +// #define SPDLOG_FMT_EXTERNAL +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to use C++20 std::format instead of fmt. +// +// #define SPDLOG_USE_STD_FORMAT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to enable wchar_t support (convert to utf8) +// +// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to prevent child processes from inheriting log file descriptors +// +// #define SPDLOG_PREVENT_CHILD_FD +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize level names (e.g. "MY TRACE") +// +// #define SPDLOG_LEVEL_NAMES { "MY TRACE", "MY DEBUG", "MY INFO", "MY WARNING", "MY ERROR", "MY CRITICAL", "OFF" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to customize short level names (e.g. "MT") +// These can be longer than one character. +// +// #define SPDLOG_SHORT_LEVEL_NAMES { "T", "D", "I", "W", "E", "C", "O" } +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment to disable default logger creation. +// This might save some (very) small initialization time if no default logger is needed. +// +// #define SPDLOG_DISABLE_DEFAULT_LOGGER +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment and set to compile time level with zero cost (default is INFO). +// Macros like SPDLOG_DEBUG(..), SPDLOG_INFO(..) will expand to empty statements if not enabled +// +// #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO +/////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +// Uncomment (and change if desired) macro to use for function names. +// This is compiler dependent. +// __PRETTY_FUNCTION__ might be nicer in clang/gcc, and __FUNCTION__ in msvc. +// Defaults to __FUNCTION__ (should work on all compilers) if not defined. +// +// #ifdef __PRETTY_FUNCTION__ +// # define SPDLOG_FUNCTION __PRETTY_FUNCTION__ +// #else +// # define SPDLOG_FUNCTION __FUNCTION__ +// #endif +/////////////////////////////////////////////////////////////////////////////// diff --git a/spdlog/version.h b/spdlog/version.h new file mode 100644 index 0000000..5717bea --- /dev/null +++ b/spdlog/version.h @@ -0,0 +1,10 @@ +// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) + +#pragma once + +#define SPDLOG_VER_MAJOR 1 +#define SPDLOG_VER_MINOR 11 +#define SPDLOG_VER_PATCH 0 + +#define SPDLOG_VERSION (SPDLOG_VER_MAJOR * 10000 + SPDLOG_VER_MINOR * 100 + SPDLOG_VER_PATCH) diff --git a/utils/SettingConfig.cpp b/utils/SettingConfig.cpp index f10b016..4b177fc 100644 --- a/utils/SettingConfig.cpp +++ b/utils/SettingConfig.cpp @@ -43,6 +43,9 @@ PORT_NAME = getProperty("com", "motoPortName").toString(); RECOG_TYPE = getProperty("recognize", "recogType").toInt(); + + LOG_FILE = getProperty("log", "logFile").toString(); + LOG_LEVEL = getProperty("log", "logLevel").toString(); } diff --git a/utils/SettingConfig.h b/utils/SettingConfig.h index 89541ca..be5bbfe 100644 --- a/utils/SettingConfig.h +++ b/utils/SettingConfig.h @@ -64,6 +64,9 @@ int RECOG_TYPE = 0; + QString LOG_FILE; + QString LOG_LEVEL; + private: SettingConfig(); diff --git a/utils/SpdLogUtil.h b/utils/SpdLogUtil.h new file mode 100644 index 0000000..65574e2 --- /dev/null +++ b/utils/SpdLogUtil.h @@ -0,0 +1,87 @@ +#ifndef SPDLOGUTIL_H +#define SPDLOGUTIL_H + +#include "spdlog/spdlog.h" +#include "spdlog/sinks/daily_file_sink.h" + +#include "SettingConfig.h" + +// use embedded macro to support file and line number +#define LOG_TRACE(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::trace, __VA_ARGS__) +#define LOG_DEBUG(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::debug, __VA_ARGS__) +#define LOG_INFO(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::info, __VA_ARGS__) +#define LOG_WARN(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::warn, __VA_ARGS__) +#define LOG_ERROR(...) SPDLOG_LOGGER_CALL(SpdLogUtil::getInstance()->getLogger().get(), spdlog::level::err, __VA_ARGS__) + + +class SpdLogUtil +{ +public: + ~SpdLogUtil() + { + spdlog::drop_all(); + } + + SpdLogUtil(const SpdLogUtil&)=delete; + SpdLogUtil& operator=(const SpdLogUtil&)=delete; //禁止生成默认赋值函数 + + // magic singleton static + static SpdLogUtil* getInstance() { + static SpdLogUtil instance; + return &instance; + } + + std::shared_ptr getLogger() + { + return m_logger; + } + +private: + SpdLogUtil() + { + try { + + // Create a daily logger - a new file is created every day on 00:00am + m_logger = spdlog::daily_logger_mt("CasicBioRec", SettingConfig::getInstance().LOG_FILE.toStdString(), 0, 0); + + m_logger->set_pattern("[%Y-%m-%d %H:%M:%S.%e][%l] %v"); + + std::string level = SettingConfig::getInstance().LOG_LEVEL.toStdString(); + if (level == "trace") + { + m_logger->set_level(spdlog::level::trace); + m_logger->flush_on(spdlog::level::trace); + } + else if (level == "debug") + { + m_logger->set_level(spdlog::level::debug); + m_logger->flush_on(spdlog::level::debug); + } + else if (level == "info") + { + m_logger->set_level(spdlog::level::info); + m_logger->flush_on(spdlog::level::info); + } + else if (level == "warn") + { + m_logger->set_level(spdlog::level::warn); + m_logger->flush_on(spdlog::level::warn); + } + else if (level == "error") + { + m_logger->set_level(spdlog::level::err); + m_logger->flush_on(spdlog::level::err); + } + } + catch (const spdlog::spdlog_ex& ex) + { + spdlog::error("init log failed: {}",ex.what()); + + } + } + + std::shared_ptr m_logger; + +}; + +#endif // SPDLOGUTIL_H diff --git a/utils/UtilInclude.h b/utils/UtilInclude.h index 70bb714..3eed801 100644 --- a/utils/UtilInclude.h +++ b/utils/UtilInclude.h @@ -12,5 +12,6 @@ #include "SpeakerUtil.h" #include "TimeCounterUtil.h" #include "SocketClientUtil.h" +#include "SpdLogUtil.h" #endif // UTILINCLUDE_H diff --git a/utils/utils.pri b/utils/utils.pri index 94152c7..df89202 100644 --- a/utils/utils.pri +++ b/utils/utils.pri @@ -1,5 +1,22 @@ -HEADERS += $$PWD/UtilInclude.h +HEADERS += $$PWD/UtilInclude.h \ + $$PWD/../spdlog/async.h \ + $$PWD/../spdlog/async_logger-inl.h \ + $$PWD/../spdlog/async_logger.h \ + $$PWD/../spdlog/common-inl.h \ + $$PWD/../spdlog/common.h \ + $$PWD/../spdlog/formatter.h \ + $$PWD/../spdlog/fwd.h \ + $$PWD/../spdlog/logger-inl.h \ + $$PWD/../spdlog/logger.h \ + $$PWD/../spdlog/pattern_formatter-inl.h \ + $$PWD/../spdlog/pattern_formatter.h \ + $$PWD/../spdlog/spdlog-inl.h \ + $$PWD/../spdlog/spdlog.h \ + $$PWD/../spdlog/stopwatch.h \ + $$PWD/../spdlog/tweakme.h \ + $$PWD/../spdlog/version.h \ + $$PWD/SpdLogUtil.h \ HEADERS += $$PWD/id/IdWorker.h HEADERS += $$PWD/id/Noncopyable.h