aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/thread/DataObject.cpp2
-rw-r--r--src/core/thread/Task.cpp212
-rw-r--r--src/core/thread/TaskImpl.hpp242
-rw-r--r--src/plugin/CMakeLists.txt15
-rw-r--r--src/plugin/system/Plugin.cpp4
-rw-r--r--src/plugin/system/Plugin.h2
6 files changed, 221 insertions, 256 deletions
diff --git a/src/core/thread/DataObject.cpp b/src/core/thread/DataObject.cpp
index b21db7cb..55a5f452 100644
--- a/src/core/thread/DataObject.cpp
+++ b/src/core/thread/DataObject.cpp
@@ -73,6 +73,8 @@ std::any DataObject::GetParameter(size_t index) const {
return p_->GetParameter(index);
}
+void DataObject::AppendObject(std::any obj) { return p_->AppendObject(obj); }
+
size_t DataObject::GetObjectSize() const { return p_->GetObjectSize(); }
void DataObject::Swap(DataObject& other) noexcept { std::swap(p_, other.p_); }
diff --git a/src/core/thread/Task.cpp b/src/core/thread/Task.cpp
index cc6a38b8..1da18a86 100644
--- a/src/core/thread/Task.cpp
+++ b/src/core/thread/Task.cpp
@@ -28,12 +28,216 @@
#include "core/thread/Task.h"
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/uuid_generators.hpp>
+#include <boost/uuid/uuid_io.hpp>
#include <memory>
-#include "TaskImpl.hpp"
-
namespace GpgFrontend::Thread {
+class Task::Impl : public QObject {
+ Q_OBJECT
+
+ public:
+ Impl(Task *parent, std::string name)
+ : parent_(parent), uuid_(generate_uuid()), name_(name) {
+ SPDLOG_TRACE("task {} created", GetFullID());
+ init();
+ }
+
+ Impl(Task *parent, TaskRunnable runnable, std::string name,
+ DataObjectPtr data_object, bool sequency)
+ : parent_(parent),
+ uuid_(generate_uuid()),
+ name_(name),
+ runnable_(std::move(runnable)),
+ callback_(std::move([](int, const DataObjectPtr &) {})),
+ callback_thread_(QThread::currentThread()),
+ data_object_(data_object),
+ sequency_(sequency) {
+ SPDLOG_TRACE("task {} created with runnable, callback_thread_: {}",
+ GetFullID(), static_cast<void *>(callback_thread_));
+ init();
+ }
+
+ Impl(Task *parent, TaskRunnable runnable, std::string name,
+ DataObjectPtr data_object, TaskCallback callback, bool sequency)
+ : parent_(parent),
+ uuid_(generate_uuid()),
+ name_(name),
+ runnable_(std::move(runnable)),
+ callback_(std::move(callback)),
+ callback_thread_(QThread::currentThread()),
+ data_object_(data_object),
+ sequency_(sequency) {
+ init();
+ SPDLOG_TRACE(
+ "task {} created with runnable and callback, callback_thread_: {}",
+ GetFullID(), static_cast<void *>(callback_thread_));
+ }
+
+ ~Impl() { SPDLOG_TRACE("task {} destroyed", GetFullID()); }
+
+ /**
+ * @brief
+ *
+ * @return std::string
+ */
+ std::string GetFullID() const { return uuid_ + "/" + name_; }
+
+ std::string GetUUID() const { return uuid_; }
+
+ bool GetSequency() const { return sequency_; }
+
+ void Run() {
+ if (runnable_) {
+ SetRTN(runnable_(data_object_));
+ } else {
+ SPDLOG_WARN("no runnable in task, do callback operation");
+ }
+ }
+
+ /**
+ * @brief Set the Finish After Run object
+ *
+ * @param finish_after_run
+ */
+ void HoldOnLifeCycle(bool hold_on) {
+ this->run_callback_after_runnable_finished_ = !hold_on;
+ }
+
+ /**
+ * @brief
+ *
+ * @param rtn
+ */
+ void SetRTN(int rtn) { this->rtn_ = rtn; }
+
+ /**
+ * @brief
+ *
+ */
+ void RunnableInterfaceRun() {
+ SPDLOG_TRACE("task {} starting", GetFullID());
+
+ // build runnable package for running
+ auto runnable_package = [=, id = GetFullID()]() {
+ SPDLOG_DEBUG("task {} runnable start runing", id);
+ // Run() will set rtn by itself
+ Run();
+ // raise signal to anounce after runnable returned
+ if (run_callback_after_runnable_finished_)
+ emit parent_->SignalTaskRunnableEnd(rtn_);
+ };
+
+ if (thread() != QThread::currentThread()) {
+ SPDLOG_DEBUG("task running thread is not object living thread");
+ // if running sequently
+ if (sequency_) {
+ // running in another thread, blocking until returned
+ if (!QMetaObject::invokeMethod(thread(), runnable_package,
+ Qt::BlockingQueuedConnection)) {
+ SPDLOG_ERROR("qt invoke method failed");
+ }
+ } else {
+ // running in another thread, non-blocking
+ if (!QMetaObject::invokeMethod(thread(), runnable_package)) {
+ SPDLOG_ERROR("qt invoke method failed");
+ }
+ }
+ } else {
+ if (!QMetaObject::invokeMethod(this, runnable_package)) {
+ SPDLOG_ERROR("qt invoke method failed");
+ }
+ }
+ }
+
+ public slots:
+
+ /**
+ * @brief
+ *
+ */
+ void SlotRun() { RunnableInterfaceRun(); }
+
+ private:
+ Task *parent_;
+ const std::string uuid_;
+ const std::string name_;
+ const bool sequency_ = true; ///< must run in the same thread
+ TaskCallback callback_; ///<
+ TaskRunnable runnable_; ///<
+ bool run_callback_after_runnable_finished_ = true; ///<
+ int rtn_ = 0; ///<
+ QThread *callback_thread_ = nullptr; ///<
+ DataObjectPtr data_object_ = nullptr; ///<
+
+ void init() {
+ // after runnable finished, running callback
+ connect(parent_, &Task::SignalTaskRunnableEnd, this,
+ &Impl::slot_task_run_callback);
+ }
+
+ /**
+ * @brief
+ *
+ * @return std::string
+ */
+ std::string generate_uuid() {
+ return boost::uuids::to_string(boost::uuids::random_generator()());
+ }
+
+ private slots:
+
+ /**
+ * @brief
+ *
+ */
+ void slot_task_run_callback(int rtn) {
+ SPDLOG_TRACE("task runnable {} finished, rtn: {}", GetFullID(), rtn);
+ // set return value
+ this->SetRTN(rtn);
+
+ try {
+ if (callback_) {
+ if (callback_thread_ == QThread::currentThread()) {
+ SPDLOG_DEBUG("callback thread is the same thread");
+ if (!QMetaObject::invokeMethod(callback_thread_,
+ [callback = callback_, rtn = rtn_,
+ &data_object = data_object_, this]() {
+ callback(rtn, data_object);
+ // do cleaning work
+ emit parent_->SignalTaskEnd();
+ })) {
+ SPDLOG_ERROR("failed to invoke callback");
+ }
+ // just finished, let callack thread to raise SignalTaskEnd
+ return;
+ } else {
+ // waiting for callback to finish
+ if (!QMetaObject::invokeMethod(
+ callback_thread_,
+ [callback = callback_, rtn = rtn_,
+ data_object = data_object_]() {
+ callback(rtn, data_object);
+ },
+ Qt::BlockingQueuedConnection)) {
+ SPDLOG_ERROR("failed to invoke callback");
+ }
+ }
+ }
+ } catch (std::exception &e) {
+ SPDLOG_ERROR("exception caught: {}", e.what());
+ } catch (...) {
+ SPDLOG_ERROR("unknown exception caught");
+ }
+
+ // raise signal, announcing this task come to an end
+ SPDLOG_DEBUG("task {}, starting calling signal SignalTaskEnd", GetFullID());
+ emit parent_->SignalTaskEnd();
+ }
+};
+
const std::string DEFAULT_TASK_NAME = "unnamed-task";
Task::Task(std::string name) : p_(std::make_unique<Impl>(this, name)) {}
@@ -70,4 +274,6 @@ void Task::Run() { p_->Run(); }
void Task::run() { p_->RunnableInterfaceRun(); }
-} // namespace GpgFrontend::Thread \ No newline at end of file
+} // namespace GpgFrontend::Thread
+
+#include "Task.moc" \ No newline at end of file
diff --git a/src/core/thread/TaskImpl.hpp b/src/core/thread/TaskImpl.hpp
deleted file mode 100644
index c196c981..00000000
--- a/src/core/thread/TaskImpl.hpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * Copyright (C) 2021 Saturneric <[email protected]>
- *
- * This file is part of GpgFrontend.
- *
- * GpgFrontend is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GpgFrontend is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GpgFrontend. If not, see <https://www.gnu.org/licenses/>.
- *
- * The initial version of the source code is inherited from
- * the gpg4usb project, which is under GPL-3.0-or-later.
- *
- * All the source code of GpgFrontend was modified and released by
- * Saturneric <[email protected]> starting on May 12, 2021.
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- */
-
-#pragma once
-
-#include <boost/uuid/uuid.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-#include <boost/uuid/uuid_io.hpp>
-#include <memory>
-
-#include "Task.h"
-
-namespace GpgFrontend::Thread {
-
-class Task::Impl : public QObject {
- Q_OBJECT
-
- public:
- Impl(Task *parent, std::string name)
- : parent_(parent), uuid_(generate_uuid()), name_(name) {
- SPDLOG_TRACE("task {} created", GetFullID());
- init();
- }
-
- Impl(Task *parent, TaskRunnable runnable, std::string name,
- DataObjectPtr data_object, bool sequency)
- : parent_(parent),
- uuid_(generate_uuid()),
- name_(name),
- runnable_(std::move(runnable)),
- callback_(std::move([](int, const DataObjectPtr &) {})),
- callback_thread_(QThread::currentThread()),
- data_object_(data_object),
- sequency_(sequency) {
- SPDLOG_TRACE("task {} created with runnable, callback_thread_: {}",
- GetFullID(), static_cast<void *>(callback_thread_));
- init();
- }
-
- Impl(Task *parent, TaskRunnable runnable, std::string name,
- DataObjectPtr data_object, TaskCallback callback, bool sequency)
- : parent_(parent),
- uuid_(generate_uuid()),
- name_(name),
- runnable_(std::move(runnable)),
- callback_(std::move(callback)),
- callback_thread_(QThread::currentThread()),
- data_object_(data_object),
- sequency_(sequency) {
- init();
- SPDLOG_TRACE(
- "task {} created with runnable and callback, callback_thread_: {}",
- GetFullID(), static_cast<void *>(callback_thread_));
- }
-
- ~Impl() { SPDLOG_TRACE("task {} destroyed", GetFullID()); }
-
- /**
- * @brief
- *
- * @return std::string
- */
- std::string GetFullID() const { return uuid_ + "/" + name_; }
-
- std::string GetUUID() const { return uuid_; }
-
- bool GetSequency() const { return sequency_; }
-
- void Run() {
- if (runnable_) {
- SetRTN(runnable_(data_object_));
- } else {
- SPDLOG_WARN("no runnable in task, do callback operation");
- }
- }
-
- /**
- * @brief Set the Finish After Run object
- *
- * @param finish_after_run
- */
- void HoldOnLifeCycle(bool hold_on) {
- this->run_callback_after_runnable_finished_ = !hold_on;
- }
-
- /**
- * @brief
- *
- * @param rtn
- */
- void SetRTN(int rtn) { this->rtn_ = rtn; }
-
- /**
- * @brief
- *
- */
- void RunnableInterfaceRun() {
- SPDLOG_TRACE("task {} starting", GetFullID());
-
- // build runnable package for running
- auto runnable_package = [=, id = GetFullID()]() {
- SPDLOG_DEBUG("task {} runnable start runing", id);
- // Run() will set rtn by itself
- Run();
- // raise signal to anounce after runnable returned
- if (run_callback_after_runnable_finished_)
- emit parent_->SignalTaskRunnableEnd(rtn_);
- };
-
- if (thread() != QThread::currentThread()) {
- SPDLOG_DEBUG("task running thread is not object living thread");
- // if running sequently
- if (sequency_) {
- // running in another thread, blocking until returned
- if (!QMetaObject::invokeMethod(thread(), runnable_package,
- Qt::BlockingQueuedConnection)) {
- SPDLOG_ERROR("qt invoke method failed");
- }
- } else {
- // running in another thread, non-blocking
- if (!QMetaObject::invokeMethod(thread(), runnable_package)) {
- SPDLOG_ERROR("qt invoke method failed");
- }
- }
- } else {
- if (!QMetaObject::invokeMethod(this, runnable_package)) {
- SPDLOG_ERROR("qt invoke method failed");
- }
- }
- }
-
- public slots:
-
- /**
- * @brief
- *
- */
- void SlotRun() { RunnableInterfaceRun(); }
-
- private:
- Task *parent_;
- const std::string uuid_;
- const std::string name_;
- const bool sequency_ = true; ///< must run in the same thread
- TaskCallback callback_; ///<
- TaskRunnable runnable_; ///<
- bool run_callback_after_runnable_finished_ = true; ///<
- int rtn_ = 0; ///<
- QThread *callback_thread_ = nullptr; ///<
- DataObjectPtr data_object_ = nullptr; ///<
-
- void init() {
- // after runnable finished, running callback
- connect(parent_, &Task::SignalTaskRunnableEnd, this,
- &Impl::slot_task_run_callback);
- }
-
- /**
- * @brief
- *
- * @return std::string
- */
- std::string generate_uuid() {
- return boost::uuids::to_string(boost::uuids::random_generator()());
- }
-
- private slots:
-
- /**
- * @brief
- *
- */
- void slot_task_run_callback(int rtn) {
- SPDLOG_TRACE("task runnable {} finished, rtn: {}", GetFullID(), rtn);
- // set return value
- this->SetRTN(rtn);
-
- try {
- if (callback_) {
- if (callback_thread_ == QThread::currentThread()) {
- SPDLOG_DEBUG("callback thread is the same thread");
- if (!QMetaObject::invokeMethod(callback_thread_,
- [callback = callback_, rtn = rtn_,
- &data_object = data_object_, this]() {
- callback(rtn, data_object);
- // do cleaning work
- emit parent_->SignalTaskEnd();
- })) {
- SPDLOG_ERROR("failed to invoke callback");
- }
- // just finished, let callack thread to raise SignalTaskEnd
- return;
- } else {
- // waiting for callback to finish
- if (!QMetaObject::invokeMethod(
- callback_thread_,
- [callback = callback_, rtn = rtn_,
- data_object = data_object_]() {
- callback(rtn, data_object);
- },
- Qt::BlockingQueuedConnection)) {
- SPDLOG_ERROR("failed to invoke callback");
- }
- }
- }
- } catch (std::exception &e) {
- SPDLOG_ERROR("exception caught: {}", e.what());
- } catch (...) {
- SPDLOG_ERROR("unknown exception caught");
- }
-
- // raise signal, announcing this task come to an end
- SPDLOG_DEBUG("task {}, starting calling signal SignalTaskEnd", GetFullID());
- emit parent_->SignalTaskEnd();
- }
-};
-} // namespace GpgFrontend::Thread \ No newline at end of file
diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt
index de5bd7ac..288f9c42 100644
--- a/src/plugin/CMakeLists.txt
+++ b/src/plugin/CMakeLists.txt
@@ -58,15 +58,15 @@ target_include_directories(gpgfrontend_plugin_sdk PUBLIC sdk)
# link plugin system
target_link_libraries(gpgfrontend_plugin_sdk
- PRIVATE gpgfrontend_plugin_system)
+ PUBLIC gpgfrontend_plugin_system)
# tracking integrated plugins
-set(all_integrated_plugins_libraries "")
-file(GLOB children LIST_DIRECTORIES true "integrated_plugins/*")
+set(all_module_libraries "")
+file(GLOB children LIST_DIRECTORIES true "module/*")
foreach(child ${children})
if(IS_DIRECTORY ${child})
get_filename_component(dirName ${child} NAME)
- add_subdirectory("integrated_plugins/${dirName}")
+ add_subdirectory("module/${dirName}")
string(REPLACE "_plugin" "" stripped_plugin ${dirName})
set(integrated_lib_name "gpgfrontend_integrated_plugin_${stripped_plugin}")
@@ -94,12 +94,11 @@ target_link_libraries(gpgfrontend_plugin PRIVATE
gpgfrontend_core gpgfrontend_ui)
# link gpgfrontend_plugin_sdk
-target_link_libraries(gpgfrontend_plugin PRIVATE
- gpgfrontend_plugin_sdk)
+target_link_libraries(gpgfrontend_plugin PRIVATE gpgfrontend_plugin_sdk)
# link all integrated plugins
-message(STATUS "All Integrated Plugin Libraries: ${all_integrated_plugins_libraries}")
-target_link_libraries(gpgfrontend_plugin PRIVATE ${all_integrated_plugins_libraries})
+message(STATUS "All Module Libraries: ${all_module_libraries}")
+target_link_libraries(gpgfrontend_plugin PRIVATE ${all_module_libraries})
# using std c++ 17
target_compile_features(gpgfrontend_plugin PUBLIC cxx_std_17) \ No newline at end of file
diff --git a/src/plugin/system/Plugin.cpp b/src/plugin/system/Plugin.cpp
index 479ee75c..ac10953a 100644
--- a/src/plugin/system/Plugin.cpp
+++ b/src/plugin/system/Plugin.cpp
@@ -60,7 +60,7 @@ class Plugin::Impl {
PluginIdentifier GetPluginIdentifier() const { return identifier_; }
- PluginIdentifier SetGPC(GlobalPluginContextPtr gpc) { gpc_ = gpc; }
+ void SetGPC(GlobalPluginContextPtr gpc) { gpc_ = gpc; }
private:
GlobalPluginContextPtr gpc_;
@@ -101,5 +101,5 @@ PluginIdentifier Plugin::GetPluginIdentifier() const {
return p_->GetPluginIdentifier();
}
-PluginIdentifier Plugin::SetGPC(GlobalPluginContextPtr gpc) { p_->SetGPC(gpc); }
+void Plugin::SetGPC(GlobalPluginContextPtr gpc) { p_->SetGPC(gpc); }
} // namespace GpgFrontend::Plugin \ No newline at end of file
diff --git a/src/plugin/system/Plugin.h b/src/plugin/system/Plugin.h
index 68484c1e..7995d8dc 100644
--- a/src/plugin/system/Plugin.h
+++ b/src/plugin/system/Plugin.h
@@ -67,7 +67,7 @@ class GPGFRONTEND_PLUGIN_SYSTEM_EXPORT Plugin : public QObject {
PluginIdentifier GetPluginIdentifier() const;
- PluginIdentifier SetGPC(GlobalPluginContextPtr);
+ void SetGPC(GlobalPluginContextPtr);
protected:
int getChannel();
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-30 20:33:38 +0000