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

移除无用的信号量

This commit is contained in:
iaom 2023-01-13 15:09:15 +08:00
parent f6b80dd87c
commit baf40c3cf7
4 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsearch/dirwatcher/dir-watcher.cpp
View File

@ -8,14 +8,12 @@ static std::once_flag flag;
static DirWatcher *global_intance = nullptr; static DirWatcher *global_intance = nullptr;
DirWatcher::DirWatcher(QObject *parent) DirWatcher::DirWatcher(QObject *parent)
: QObject(parent), m_semaphore(QStringLiteral("ukui-search-dir-manager-dbus-register-sem"), 0, QSystemSemaphore::AccessMode::Open) : QObject(parent)
{ {
m_dbusInterface = new QDBusInterface("com.ukui.search.fileindex.service", m_dbusInterface = new QDBusInterface("com.ukui.search.fileindex.service",
"/org/ukui/search/privateDirWatcher", "/org/ukui/search/privateDirWatcher",
"org.ukui.search.fileindex"); "org.ukui.search.fileindex");
m_semaphore.acquire();
m_semaphore.release();
if (!m_dbusInterface->isValid()) { if (!m_dbusInterface->isValid()) {
qCritical() << "Create privateDirWatcher Interface Failed Because: " << QDBusConnection::sessionBus().lastError(); qCritical() << "Create privateDirWatcher Interface Failed Because: " << QDBusConnection::sessionBus().lastError();
return; return;

3
libsearch/dirwatcher/dir-watcher.h
View File

@ -4,7 +4,6 @@
#include <QObject> #include <QObject>
#include <QDBusInterface> #include <QDBusInterface>
#include <QDBusReply> #include <QDBusReply>
#include <QSystemSemaphore>
class DirWatcher : public QObject class DirWatcher : public QObject
{ {
@ -34,8 +33,6 @@ private:
~DirWatcher(); ~DirWatcher();
QDBusInterface *m_dbusInterface = nullptr; QDBusInterface *m_dbusInterface = nullptr;
QSystemSemaphore m_semaphore;
}; };
#endif // MOUNTDISKLISTENER_H #endif // MOUNTDISKLISTENER_H

4
ukui-search-service-dir-manager/ukui-search-dir-manager-dbus.cpp
View File

@ -6,7 +6,7 @@
#include <QDebug> #include <QDebug>
UkuiSearchDirManagerDbus::UkuiSearchDirManagerDbus(int &argc, char *argv[], const QString &applicationName) UkuiSearchDirManagerDbus::UkuiSearchDirManagerDbus(int &argc, char *argv[], const QString &applicationName)
: QtSingleApplication (applicationName, argc, argv), m_semaphore(QStringLiteral("ukui-search-dir-manager-dbus-register-sem"), 0, QSystemSemaphore::AccessMode::Create) : QtSingleApplication (applicationName, argc, argv)
{ {
setQuitOnLastWindowClosed(false); setQuitOnLastWindowClosed(false);
setApplicationVersion(QString("v%1").arg(VERSION)); setApplicationVersion(QString("v%1").arg(VERSION));
@ -17,7 +17,6 @@ UkuiSearchDirManagerDbus::UkuiSearchDirManagerDbus(int &argc, char *argv[], cons
if(!sessionBus.registerService("com.ukui.search.fileindex.service")) { if(!sessionBus.registerService("com.ukui.search.fileindex.service")) {
qCritical() << "QDbus register service failed reason:" << sessionBus.lastError(); qCritical() << "QDbus register service failed reason:" << sessionBus.lastError();
} }
if(!sessionBus.registerObject("/org/ukui/search/privateDirWatcher", DirWatcher::getDirWatcher(), QDBusConnection::ExportNonScriptableSlots | QDBusConnection::ExportAllSignals)) { if(!sessionBus.registerObject("/org/ukui/search/privateDirWatcher", DirWatcher::getDirWatcher(), QDBusConnection::ExportNonScriptableSlots | QDBusConnection::ExportAllSignals)) {
qCritical() << "ukui-search-fileindex dbus register object failed reason:" << sessionBus.lastError(); qCritical() << "ukui-search-fileindex dbus register object failed reason:" << sessionBus.lastError();
} }
@ -28,7 +27,6 @@ UkuiSearchDirManagerDbus::UkuiSearchDirManagerDbus(int &argc, char *argv[], cons
} else { } else {
qWarning() << "Ukui search dir manager is running!"; qWarning() << "Ukui search dir manager is running!";
} }
m_semaphore.release();
//parse cmd //parse cmd
qDebug()<<"parse cmd"; qDebug()<<"parse cmd";
auto message = this->arguments().join(' ').toUtf8(); auto message = this->arguments().join(' ').toUtf8();

3
ukui-search-service-dir-manager/ukui-search-dir-manager-dbus.h
View File

@ -1,7 +1,6 @@
#ifndef UKUISEARCHDIRWATCHERDBUS_H #ifndef UKUISEARCHDIRWATCHERDBUS_H
#define UKUISEARCHDIRWATCHERDBUS_H #define UKUISEARCHDIRWATCHERDBUS_H
#include <QSystemSemaphore>
#include "qtsingleapplication.h" #include "qtsingleapplication.h"
class UkuiSearchDirManagerDbus : public QtSingleApplication class UkuiSearchDirManagerDbus : public QtSingleApplication
@ -11,8 +10,6 @@ public:
UkuiSearchDirManagerDbus(int &argc, char *argv[], const QString &applicationName = "ukui-search-service-dir-manager"); UkuiSearchDirManagerDbus(int &argc, char *argv[], const QString &applicationName = "ukui-search-service-dir-manager");
protected Q_SLOTS: protected Q_SLOTS:
void parseCmd(QString msg, bool isPrimary); void parseCmd(QString msg, bool isPrimary);
private:
QSystemSemaphore m_semaphore;
}; };
#endif // UKUISEARCHDIRWATCHERDBUS_H #endif // UKUISEARCHDIRWATCHERDBUS_H