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 #99 from MouseZhangZh/0121-dev-inzpf 

🎉🎉🎉Use multiple processes to solve the problem of excessiving memory usage
This commit is contained in:
张佳萍 2021-01-22 10:10:04 +08:00 committed by GitHub
parent 6a8afe8258 add5b7bb46
commit 9b68600e6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 387 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
debian/changelog vendored
View File

@ -1,3 +1,9 @@
ukui-search (0.0.1+0120) v101; urgency=medium
* Bugs Fixed.
-- zhangpengfei <zhangpengfei@kylinos.cn> Wed, 20 Jan 2021 15:55:57 +0800
ukui-search (0.0.1+0118) v101; urgency=medium ukui-search (0.0.1+0118) v101; urgency=medium
* Feature: Add animation into inputbox. * Feature: Add animation into inputbox.
@ -11,8 +17,7 @@ ukui-search (0.0.1+0118) v101; urgency=medium
* Fix: Translation is incompleted.(33047) * Fix: Translation is incompleted.(33047)
* Fix: Widget crashed when searching & open file/filepath failed. * Fix: Widget crashed when searching & open file/filepath failed.
-- zhangjiaping <zhangjiaping@zhangpengfei> Mon, 18 Jan 2021 14:3 -- zhangjiaping <zhangjiaping@kylinos.cn> Mon, 18 Jan 2021 14:31:24 +0800
6:12 +0800
ukui-search (0.0.1+0115) v101; urgency=medium ukui-search (0.0.1+0115) v101; urgency=medium
@ -24,7 +29,7 @@ ukui-search (0.0.1+0114) v101; urgency=medium
* Bugs fixed. * Bugs fixed.
-- zhangpengfei <zhangpengfei@zhangpengfei> Thu, 14 Jan 2021 20:47:42 +0800 -- zhangpengfei <zhangpengfei@kylinos.cn> Thu, 14 Jan 2021 20:47:42 +0800
ukui-search (0.0.1+0113) v101; urgency=medium ukui-search (0.0.1+0113) v101; urgency=medium

2
libchinese-segmentation/chinese-segmentation.cpp
View File

@ -6,7 +6,6 @@ QMutex ChineseSegmentation::m_mutex;
ChineseSegmentation::ChineseSegmentation() ChineseSegmentation::ChineseSegmentation()
{ {
QMutexLocker locker(&m_mutex);
const char * const DICT_PATH = "/usr/share/ukui-search/res/dict/jieba.dict.utf8"; const char * const DICT_PATH = "/usr/share/ukui-search/res/dict/jieba.dict.utf8";
const char * const HMM_PATH = "/usr/share/ukui-search/res/dict/hmm_model.utf8"; const char * const HMM_PATH = "/usr/share/ukui-search/res/dict/hmm_model.utf8";
const char * const USER_DICT_PATH ="/usr/share/ukui-search/res/dict/user.dict.utf8"; const char * const USER_DICT_PATH ="/usr/share/ukui-search/res/dict/user.dict.utf8";
@ -29,6 +28,7 @@ ChineseSegmentation::~ChineseSegmentation()
ChineseSegmentation *ChineseSegmentation::getInstance() ChineseSegmentation *ChineseSegmentation::getInstance()
{ {
QMutexLocker locker(&m_mutex);
if (!global_instance_chinese_segmentation) { if (!global_instance_chinese_segmentation) {
global_instance_chinese_segmentation = new ChineseSegmentation; global_instance_chinese_segmentation = new ChineseSegmentation;
} }

2
libsearch/file-utils.cpp
View File

@ -11,6 +11,8 @@
#include <QMimeType> #include <QMimeType>
#include <QQueue> #include <QQueue>
#include "uchardet/uchardet.h" #include "uchardet/uchardet.h"
size_t FileUtils::_max_index_count = 0; size_t FileUtils::_max_index_count = 0;
size_t FileUtils::_current_index_count = 0; size_t FileUtils::_current_index_count = 0;
unsigned short FileUtils::_index_status = INITIAL_STATE; unsigned short FileUtils::_index_status = INITIAL_STATE;

9
libsearch/file-utils.h
View File

@ -1,6 +1,12 @@
#ifndef FILEUTILS_H #ifndef FILEUTILS_H
#define FILEUTILS_H #define FILEUTILS_H
#include "gobject-template.h" #include "gobject-template.h"
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <QString> #include <QString>
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QIcon> #include <QIcon>
@ -10,6 +16,9 @@
#define CREATING_INDEX 1 #define CREATING_INDEX 1
#define FINISH_CREATING_INDEX 2 #define FINISH_CREATING_INDEX 2
#define UKUI_SEARCH_PIPE_PATH "/tmp/ukuisearch"
class LIBSEARCH_EXPORT FileUtils class LIBSEARCH_EXPORT FileUtils
{ {
public: public:

3
libsearch/index/file-searcher.cpp
View File

@ -66,6 +66,7 @@ void FileSearcher::onKeywordSearch(QString keyword,QQueue<QString> *searchResult
total += resultCount; total += resultCount;
begin += num; begin += num;
} }
return;
}); });
// Q_EMIT this->resultFile(m_search_result_file); // Q_EMIT this->resultFile(m_search_result_file);
//dir //dir
@ -84,6 +85,7 @@ void FileSearcher::onKeywordSearch(QString keyword,QQueue<QString> *searchResult
total += resultCount; total += resultCount;
begin += num; begin += num;
} }
return;
}); });
// Q_EMIT this->resultDir(m_search_result_dir); // Q_EMIT this->resultDir(m_search_result_dir);
//content //content
@ -103,6 +105,7 @@ void FileSearcher::onKeywordSearch(QString keyword,QQueue<QString> *searchResult
total += resultCount; total += resultCount;
begin += num; begin += num;
} }
return;
}); });
// Q_EMIT this->resultContent(m_search_result_content); // Q_EMIT this->resultContent(m_search_result_content);
} }

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

