openkylin
/
ukui-search
mirror of https://gitee.com/openkylin/ukui-search.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge pull request #104 from MouseZhangZh/0122-dev 

🔒🔒🔒Changed _exit to exit.
This commit is contained in:
iaom 2021-01-23 11:36:28 +08:00 committed by GitHub
parent a8b539a73f e6ebd8ec9e
commit 6ce4490da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsearch/index/first-index.cpp
View File

@ -151,7 +151,7 @@ void FirstIndex::run(){
mutex1.unlock(); mutex1.unlock();
mutex2.unlock(); mutex2.unlock();
mutex3.unlock(); mutex3.unlock();
_exit(0); ::exit(0);

6
libsearch/index/inotify-index.cpp
View File

@ -353,7 +353,7 @@ fork:
} }
else if ( rc == 0 ) { else if ( rc == 0 ) {
qDebug() << "select timeout!"; qDebug() << "select timeout!";
_exit(0); ::exit(0);
}else{ }else{
numRead = read(m_fd, buf, BUF_LEN); numRead = read(m_fd, buf, BUF_LEN);
if (numRead == -1){ if (numRead == -1){
@ -375,7 +375,7 @@ fork:
//MouseZhangZh //MouseZhangZh
// connect(liveTime, &QTimer::timeout, [ = ](){ // connect(liveTime, &QTimer::timeout, [ = ](){
//// _exit(0); //// ::exit(0);
// *b_timeout = 1; // *b_timeout = 1;
// }); // });
// for (;;){ // for (;;){
@ -384,7 +384,7 @@ fork:
// this->eventProcess(buf, numRead); // this->eventProcess(buf, numRead);
// if (liveTime->remainingTime() < 1){ // if (liveTime->remainingTime() < 1){
// qDebug() << "liveTime->remainingTime():" << liveTime->remainingTime(); // qDebug() << "liveTime->remainingTime():" << liveTime->remainingTime();
// _exit(0); // ::exit(0);
// } // }
// } // }
} }

10
src/main.cpp
View File

@ -36,15 +36,23 @@
void handler(int){ void handler(int){
qDebug() << "Recieved SIGTERM!"; qDebug() << "Recieved SIGTERM!";
GlobalSettings::getInstance()->setValue(INDEX_DATABASE_STATE, "2"); GlobalSettings::getInstance()->setValue(INDEX_DATABASE_STATE, "2");
GlobalSettings::getInstance()->setValue(CONTENT_INDEX_DATABASE_STATE, "2"); GlobalSettings::getInstance()->setValue(CONTENT_INDEX_DATABASE_STATE, "2");
GlobalSettings::getInstance()->setValue(INDEX_GENERATOR_NORMAL_EXIT, "2"); GlobalSettings::getInstance()->setValue(INDEX_GENERATOR_NORMAL_EXIT, "2");
GlobalSettings::getInstance()->setValue(INOTIFY_NORMAL_EXIT, "2"); GlobalSettings::getInstance()->setValue(INOTIFY_NORMAL_EXIT, "2");
GlobalSettings::getInstance()->forceSync(INDEX_DATABASE_STATE);
GlobalSettings::getInstance()->forceSync(CONTENT_INDEX_DATABASE_STATE);
GlobalSettings::getInstance()->forceSync(INDEX_GENERATOR_NORMAL_EXIT);
GlobalSettings::getInstance()->forceSync(INOTIFY_NORMAL_EXIT);
qDebug() << "indexDataBaseStatus: " << GlobalSettings::getInstance()->getValue(INDEX_DATABASE_STATE).toString(); qDebug() << "indexDataBaseStatus: " << GlobalSettings::getInstance()->getValue(INDEX_DATABASE_STATE).toString();
qDebug() << "contentIndexDataBaseStatus: " << GlobalSettings::getInstance()->getValue(CONTENT_INDEX_DATABASE_STATE).toString(); qDebug() << "contentIndexDataBaseStatus: " << GlobalSettings::getInstance()->getValue(CONTENT_INDEX_DATABASE_STATE).toString();
_exit(0);
::exit(0);
// InotifyIndex::getInstance("/home")->~InotifyIndex(); // InotifyIndex::getInstance("/home")->~InotifyIndex();