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 | |
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
-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 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/queue_test_thread.cpp | 111 | ||||
-rw-r--r-- | tests/queue_test_thread.h | 43 | ||||
-rw-r--r-- | tests/test_queue.cpp | 135 |
9 files changed, 425 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 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 95dcd64..a1c88db 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -24,8 +24,11 @@ SET(CERT_CHECKER_TESTS_SOURCES ${CERT_CHECKER_TESTS_SRC_PATH}/dbfixture.cpp ${CERT_CHECKER_TESTS_SRC_PATH}/colour_log_formatter.cpp ${CERT_CHECKER_TESTS_SRC_PATH}/test_db.cpp + ${CERT_CHECKER_TESTS_SRC_PATH}/test_queue.cpp + ${CERT_CHECKER_TESTS_SRC_PATH}/queue_test_thread.cpp # cert-checker ${CERT_CHECKER_SRC_PATH}/app.cpp + ${CERT_CHECKER_SRC_PATH}/queue.cpp # logs ${CERT_CHECKER_SRC_PATH}/log/log.cpp # dpl diff --git a/tests/queue_test_thread.cpp b/tests/queue_test_thread.cpp new file mode 100644 index 0000000..aefc11b --- /dev/null +++ b/tests/queue_test_thread.cpp @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2011 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_test_thread.h + * @author Janusz Kozerski (j.kozerski@samsung.com) + * @version 1.0 + * @brief Implementation of class for multi-thread testing Queue + */ + +#include <thread> +#include <unistd.h> + +#include <cchecker/app.h> +#include <cchecker/queue.h> +#include <cchecker/log.h> + +#include <queue_test_thread.h> + +namespace CCHECKER { + +#define APPS_COUNT 10 + +app_t app[APPS_COUNT] = { + app_t ("app_id0", "###", 0, {}), + app_t ("app_id1", "pkg_id1", 1, {}), + app_t ("app_id2", "pkg_id2", 2, {}), + app_t ("app_id3", "###", 3, {}), + app_t ("app_id4", "###", 4, {}), + app_t ("app_id5", "###", 5, {}), + app_t ("app_id6", "###", 6, {}), + app_t ("app_id7", "###", 7, {}), + app_t ("app_id8", "###", 8, {}), + app_t ("app_id9", "###", 9, {}) +}; + +void TestQueue::add_events_th(int number_of_threads) +{ + if (number_of_threads < 1) { + LogDebug("Too few threads, at least 1 should be used"); + number_of_threads = 1; + } + + m_sent = 0; + m_max_events = number_of_threads * 2 * APPS_COUNT; + + LogDebug("Running threads"); + for (int i=0; i<number_of_threads; i++) + std::thread(&TestQueue::add_events, this).detach(); + + LogDebug("Running threads done"); +} + +void TestQueue::add_events() +{ + for (int i = 0; i < APPS_COUNT; i++) { + m_queue.push_event(event_t(app[i], event_t::event_type_t::APP_INSTALL)); + m_sent++; + LogDebug("Add event : " << i); + } + + for (int i = 0; i < APPS_COUNT; i++) { + m_queue.push_event(event_t(app[i], event_t::event_type_t::APP_UNINSTALL)); + m_sent++; + LogDebug("Add event : " << i); + } +} + +bool TestQueue::pop_events() +{ + int i_install = 0; + int i_uninstall = 0; + event_t ev; + + LogDebug("Looking events..."); + do { + while(m_queue.pop_event(ev)) { + if (ev.event_type == event_t::event_type_t::APP_INSTALL) + i_install++; + else if (ev.event_type == event_t::event_type_t::APP_UNINSTALL) + i_uninstall++; + } + } while (m_sent < m_max_events); + + // Read all events once again - just for case + while(m_queue.pop_event(ev)) { + if (ev.event_type == event_t::event_type_t::APP_INSTALL) + i_install++; + else if (ev.event_type == event_t::event_type_t::APP_UNINSTALL) + i_uninstall++; + } + LogDebug("Found " << i_install + i_uninstall << " events."); + + if (i_install != m_max_events/2 || i_uninstall != m_max_events/2) + return false; + return true; +} + +} // CCHECKER diff --git a/tests/queue_test_thread.h b/tests/queue_test_thread.h new file mode 100644 index 0000000..c2489d5 --- /dev/null +++ b/tests/queue_test_thread.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2011 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_test_thread.h + * @author Janusz Kozerski (j.kozerski@samsung.com) + * @version 1.0 + * @brief Implementation of class for multi-thread testing Queue + */ + +#include <cchecker/queue.h> + +namespace CCHECKER { + +class TestQueue { + public: + TestQueue(): + m_sent(0), + m_max_events(0) + {}; + void add_events_th (int number_of_threads); + bool pop_events (); + + private: + Queue m_queue; + int m_sent; + int m_max_events; + void add_events(); +}; + +} // CCHECKER diff --git a/tests/test_queue.cpp b/tests/test_queue.cpp new file mode 100644 index 0000000..2fe7f3e --- /dev/null +++ b/tests/test_queue.cpp @@ -0,0 +1,135 @@ +/* + * 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 test_queue.cpp + * @author Janusz Kozerski (j.kozerski@samsung.com) + * @version 1.0 + * @brief Tests of thread-safe queue + */ + +#include <boost/test/unit_test.hpp> +#include <string> +#include <thread> + +#include <cchecker/app.h> +#include <cchecker/log.h> +#include <cchecker/queue.h> + +#include <queue_test_thread.h> + +using namespace CCHECKER; + +BOOST_FIXTURE_TEST_SUITE(QUEUE_TEST, Queue) + +BOOST_AUTO_TEST_CASE(Queue) { + + app_t app1("app_id1", "pkg_id1", 1, {}); + app_t app2("app_id2", "pkg_id2", 2, {}); + app_t app3("app_id@", "###", 3, {}); + + event_t ev1(app1, event_t::event_type_t::APP_INSTALL); + event_t ev2(app1, event_t::event_type_t::APP_UNINSTALL); + + event_t ev3(app2, event_t::event_type_t::APP_INSTALL); + event_t ev4(app2, event_t::event_type_t::APP_UNINSTALL); + + event_t ev; + + BOOST_REQUIRE(empty() == true); + BOOST_REQUIRE(pop_event(ev) == false); + BOOST_REQUIRE(empty() == true); + push_event(ev1); + BOOST_REQUIRE(empty() == false); + + BOOST_REQUIRE(pop_event(ev) == true); + BOOST_REQUIRE(ev1.app.app_id == ev.app.app_id); + BOOST_REQUIRE(ev1.app.pkg_id == ev.app.pkg_id); + BOOST_REQUIRE(ev1.app.uid == ev.app.uid); + // Certs and verified flag aren't used in queue, but can be tested + BOOST_REQUIRE(ev1.app.certificates == ev.app.certificates); + BOOST_REQUIRE(ev1.app.verified == ev.app.verified); + BOOST_REQUIRE(empty() == true); + + push_event(ev2); + push_event(ev3); + BOOST_REQUIRE(empty() == false); + + BOOST_REQUIRE(pop_event(ev) == true); + BOOST_REQUIRE(ev2.app.app_id == ev.app.app_id); + BOOST_REQUIRE(ev2.app.pkg_id == ev.app.pkg_id); + BOOST_REQUIRE(ev2.app.uid == ev.app.uid); + // Certs and verified flag aren't used in queue, but can be tested + BOOST_REQUIRE(ev2.app.certificates == ev.app.certificates); + BOOST_REQUIRE(ev2.app.verified == ev.app.verified); + + + BOOST_REQUIRE(pop_event(ev) == true); + BOOST_REQUIRE(ev3.app.app_id == ev.app.app_id); + BOOST_REQUIRE(ev3.app.pkg_id == ev.app.pkg_id); + BOOST_REQUIRE(ev3.app.uid == ev.app.uid); + // Certs and verified flag aren't used in queue, but can be tested + BOOST_REQUIRE(ev3.app.certificates == ev.app.certificates); + BOOST_REQUIRE(ev3.app.verified == ev.app.verified); + + BOOST_REQUIRE(empty() == true); + BOOST_REQUIRE(pop_event(ev) == false); + push_event(ev4); + BOOST_REQUIRE(empty() == false); + BOOST_REQUIRE(pop_event(ev) == true); + BOOST_REQUIRE(pop_event(ev) == false); + BOOST_REQUIRE(pop_event(ev) == false); + BOOST_REQUIRE(empty() == true); + + push_event(ev4); + + BOOST_REQUIRE(pop_event(ev) == true); + BOOST_REQUIRE(ev4.app.app_id == ev.app.app_id); + BOOST_REQUIRE(ev4.app.pkg_id == ev.app.pkg_id); + BOOST_REQUIRE(ev4.app.uid == ev.app.uid); + // Certs and verified flag aren't used in queue, but can be tested + BOOST_REQUIRE(ev4.app.certificates == ev.app.certificates); + BOOST_REQUIRE(ev4.app.verified == ev.app.verified); + + BOOST_REQUIRE(pop_event(ev) == false); + BOOST_REQUIRE(empty() == true); +} + +BOOST_AUTO_TEST_SUITE_END() + +BOOST_FIXTURE_TEST_SUITE(QUEUE_MULTI_THREAD_TEST, TestQueue) + +BOOST_AUTO_TEST_CASE(TestQueue) { + + add_events_th (1); + BOOST_REQUIRE(pop_events() == true); + + add_events_th (2); + BOOST_REQUIRE(pop_events() == true); + + add_events_th (3); + BOOST_REQUIRE(pop_events() == true); + + add_events_th (5); + BOOST_REQUIRE(pop_events() == true); + + add_events_th (10); + BOOST_REQUIRE(pop_events() == true); + + add_events_th (20); + BOOST_REQUIRE(pop_events() == true); +} + +BOOST_AUTO_TEST_SUITE_END() |