fix: [codegeex] thread issue of generate file index

Log: as title
linuxdeepin · Oct 31, 2024 · 009647d · 009647d
1 parent 76ab3f2
commit 009647d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/src/plugins/codegeex/codegeexmanager.cpp b/src/plugins/codegeex/codegeexmanager.cpp
@@ -526,13 +526,17 @@ void CodeGeeXManager::installConda()
 
 void CodeGeeXManager::generateRag(const QString &projectPath)
 {
-    if (indexingProject.contains(projectPath))
+    mutex.lock();
+    if (indexingProject.contains(projectPath)) {
+        mutex.unlock();
         return;
+    }
     indexingProject.append(projectPath);
+    mutex.unlock();
     QProcess *process = new QProcess;
     QObject::connect(QApplication::instance(), &QApplication::aboutToQuit, process, [process]() {
         process->kill();
-    });
+    }, Qt::DirectConnection);
 
     QObject::connect(process, &QProcess::readyReadStandardError, process, [process]() {
         qInfo() << "Error:" << process->readAllStandardError() << "\n";
@@ -541,7 +545,9 @@ void CodeGeeXManager::generateRag(const QString &projectPath)
     QObject::connect(process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
                      process, [=](int exitCode, QProcess::ExitStatus exitStatus) {
                          qInfo() << "Python script finished with exit code" << exitCode << "Exit!!!";
+                         mutex.lock();
                          indexingProject.removeOne(projectPath);
+                         mutex.unlock();
                          auto success = process->readAllStandardError().isEmpty();
                          emit generateDone(projectPath, !success);
                          if (!success)
@@ -559,6 +565,8 @@ void CodeGeeXManager::generateRag(const QString &projectPath)
     if (!QFileInfo(pythonPath).exists())
         return;
     process->start(pythonPath, QStringList() << generatePyPath << modelPath << projectPath);
+    if (QThread::currentThread() != qApp->thread()) // incase thread exit before process done. cause slot function can`t work
+        process->waitForFinished();
 }
 
 /*

diff --git a/src/plugins/codegeex/codegeexmanager.h b/src/plugins/codegeex/codegeexmanager.h
@@ -11,6 +11,7 @@
 #include <QObject>
 #include <QMap>
 #include <QTimer>
+#include <QMutex>
 
 struct RecordData
 {
@@ -153,6 +154,7 @@ public Q_SLOTS:
     bool isRunning { false };
     bool condaInstalled { false };
     QTimer installCondaTimer;
+    QMutex mutex;
     QStringList indexingProject {};
 };
 

diff --git a/src/plugins/codegeex/eventreceiver.cpp b/src/plugins/codegeex/eventreceiver.cpp
@@ -76,10 +76,12 @@ void CodeGeeXReceiver::processActionInvokedEvent(const dpf::Event &event)
 
 void CodeGeeXReceiver::processOpenProjectEvent(const dpf::Event &event)
 {
-    auto projectPath = event.property("workspace").toString();
-    QJsonObject results = CodeGeeXManager::instance()->query(projectPath, "", 1);
-    if (results["Chunks"].toArray().size() != 0)   // project has generated, update it
-        CodeGeeXManager::instance()->generateRag(projectPath);
+    QtConcurrent::run([=](){
+        auto projectPath = event.property("workspace").toString();
+        QJsonObject results = CodeGeeXManager::instance()->query(projectPath, "", 1);
+        if (results["Chunks"].toArray().size() != 0)   // project has generated, update it
+            CodeGeeXManager::instance()->generateRag(projectPath);
+    });
 }
 
 void CodeGeeXReceiver::processSwitchToWidget(const dpf::Event &event)