summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2014-03-22 01:16:48 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2014-03-22 01:16:48 +0100
commitdff97425cdcbfbbb0ca4d5c8cf48d7a24111979d (patch)
tree3c28ad28cff1f5d7dd96b4ec074005d04d6a54a8
parentd317a324c1c9fbc827f195f648a7a86dc17f89a1 (diff)
downloadgmrf-dff97425cdcbfbbb0ca4d5c8cf48d7a24111979d.tar
gmrf-dff97425cdcbfbbb0ca4d5c8cf48d7a24111979d.zip
Remove SQLite monitor
SQLite is slows down the simulation to much.
-rw-r--r--mmss/CMakeLists.txt1
-rw-r--r--mmss/context.cpp2
-rw-r--r--mmss/monitor_sqlite.cpp49
-rw-r--r--mmss/monitor_sqlite.hpp46
4 files changed, 0 insertions, 98 deletions
diff --git a/mmss/CMakeLists.txt b/mmss/CMakeLists.txt
index 4823bce..0b9217f 100644
--- a/mmss/CMakeLists.txt
+++ b/mmss/CMakeLists.txt
@@ -12,7 +12,6 @@ add_executable(mmss
lex.cpp
mmss.cpp
monitor_log.cpp
- monitor_sqlite.cpp
network.cpp
protocol.cpp
${BISON_mmss_config_parse_OUTPUTS}
diff --git a/mmss/context.cpp b/mmss/context.cpp
index 4cf5011..3ab4086 100644
--- a/mmss/context.cpp
+++ b/mmss/context.cpp
@@ -30,7 +30,6 @@
#include "node.hpp"
#include "monitor_log.hpp"
-#include "monitor_sqlite.hpp"
#include <algorithm>
#include <cassert>
@@ -90,7 +89,6 @@ void context_t::run(int argc, char *argv[]) {
attach_monitor(std::make_shared<monitor_log_t>());
- attach_monitor(std::make_shared<monitor_sqlite_t>());
std::shared_ptr<const config_t> conf = config_t::read(this, argv[1]);
diff --git a/mmss/monitor_sqlite.cpp b/mmss/monitor_sqlite.cpp
deleted file mode 100644
index 34b1da4..0000000
--- a/mmss/monitor_sqlite.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- Copyright (c) 2013-2014, Matthias Schiffer <mschiffer@universe-factory.net>
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "monitor_sqlite.hpp"
-
-namespace MMSS {
-
-void monitor_sqlite_t::handle_log(node_t *node UNUSED, int priority UNUSED, const std::string &message UNUSED) {
-}
-
-void monitor_sqlite_t::handle_init(node_t *node UNUSED, const uint8_t *node_id UNUSED, size_t len UNUSED) {
-}
-
-void monitor_sqlite_t::handle_neigh(node_t *node UNUSED, gmrf_iface_t *iface UNUSED, const gmrf_addr_t *addr UNUSED, float rxcost UNUSED, float txcost UNUSED) {
-}
-
-void monitor_sqlite_t::handle_neigh_lost(node_t *node UNUSED, gmrf_iface_t *iface UNUSED, const gmrf_addr_t *addr UNUSED) {
-}
-
-void monitor_sqlite_t::handle_route(node_t *node UNUSED, const uint8_t *node_id UNUSED, size_t len UNUSED, gmrf_iface_t *iface UNUSED, const gmrf_addr_t *addr UNUSED, int metric UNUSED) {
-}
-
-void monitor_sqlite_t::handle_route_lost(node_t *node UNUSED, const uint8_t *node_id UNUSED, size_t len UNUSED) {
-}
-
-}
diff --git a/mmss/monitor_sqlite.hpp b/mmss/monitor_sqlite.hpp
deleted file mode 100644
index afb6e2f..0000000
--- a/mmss/monitor_sqlite.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- Copyright (c) 2013-2014, Matthias Schiffer <mschiffer@universe-factory.net>
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#pragma once
-
-#include "monitor.hpp"
-
-namespace MMSS {
-
-class monitor_sqlite_t : public monitor_t {
-public:
- virtual void handle_log(node_t *node, int priority, const std::string &message);
-
- virtual void handle_init(node_t *node, const uint8_t *node_id, size_t len);
-
- virtual void handle_neigh(node_t *node, gmrf_iface_t *iface, const gmrf_addr_t *addr, float rxcost, float txcost);
- virtual void handle_neigh_lost(node_t *node, gmrf_iface_t *iface, const gmrf_addr_t *addr);
-
- virtual void handle_route(node_t *node, const uint8_t *node_id, size_t len, gmrf_iface_t *iface, const gmrf_addr_t *addr, int metric);
- virtual void handle_route_lost(node_t *node, const uint8_t *node_id, size_t len);
-};
-
-}