@ -2,25 +2,6 @@
#include "first-index.h" #include "first-index.h"
#include <QDebug> #include <QDebug>
void handler(int){
qDebug() << "Recieved SIGTERM!";
GlobalSettings::getInstance()->setValue(INDEX_DATABASE_STATE, "2");
GlobalSettings::getInstance()->setValue(CONTENT_INDEX_DATABASE_STATE, "2");
GlobalSettings::getInstance()->setValue(INDEX_GENERATOR_NORMAL_EXIT, "2");
GlobalSettings::getInstance()->setValue(INOTIFY_NORMAL_EXIT, "2");
qDebug() << "indexDataBaseStatus: " << GlobalSettings::getInstance()->getValue(INDEX_DATABASE_STATE).toString();
qDebug() << "contentIndexDataBaseStatus: " << GlobalSettings::getInstance()->getValue(CONTENT_INDEX_DATABASE_STATE).toString();
// InotifyIndex::getInstance("/home")->~InotifyIndex();
qDebug() << "~IndexGenerator() end!" << endl;
//wait linux kill this thread forcedly
// while (true);
}
#define NEW_QUEUE(a) a = new QQueue<QString>(); qDebug("---------------------------%s %s %s new at %d..",__FILE__,__FUNCTION__,#a,__LINE__); #define NEW_QUEUE(a) a = new QQueue<QString>(); qDebug("---------------------------%s %s %s new at %d..",__FILE__,__FUNCTION__,#a,__LINE__);
//#define DELETE_QUEUE(a ) //#define DELETE_QUEUE(a )
@ -82,6 +63,18 @@ void FirstIndex::DoSomething(const QFileInfo& fileInfo){
} }
void FirstIndex::run(){ void FirstIndex::run(){
int fifo_fd;
char buffer[2];
memset(buffer, 0, sizeof(buffer));
buffer[0] = 0x1;
buffer[1] = '\0';
fifo_fd = open(UKUI_SEARCH_PIPE_PATH, O_RDWR);
if(fifo_fd == -1)
{
perror("open fifo error\n");
assert(false);
}
if (this->bool_dataBaseExist){ if (this->bool_dataBaseExist){
if (this->bool_dataBaseStatusOK){ if (this->bool_dataBaseStatusOK){
@ -95,11 +88,11 @@ void FirstIndex::run(){
else{ else{
//if the parameter is false, index won't be rebuild //if the parameter is false, index won't be rebuild
//if it is true, index will be rebuild //if it is true, index will be rebuild
this->p_indexGenerator = IndexGenerator::getInstance(true,this); p_indexGenerator = IndexGenerator::getInstance(true,this);
} }
} }
else{ else{
this->p_indexGenerator = IndexGenerator::getInstance(false,this); p_indexGenerator = IndexGenerator::getInstance(false,this);
} }
// this->q_content_index->enqueue(QString("/home/zhangzihao/Desktop/qwerty/四库全书.txt")); // this->q_content_index->enqueue(QString("/home/zhangzihao/Desktop/qwerty/四库全书.txt"));
@ -107,6 +100,12 @@ void FirstIndex::run(){
// this->p_indexGenerator->creatAllIndex(this->q_content_index); // this->p_indexGenerator->creatAllIndex(this->q_content_index);
pid_t pid;
pid = fork();
if(pid == 0)
{
prctl(PR_SET_PDEATHSIG, SIGKILL);
prctl(PR_SET_NAME,"first-index");
FileUtils::_index_status = CREATING_INDEX; FileUtils::_index_status = CREATING_INDEX;
QSemaphore sem(5); QSemaphore sem(5);
QMutex mutex1, mutex2, mutex3; QMutex mutex1, mutex2, mutex3;
@ -144,14 +143,16 @@ void FirstIndex::run(){
mutex1.unlock(); mutex1.unlock();
mutex2.unlock(); mutex2.unlock();
mutex3.unlock(); mutex3.unlock();
_exit(0);
// qDebug() << "first index end;";
// qDebug() << "first index end;";
//don't use it now!!!! //don't use it now!!!!
//MouseZhangZh //MouseZhangZh
// this->~FirstIndex(); // this->~FirstIndex();
// qDebug() << "~FirstIndex end;"; // qDebug() << "~FirstIndex end;"
if (this->q_index) if (this->q_index)
@ -160,19 +161,31 @@ void FirstIndex::run(){
if (this->q_content_index) if (this->q_content_index)
delete this->q_content_index; delete this->q_content_index;
this->q_content_index = nullptr; this->q_content_index = nullptr;
if (this->p_indexGenerator) if (p_indexGenerator)
delete this->p_indexGenerator; delete p_indexGenerator;
this->p_indexGenerator = nullptr; p_indexGenerator = nullptr;
QThreadPool::globalInstance()->releaseThread(); QThreadPool::globalInstance()->releaseThread();
QThreadPool::globalInstance()->waitForDone(); QThreadPool::globalInstance()->waitForDone();
}
else if(pid < 0)
{
qWarning()<<"First Index fork error!!";
}
else
{
waitpid(pid,NULL,0);
}
int retval = write(fifo_fd, buffer, strlen(buffer));
if(retval == -1)
{
perror("write error\n");
}
printf("write data ok!\n");
close(fifo_fd);
FileUtils::_index_status = FINISH_CREATING_INDEX; FileUtils::_index_status = FINISH_CREATING_INDEX;
qDebug() << "sigset start!";
sigset( SIGTERM, handler);
qDebug() << "sigset end!";
//quit() is shit!!! //quit() is shit!!!
// return; // return;

10
libsearch/index/first-index.h
View File

@ -4,6 +4,16 @@
#include <QThread> #include <QThread>
#include <QtConcurrent/QtConcurrent> #include <QtConcurrent/QtConcurrent>
#include <signal.h> #include <signal.h>
#include <QSemaphore>
#include<sys/types.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/wait.h>
#include <sys/prctl.h>
//#include <QtConcurrent> //#include <QtConcurrent>
#include "traverse_bfs.h" #include "traverse_bfs.h"
#include "global-settings.h" #include "global-settings.h"

4
libsearch/index/index-generator.cpp
View File

@ -450,7 +450,11 @@ bool IndexGenerator::deleteAllIndex(QStringList *pathlist)
qDebug()<<"delete path"<<doc; qDebug()<<"delete path"<<doc;
qDebug()<<"delete md5"<<QString::fromStdString(uniqueterm); qDebug()<<"delete md5"<<QString::fromStdString(uniqueterm);
m_database_path->commit(); m_database_path->commit();
m_database_content->commit();
qDebug()<< "--delete finish--"; qDebug()<< "--delete finish--";
// qDebug()<<"m_database_path->get_lastdocid()!!!"<<m_database_path->get_lastdocid();
// qDebug()<<"m_database_path->get_doccount()!!!"<<m_database_path->get_doccount();
} }
catch(const Xapian::Error &e) catch(const Xapian::Error &e)
{ {

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

@ -1,5 +1,22 @@
#include "inotify-index.h" #include "inotify-index.h"
void handler(int){
qDebug() << "Recieved SIGTERM!";
GlobalSettings::getInstance()->setValue(INDEX_DATABASE_STATE, "2");
GlobalSettings::getInstance()->setValue(CONTENT_INDEX_DATABASE_STATE, "2");
GlobalSettings::getInstance()->setValue(INDEX_GENERATOR_NORMAL_EXIT, "2");
GlobalSettings::getInstance()->setValue(INOTIFY_NORMAL_EXIT, "2");
qDebug() << "indexDataBaseStatus: " << GlobalSettings::getInstance()->getValue(INDEX_DATABASE_STATE).toString();
qDebug() << "contentIndexDataBaseStatus: " << GlobalSettings::getInstance()->getValue(CONTENT_INDEX_DATABASE_STATE).toString();
_exit(0);
// InotifyIndex::getInstance("/home")->~InotifyIndex();
//wait linux kill this thread forcedly
// while (true);
}
InotifyIndex::InotifyIndex(const QString& path) : Traverse_BFS(path) InotifyIndex::InotifyIndex(const QString& path) : Traverse_BFS(path)
{ {
@ -88,51 +105,36 @@ bool InotifyIndex::RemoveWatch(const QString &path){
return true; return true;
} }
/* void InotifyIndex::eventProcess(const char* buf, ssize_t tmp){
* Symbolic Link!!!!!!!!!!!!!!!!!! // qDebug() << "Read " << numRead << " bytes from inotify fd";
* Sysmbolic link to database dir will make a Infinite loop !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* MouseZhangZh
*/
void InotifyIndex::run(){ /* Process all of the events in buffer returned by read() */
char * p;
char buf[BUF_LEN] __attribute__((aligned(8)));
ssize_t numRead;
QQueue<QVector<QString>>* indexQueue = new QQueue<QVector<QString>>(); QQueue<QVector<QString>>* indexQueue = new QQueue<QVector<QString>>();
QQueue<QString>* contentIndexQueue = new QQueue<QString>(); QQueue<QString>* contentIndexQueue = new QQueue<QString>();
for (;;) { /* Read events forever */ ssize_t numRead = 0;
numRead = read(m_fd, buf, BUF_LEN); numRead = tmp;
if (numRead == 0) { char * p = const_cast<char*>(buf);
qDebug() << "read() from inotify fd returned 0!";
}
if (numRead == -1) {
qDebug() << "read";
}
// qDebug() << "Read " << numRead << " bytes from inotify fd";
/* Process all of the events in buffer returned by read() */ for (; p < buf + numRead;) {
for (p = buf; p < buf + numRead;) {
struct inotify_event * event = reinterpret_cast<inotify_event *>(p); struct inotify_event * event = reinterpret_cast<inotify_event *>(p);
// qDebug() << "Read Event: " << currentPath[event->wd] << QString(event->name) << event->cookie << event->wd << event->mask; // qDebug() << "Read Event: " << currentPath[event->wd] << QString(event->name) << event->cookie << event->wd << event->mask;
if(event->name[0] != '.'){ if(event->name[0] != '.'){
qDebug() << QString(currentPath[event->wd] + '/' + event->name); qDebug() << QString(currentPath[event->wd] + '/' + event->name);
FileUtils::_index_status = CREATING_INDEX; FileUtils::_index_status = CREATING_INDEX;
// switch (event->mask) { // switch (event->mask) {
if (event->mask & IN_CREATE){ if (event->mask & IN_CREATE){
if (event->mask & IN_ISDIR){ if (event->mask & IN_ISDIR){
AddWatch(currentPath[event->wd] + '/' + event->name); AddWatch(currentPath[event->wd] + '/' + event->name);
this->setPath(currentPath[event->wd] + '/' + event->name); setPath(currentPath[event->wd] + '/' + event->name);
Traverse(); Traverse();
} }
/*--------------------------------*/ /*--------------------------------*/
// IndexGenerator::getInstance()->creatAllIndex(QQueue<QVector<QString>>(QVector<QString>() << fileInfo.fileName() << fileInfo.absoluteFilePath() << QString(fileInfo.isDir() ? "1" : "0"))); // IndexGenerator::getInstance()->creatAllIndex(QQueue<QVector<QString>>(QVector<QString>() << fileInfo.fileName() << fileInfo.absoluteFilePath() << QString(fileInfo.isDir() ? "1" : "0")));
indexQueue->enqueue(QVector<QString>() << QString(event->name) << QString(currentPath[event->wd] + '/' + event->name) << QString((event->mask & IN_ISDIR) ? "1" : "0")); indexQueue->enqueue(QVector<QString>() << QString(event->name) << QString(currentPath[event->wd] + '/' + event->name) << QString((event->mask & IN_ISDIR) ? "1" : "0"));
IndexGenerator::getInstance()->creatAllIndex(indexQueue); IndexGenerator::getInstance()->creatAllIndex(indexQueue);
indexQueue->clear(); indexQueue->clear();
@ -182,13 +184,9 @@ void InotifyIndex::run(){
RemoveWatch(currentPath[event->wd] + '/' + event->name); RemoveWatch(currentPath[event->wd] + '/' + event->name);
IndexGenerator::getInstance()->deleteAllIndex(new QStringList(currentPath[event->wd] + '/' + event->name)); IndexGenerator::getInstance()->deleteAllIndex(new QStringList(currentPath[event->wd] + '/' + event->name));
AddWatch(currentPath[event->wd] + '/' + event->name); AddWatch(currentPath[event->wd] + '/' + event->name);
this->setPath(currentPath[event->wd] + '/' + event->name); setPath(currentPath[event->wd] + '/' + event->name);
Traverse(); Traverse();
//
indexQueue->enqueue(QVector<QString>() << QString(event->name) << QString(currentPath[event->wd] + '/' + event->name) << QString((event->mask & IN_ISDIR) ? "1" : "0")); indexQueue->enqueue(QVector<QString>() << QString(event->name) << QString(currentPath[event->wd] + '/' + event->name) << QString((event->mask & IN_ISDIR) ? "1" : "0"));
IndexGenerator::getInstance()->creatAllIndex(indexQueue); IndexGenerator::getInstance()->creatAllIndex(indexQueue);
indexQueue->clear(); indexQueue->clear();
@ -218,64 +216,149 @@ void InotifyIndex::run(){
goto next; goto next;
} }
// } // }
// //传创建或移动过来的文件路径 // //传创建或移动过来的文件路径
// if((event->mask & IN_CREATE)){ // if((event->mask & IN_CREATE)){
// //添加监视要先序遍历，先添加top节点 // //添加监视要先序遍历，先添加top节点
// if (event->mask & IN_ISDIR){ // if (event->mask & IN_ISDIR){
// AddWatch(currentPath[event->wd] + '/' + event->name); // AddWatch(currentPath[event->wd] + '/' + event->name);
// this->setPath(currentPath[event->wd] + '/' + event->name); // this->setPath(currentPath[event->wd] + '/' + event->name);
// Traverse(); // Traverse();
// } // }
// /*--------------------------------*/ // /*--------------------------------*/
//// IndexGenerator::getInstance()->creatAllIndex(QQueue<QVector<QString>>(QVector<QString>() << fileInfo.fileName() << fileInfo.absoluteFilePath() << QString(fileInfo.isDir() ? "1" : "0"))); //// IndexGenerator::getInstance()->creatAllIndex(QQueue<QVector<QString>>(QVector<QString>() << fileInfo.fileName() << fileInfo.absoluteFilePath() << QString(fileInfo.isDir() ? "1" : "0")));
// indexQueue->enqueue(QVector<QString>() << QString(event->name) << QString(currentPath[event->wd] + '/' + event->name) << QString((event->mask & IN_ISDIR) ? "1" : "0")); // indexQueue->enqueue(QVector<QString>() << QString(event->name) << QString(currentPath[event->wd] + '/' + event->name) << QString((event->mask & IN_ISDIR) ? "1" : "0"));
// IndexGenerator::getInstance()->creatAllIndex(indexQueue); // IndexGenerator::getInstance()->creatAllIndex(indexQueue);
// indexQueue->clear(); // indexQueue->clear();
// for (auto i : this->targetFileTypeVec){ // for (auto i : this->targetFileTypeVec){
// if (QString(currentPath[event->wd] + '/' + event->name).endsWith(i)){ // if (QString(currentPath[event->wd] + '/' + event->name).endsWith(i)){
// contentIndexQueue->enqueue(QString(currentPath[event->wd] + '/' + event->name)); // contentIndexQueue->enqueue(QString(currentPath[event->wd] + '/' + event->name));
// IndexGenerator::getInstance()->creatAllIndex(contentIndexQueue); // IndexGenerator::getInstance()->creatAllIndex(contentIndexQueue);
// contentIndexQueue->clear(); // contentIndexQueue->clear();
// break; // break;
// } // }
// } // }
// /*--------------------------------*/ // /*--------------------------------*/
// } // }
// else if((event->mask & IN_DELETE) | (event->mask & IN_MOVED_FROM)){ // else if((event->mask & IN_DELETE) | (event->mask & IN_MOVED_FROM)){
// if (event->mask & IN_ISDIR){ // if (event->mask & IN_ISDIR){
// RemoveWatch(currentPath[event->wd] + '/' + event->name); // RemoveWatch(currentPath[event->wd] + '/' + event->name);
// } // }
// IndexGenerator::getInstance()->deleteAllIndex(new QStringList(currentPath[event->wd] + '/' + event->name)); // IndexGenerator::getInstance()->deleteAllIndex(new QStringList(currentPath[event->wd] + '/' + event->name));
// } // }
// else if((event->mask & IN_MODIFY) | (event->mask & IN_MOVED_TO)){ // else if((event->mask & IN_MODIFY) | (event->mask & IN_MOVED_TO)){
// if (!(event->mask & IN_ISDIR)){ // if (!(event->mask & IN_ISDIR)){
// IndexGenerator::getInstance()->deleteAllIndex(new QStringList(currentPath[event->wd] + '/' + event->name)); // IndexGenerator::getInstance()->deleteAllIndex(new QStringList(currentPath[event->wd] + '/' + event->name));
// indexQueue->enqueue(QVector<QString>() << QString(event->name) << QString(currentPath[event->wd] + '/' + event->name) << QString((event->mask & IN_ISDIR) ? "1" : "0")); // indexQueue->enqueue(QVector<QString>() << QString(event->name) << QString(currentPath[event->wd] + '/' + event->name) << QString((event->mask & IN_ISDIR) ? "1" : "0"));
// IndexGenerator::getInstance()->creatAllIndex(indexQueue); // IndexGenerator::getInstance()->creatAllIndex(indexQueue);
// indexQueue->clear(); // indexQueue->clear();
// for (auto i : this->targetFileTypeVec){ // for (auto i : this->targetFileTypeVec){
// if (QString(currentPath[event->wd] + '/' + event->name).endsWith(i)){ // if (QString(currentPath[event->wd] + '/' + event->name).endsWith(i)){
// contentIndexQueue->enqueue(QString(currentPath[event->wd] + '/' + event->name)); // contentIndexQueue->enqueue(QString(currentPath[event->wd] + '/' + event->name));
// IndexGenerator::getInstance()->creatAllIndex(contentIndexQueue); // IndexGenerator::getInstance()->creatAllIndex(contentIndexQueue);
// contentIndexQueue->clear(); // contentIndexQueue->clear();
// break; // break;
// } // }
// } // }
// } // }
// } // }
/*--------------------------------*/ /*--------------------------------*/
FileUtils::_index_status = FINISH_CREATING_INDEX; FileUtils::_index_status = FINISH_CREATING_INDEX;
} }
next: next:
p += sizeof(struct inotify_event) + event->len; p += sizeof(struct inotify_event) + event->len;
} }
}
delete indexQueue; delete indexQueue;
indexQueue = nullptr; indexQueue = nullptr;
delete contentIndexQueue; delete contentIndexQueue;
contentIndexQueue = nullptr; contentIndexQueue = nullptr;
} }
/*
* Symbolic Link!!!!!!!!!!!!!!!!!!
* Sysmbolic link to database dir will make a Infinite loop !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* MouseZhangZh
*/
void InotifyIndex::run(){
int fifo_fd;
char buffer[2];
memset(buffer, 0, sizeof(buffer));
fifo_fd = open(UKUI_SEARCH_PIPE_PATH, O_RDWR);
if(fifo_fd == -1)
{
perror("open fifo error\n");
assert(false);
}
int retval = read(fifo_fd, buffer, sizeof(buffer));
if(retval == -1)
{
perror("read error\n");
assert(false);
}
printf("read fifo=[%s]\n", buffer);
printf("read data ok\n");
close(fifo_fd);
if (buffer[0] & 0x1){
printf("data confirmed\n");
}
unlink(UKUI_SEARCH_PIPE_PATH);
qDebug() << "sigset start!";
sigset( SIGTERM, handler);
qDebug() << "sigset end!";
char buf[BUF_LEN] __attribute__((aligned(8)));
ssize_t numRead;
for (;;) { /* Read events forever */
numRead = read(m_fd, buf, BUF_LEN);
pid_t pid;
pid = fork();
if(pid == 0)
{
prctl(PR_SET_PDEATHSIG, SIGKILL);
prctl(PR_SET_NAME,"inotify-index");
if (numRead == 0) {
qDebug() << "read() from inotify fd returned 0!";
}
if (numRead == -1) {
qDebug() << "read";
}
eventProcess(buf, numRead);
QTimer* liveTime = new QTimer();
//restart inotify-index proccess per minute
liveTime->setInterval(60000);
liveTime->start();
// connect(liveTime, &QTimer::timeout, [ = ](){
//// _exit(0);
// *b_timeout = 1;
// });
for (;;){
numRead = read(m_fd, buf, BUF_LEN);
liveTime->stop();
this->eventProcess(buf, numRead);
if (liveTime->remainingTime() < 1){
_exit(0);
}
liveTime->start();
}
}
else if (pid > 0){
memset(buf, 0x00, BUF_LEN);
waitpid(pid, NULL, 0);
}
else{
assert(false);
}
}
}

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

@ -2,6 +2,7 @@
#define INOTIFYINDEX_H #define INOTIFYINDEX_H
#include <QThread> #include <QThread>
#include <QTimer>
#include <unistd.h> #include <unistd.h>
#include <sys/inotify.h> #include <sys/inotify.h>
#include "index-generator.h" #include "index-generator.h"
@ -9,8 +10,9 @@
#include "ukui-search-qdbus.h" #include "ukui-search-qdbus.h"
#include "global-settings.h" #include "global-settings.h"
#include "file-utils.h" #include "file-utils.h"
#include "first-index.h"
#define BUF_LEN 1024 #define BUF_LEN 1024000
class InotifyIndex; class InotifyIndex;
static InotifyIndex* global_instance_of_index = nullptr; static InotifyIndex* global_instance_of_index = nullptr;
class InotifyIndex : public QThread, public Traverse_BFS class InotifyIndex : public QThread, public Traverse_BFS
@ -29,6 +31,8 @@ public:
bool AddWatch(const QString&); bool AddWatch(const QString&);
bool RemoveWatch(const QString&); bool RemoveWatch(const QString&);
virtual void DoSomething(const QFileInfo &) final; virtual void DoSomething(const QFileInfo &) final;
void eventProcess(const char*, ssize_t);
protected: protected:
void run() override; void run() override;
private: private:

1
libsearch/index/traverse_bfs.h
View File

@ -10,6 +10,7 @@ class Traverse_BFS
{ {
public: public:
void Traverse(); void Traverse();
virtual ~Traverse_BFS() = default;
virtual void DoSomething(const QFileInfo&) = 0; virtual void DoSomething(const QFileInfo&) = 0;
void setPath(const QString&); void setPath(const QString&);
protected: protected:

13
src/main.cpp
View File

@ -33,6 +33,7 @@
#include "global-settings.h" #include "global-settings.h"
#include "xatom-helper.h" #include "xatom-helper.h"
void messageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) void messageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{ {
QByteArray localMsg = msg.toLocal8Bit(); QByteArray localMsg = msg.toLocal8Bit();
@ -91,6 +92,17 @@ void centerToScreen(QWidget* widget) {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
unlink(UKUI_SEARCH_PIPE_PATH);
int retval = mkfifo(UKUI_SEARCH_PIPE_PATH, 0777);
if(retval == -1)
{
perror("creat fifo error\n");
assert(false);
return -1;
}
printf("create fifo success\n");
qInstallMessageHandler(messageOutput); qInstallMessageHandler(messageOutput);
qRegisterMetaType<QPair<QString,QStringList>>("QPair<QString,QStringList>"); qRegisterMetaType<QPair<QString,QStringList>>("QPair<QString,QStringList>");
qRegisterMetaType<Document>("Document"); qRegisterMetaType<Document>("Document");
@ -185,6 +197,7 @@ int main(int argc, char *argv[])
// FirstIndex* fi = new FirstIndex("/home/zhangzihao/Desktop/qwerty"); // FirstIndex* fi = new FirstIndex("/home/zhangzihao/Desktop/qwerty");
FirstIndex fi("/home"); FirstIndex fi("/home");
fi.start(); fi.start();
// fi.wait();
// fi->wait(); // fi->wait();
// fi->exit(); // fi->exit();
// delete fi; // delete fi;