diff options
author | Janusz Kozerski <j.kozerski@samsung.com> | 2015-06-15 12:59:09 +0200 |
---|---|---|
committer | Janusz Kozerski <j.kozerski@samsung.com> | 2015-07-06 14:44:15 +0200 |
commit | 263d2681b92f5d05726c1a2b7b5f4379a8f94646 (patch) | |
tree | 24b62e0f1235145fb1217905d98912e25f79e160 /src | |
parent | 5d8a0be19e830c951c32a605e208b7120270bc70 (diff) | |
download | cert-checker-263d2681b92f5d05726c1a2b7b5f4379a8f94646.tar.gz cert-checker-263d2681b92f5d05726c1a2b7b5f4379a8f94646.tar.bz2 cert-checker-263d2681b92f5d05726c1a2b7b5f4379a8f94646.zip |
Add thread-safe Queue class
* Add m_queue member to Logic class
Change-Id: I31574fccd48cddc8bbb467568cf72c4d80d94803
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/include/cchecker/logic.h | 2 | ||||
-rw-r--r-- | src/include/cchecker/queue.h | 60 | ||||
-rw-r--r-- | src/logic.cpp | 8 | ||||
-rw-r--r-- | src/queue.cpp | 62 |
5 files changed, 133 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2ca361b..da303b4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,6 +18,7 @@ SET(CERT_CHECKER_SOURCES ${CERT_CHECKER_SRC_PATH}/cert-checker.cpp ${CERT_CHECKER_SRC_PATH}/app.cpp ${CERT_CHECKER_SRC_PATH}/logic.cpp + ${CERT_CHECKER_SRC_PATH}/queue.cpp # logs ${CERT_CHECKER_SRC_PATH}/log/log.cpp # dpl diff --git a/src/include/cchecker/logic.h b/src/include/cchecker/logic.h index 2f4a60b..3442890 100644 --- a/src/include/cchecker/logic.h +++ b/src/include/cchecker/logic.h @@ -29,6 +29,7 @@ #include <list> #include <cchecker/app.h> +#include <cchecker/queue.h> namespace CCHECKER { @@ -91,6 +92,7 @@ class Logic { void *logic_ptr) ); + Queue m_queue; std::list<app_t> m_buffer; DB::SqlQuery *m_sqlquery; bool m_is_online; diff --git a/src/include/cchecker/queue.h b/src/include/cchecker/queue.h new file mode 100644 index 0000000..7100265 --- /dev/null +++ b/src/include/cchecker/queue.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/* + * @file queue.h + * @author Janusz Kozerski (j.kozerski@samsung.com) + * @version 1.0 + * @brief This file is the implementation of thread-safe queue + */ + +#ifndef CCHECKER_QUEUE_H +#define CCHECKER_QUEUE_H + +#include <mutex> +#include <queue> + +#include <cchecker/app.h> + +namespace CCHECKER { + +struct event_t { + enum class event_type_t { + APP_INSTALL, + APP_UNINSTALL, + EVENT_TYPE_UNKNOWN + }; + + event_type_t event_type; + app_t app; + + event_t(); + event_t(const app_t &app, event_type_t type); +}; + +class Queue { + public: + void push_event(const event_t &event); + bool pop_event(event_t &event); + bool empty(); + + private: + std::mutex m_mutex; + std::queue<event_t> m_event_list; +}; + +} // CCHECKER + +#endif // CCHECKER_QUEUE_H diff --git a/src/logic.cpp b/src/logic.cpp index 10c6a93..8c25739 100644 --- a/src/logic.cpp +++ b/src/logic.cpp @@ -30,7 +30,10 @@ using namespace std; namespace CCHECKER { +namespace { const char *const DB_PATH = tzplatform_mkpath(TZ_SYS_DB, ".cert-checker.db"); +const char *const TEPM_APP_ID = "temp#app_id"; +} Logic::~Logic(void) { @@ -226,14 +229,19 @@ void Logic::pkgmgr_callback_internal(GVariant *parameters, state = g_variant_dup_string(g_variant_get_child_value(parameters, 4), NULL); status = g_variant_dup_string(g_variant_get_child_value(parameters, 5), NULL); + // FIXME: No information about app_id in the signal. Use stub. + app_t app(TEPM_APP_ID, pkgid, uid, {}); + if (std::string(state) == "end" && std::string(status) == "ok") { if (event == EVENT_INSTALL) { LogDebug("Install: uid : " << uid << ", pkgid: " << pkgid << ", state: " << state << ", status: " << status); + m_queue.push_event(event_t(app, event_t::event_type_t::APP_INSTALL)); } else if (event == EVENT_UNINSTALL) { LogDebug("Uninstall: uid : " << uid << ", pkgid: " << pkgid << ", state: " << state << ", status: " << status); + m_queue.push_event(event_t(app, event_t::event_type_t::APP_UNINSTALL)); } } else diff --git a/src/queue.cpp b/src/queue.cpp new file mode 100644 index 0000000..d0ecb41 --- /dev/null +++ b/src/queue.cpp @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/* + * @file queue.cpp + * @author Janusz Kozerski (j.kozerski@samsung.com) + * @version 1.0 + * @brief This file is the implementation of thread-safe queue + */ + +#include <mutex> +#include <utility> + +#include <cchecker/queue.h> + +namespace CCHECKER { + +event_t::event_t(): + event_type(event_type_t::EVENT_TYPE_UNKNOWN), + app() +{} + +event_t::event_t(const app_t &app, event_type_t type): + event_type(type), + app(app) +{} + +void Queue::push_event(const event_t &event) +{ + std::lock_guard<std::mutex> lock(m_mutex); + m_event_list.push(event); +} + +bool Queue::pop_event(event_t &event) +{ + std::lock_guard<std::mutex> lock(m_mutex); + if (m_event_list.empty()) + return false; + + event = std::move(m_event_list.front()); + m_event_list.pop(); + return true; +} + +bool Queue::empty() +{ + return m_event_list.empty(); +} + +} //CCHECKER |