From 40cc380a88857a69c340d47689fd28e1c2d742ac Mon Sep 17 00:00:00 2001 From: Ethereal Date: Sat, 19 Feb 2011 16:29:44 -0700 Subject: [PATCH] Continued refactoring, moving around code. --- SConstruct | 1 + include/{monitor => }/config/ArgumentParser.h | 0 include/{monitor => }/config/ConcreteVault.h | 0 include/{monitor => }/config/Parser.h | 0 include/{monitor => }/config/Vault.h | 0 include/{monitor/program => shm}/SharedMemory.h | 0 include/{monitor/program => shm}/ZoneReader.h | 0 .../{monitor/vcommunication => vcomm}/DataSink.h | 0 .../vcommunication => vcomm}/GeneralSink.h | 0 .../{monitor/vcommunication => vcomm}/LogSink.h | 0 .../vcommunication => vcomm}/NetworkSink.h | 0 include/visualizer/RootWindow.h | 34 ----------- include/visualizer/communication/DataSource.h | 45 --------------- include/visualizer/communication/LogSource.h | 40 ------------- include/visualizer/communication/NetworkSource.h | 38 ------------- include/visualizer/storage/MemoryPool.h | 35 ------------ include/visualizer/storage/MemoryPoolEntry.h | 27 --------- include/visualizer/storage/MemoryPoolItem.h | 26 --------- include/visualizer/storage/RTree.h | 66 ---------------------- include/visualizer/visualization/AbstractObject.h | 28 --------- .../visualization/AbstractRangeMatcher.h | 30 ---------- .../visualization/AbstractVisualization.h | 28 --------- include/visualizer/visualization/Viewport.h | 29 ---------- src/config/.srcdir | 0 src/config/SConscript | 3 + src/informer/.srcdir | 0 src/informer/SConscript | 2 +- src/informer/{collector => }/informer.c | 0 src/monitor/.srcdir | 0 src/shm/SConscript | 5 ++ src/{monitor/program => shm/read}/SharedMemory.cpp | 0 src/{monitor/program => shm/read}/ZoneReader.cpp | 0 src/storage/.srcdir | 0 src/storage/SConscript | 3 + .../vcommunication/GeneralSink.cpp | 0 src/{monitor => vcomm}/vcommunication/LogSink.cpp | 0 .../vcommunication/NetworkSink.cpp | 0 src/visualizer/.srcdir | 0 src/visualizer/Aesalon.cpp | 20 ------- src/visualizer/RootWindow.cpp | 58 ------------------- src/visualizer/SConscript | 35 ------------ src/visualizer/communication/DataSource.cpp | 20 ------- src/visualizer/communication/LogSource.cpp | 47 --------------- src/visualizer/communication/NetworkSource.cpp | 35 ------------ src/visualizer/data | 1 - src/visualizer/resources.qrc | 6 -- src/visualizer/storage/MemoryPool.cpp | 20 ------- src/visualizer/storage/MemoryPoolEntry.cpp | 20 ------- src/visualizer/storage/MemoryPoolItem.cpp | 20 ------- src/visualizer/storage/RTree.cpp | 27 --------- src/visualizer/visualization/AbstractObject.cpp | 20 ------- .../visualization/AbstractRangeMatcher.cpp | 20 ------- .../visualization/AbstractVisualization.cpp | 20 ------- src/visualizer/visualization/Viewport.cpp | 26 --------- 54 files changed, 13 insertions(+), 822 deletions(-) rename include/{monitor => }/config/ArgumentParser.h (100%) rename include/{monitor => }/config/ConcreteVault.h (100%) rename include/{monitor => }/config/Parser.h (100%) rename include/{monitor => }/config/Vault.h (100%) rename include/{monitor/program => shm}/SharedMemory.h (100%) rename include/{monitor/program => shm}/ZoneReader.h (100%) rename include/{monitor/vcommunication => vcomm}/DataSink.h (100%) rename include/{monitor/vcommunication => vcomm}/GeneralSink.h (100%) rename include/{monitor/vcommunication => vcomm}/LogSink.h (100%) rename include/{monitor/vcommunication => vcomm}/NetworkSink.h (100%) delete mode 100644 include/visualizer/RootWindow.h delete mode 100644 include/visualizer/communication/DataSource.h delete mode 100644 include/visualizer/communication/LogSource.h delete mode 100644 include/visualizer/communication/NetworkSource.h delete mode 100644 include/visualizer/storage/MemoryPool.h delete mode 100644 include/visualizer/storage/MemoryPoolEntry.h delete mode 100644 include/visualizer/storage/MemoryPoolItem.h delete mode 100644 include/visualizer/storage/RTree.h delete mode 100644 include/visualizer/visualization/AbstractObject.h delete mode 100644 include/visualizer/visualization/AbstractRangeMatcher.h delete mode 100644 include/visualizer/visualization/AbstractVisualization.h delete mode 100644 include/visualizer/visualization/Viewport.h delete mode 100644 src/config/.srcdir create mode 100644 src/config/SConscript delete mode 100644 src/informer/.srcdir rename src/informer/{collector => }/informer.c (100%) delete mode 100644 src/monitor/.srcdir create mode 100644 src/shm/SConscript rename src/{monitor/program => shm/read}/SharedMemory.cpp (100%) rename src/{monitor/program => shm/read}/ZoneReader.cpp (100%) delete mode 100644 src/storage/.srcdir create mode 100644 src/storage/SConscript rename src/{monitor => vcomm}/vcommunication/GeneralSink.cpp (100%) rename src/{monitor => vcomm}/vcommunication/LogSink.cpp (100%) rename src/{monitor => vcomm}/vcommunication/NetworkSink.cpp (100%) delete mode 100644 src/visualizer/.srcdir delete mode 100644 src/visualizer/Aesalon.cpp delete mode 100644 src/visualizer/RootWindow.cpp delete mode 100644 src/visualizer/SConscript delete mode 100644 src/visualizer/communication/DataSource.cpp delete mode 100644 src/visualizer/communication/LogSource.cpp delete mode 100644 src/visualizer/communication/NetworkSource.cpp delete mode 120000 src/visualizer/data delete mode 100644 src/visualizer/resources.qrc delete mode 100644 src/visualizer/storage/MemoryPool.cpp delete mode 100644 src/visualizer/storage/MemoryPoolEntry.cpp delete mode 100644 src/visualizer/storage/MemoryPoolItem.cpp delete mode 100644 src/visualizer/storage/RTree.cpp delete mode 100644 src/visualizer/visualization/AbstractObject.cpp delete mode 100644 src/visualizer/visualization/AbstractRangeMatcher.cpp delete mode 100644 src/visualizer/visualization/AbstractVisualization.cpp delete mode 100644 src/visualizer/visualization/Viewport.cpp diff --git a/SConstruct b/SConstruct index 7ab3c7c..0ab06fb 100644 --- a/SConstruct +++ b/SConstruct @@ -57,6 +57,7 @@ cwd = subprocess.Popen("pwd", stdout=subprocess.PIPE).stdout.read().strip() env.Append(projectRoot = cwd) env.Append(CPPPATH = [cwd + "/include/"]) env.Append(includeRoot = cwd + "/include/") +env.Append(CCFLAGS = ["-W", "-Wall", "-g"]) Export('env') diff --git a/include/monitor/config/ArgumentParser.h b/include/config/ArgumentParser.h similarity index 100% rename from include/monitor/config/ArgumentParser.h rename to include/config/ArgumentParser.h diff --git a/include/monitor/config/ConcreteVault.h b/include/config/ConcreteVault.h similarity index 100% rename from include/monitor/config/ConcreteVault.h rename to include/config/ConcreteVault.h diff --git a/include/monitor/config/Parser.h b/include/config/Parser.h similarity index 100% rename from include/monitor/config/Parser.h rename to include/config/Parser.h diff --git a/include/monitor/config/Vault.h b/include/config/Vault.h similarity index 100% rename from include/monitor/config/Vault.h rename to include/config/Vault.h diff --git a/include/monitor/program/SharedMemory.h b/include/shm/SharedMemory.h similarity index 100% rename from include/monitor/program/SharedMemory.h rename to include/shm/SharedMemory.h diff --git a/include/monitor/program/ZoneReader.h b/include/shm/ZoneReader.h similarity index 100% rename from include/monitor/program/ZoneReader.h rename to include/shm/ZoneReader.h diff --git a/include/monitor/vcommunication/DataSink.h b/include/vcomm/DataSink.h similarity index 100% rename from include/monitor/vcommunication/DataSink.h rename to include/vcomm/DataSink.h diff --git a/include/monitor/vcommunication/GeneralSink.h b/include/vcomm/GeneralSink.h similarity index 100% rename from include/monitor/vcommunication/GeneralSink.h rename to include/vcomm/GeneralSink.h diff --git a/include/monitor/vcommunication/LogSink.h b/include/vcomm/LogSink.h similarity index 100% rename from include/monitor/vcommunication/LogSink.h rename to include/vcomm/LogSink.h diff --git a/include/monitor/vcommunication/NetworkSink.h b/include/vcomm/NetworkSink.h similarity index 100% rename from include/monitor/vcommunication/NetworkSink.h rename to include/vcomm/NetworkSink.h diff --git a/include/visualizer/RootWindow.h b/include/visualizer/RootWindow.h deleted file mode 100644 index 2f5dfe7..0000000 --- a/include/visualizer/RootWindow.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file include/visualizer//RootWindow.h - -*/ - -#ifndef AesalonVisualizer_RootWindow_H -#define AesalonVisualizer_RootWindow_H - -#include -#include - -namespace Visualizer { - -class RootWindow : public QMainWindow { Q_OBJECT -private: - QMdiArea *m_mdiArea; -public: - RootWindow(); - virtual ~RootWindow(); -private: - void initialSetup(); -private slots: - void newRootWindow(); -}; - -} // namespace Visualizer - -#endif diff --git a/include/visualizer/communication/DataSource.h b/include/visualizer/communication/DataSource.h deleted file mode 100644 index 14e59b4..0000000 --- a/include/visualizer/communication/DataSource.h +++ /dev/null @@ -1,45 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file include/visualizer/communication/DataSource.h - -*/ - -#ifndef AesalonVisualizer_Communication_DataSource_H -#define AesalonVisualizer_Communication_DataSource_H - -#include "common/VPacket.h" - -namespace Visualizer { -namespace Communication { - -/** Represents a single source of collected data. - This class's implementations may not be thread-safe, and should only be - used from a single thread concurrently. -*/ -class DataSource { -public: - virtual ~DataSource() {} - - /** Attempts to open the data source. May take some time -- network - timeouts may be involved. - @return True if the data source was opened successfully. - */ - virtual bool open() = 0; - - /** Returns the next available packet. This function may block. - @return The next packet, or NULL if there are no more packets - forthcoming (e.g. the socket has closed, EOF, etc.) - This packet should NOT be freed by the caller. - */ - virtual Common::VPacket *nextPacket() = 0; -}; - -} // namespace Communication -} // namespace Visualizer - -#endif diff --git a/include/visualizer/communication/LogSource.h b/include/visualizer/communication/LogSource.h deleted file mode 100644 index e29b94b..0000000 --- a/include/visualizer/communication/LogSource.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file include/visualizer/communication/LogSource.h - -*/ - -#ifndef AesalonVisualizer_Communication_LogSource_H -#define AesalonVisualizer_Communication_LogSource_H - -#include -#include - -#include "DataSource.h" - -namespace Visualizer { -namespace Communication { - -class LogSource : public DataSource { -private: - QFile *m_file; - QByteArray m_data; - Common::VPacket m_packet; -public: - LogSource(const QString &filename); - virtual ~LogSource(); - - virtual bool open(); - - virtual Common::VPacket *nextPacket(); -}; - -} // namespace Communication -} // namespace Visualizer - -#endif diff --git a/include/visualizer/communication/NetworkSource.h b/include/visualizer/communication/NetworkSource.h deleted file mode 100644 index 0060f2f..0000000 --- a/include/visualizer/communication/NetworkSource.h +++ /dev/null @@ -1,38 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file include/visualizer/communication/NetworkSource.h - -*/ - -#ifndef AesalonVisualizer_Communication_NetworkSource_H -#define AesalonVisualizer_Communication_NetworkSource_H - -#include -#include - -#include "DataSource.h" - -namespace Visualizer { -namespace Communication { - -class NetworkSource : public DataSource { -private: - QTcpSocket *m_socket; -public: - NetworkSource(const QString &hostname, quint16 port); - virtual ~NetworkSource(); - - virtual bool open(); - - virtual Common::VPacket *nextPacket(); -}; - -} // namespace Communication -} // namespace Visualizer - -#endif diff --git a/include/visualizer/storage/MemoryPool.h b/include/visualizer/storage/MemoryPool.h deleted file mode 100644 index 86e9fe8..0000000 --- a/include/visualizer/storage/MemoryPool.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file include/visualizer/storage/MemoryPool.h - -*/ - -#ifndef AesalonVisualizer_Storage_MemoryPool_H -#define AesalonVisualizer_Storage_MemoryPool_H - -#include - -namespace Visualizer { -namespace Storage { - -class MemoryPool { -private: - typedef std::list PoolList; - PoolList m_poolList; -public: - MemoryPool(); - ~MemoryPool(); - - template - Type *allocate(); -}; - -} // namespace Storage -} // namespace Visualizer - -#endif diff --git a/include/visualizer/storage/MemoryPoolEntry.h b/include/visualizer/storage/MemoryPoolEntry.h deleted file mode 100644 index 2fe3a91..0000000 --- a/include/visualizer/storage/MemoryPoolEntry.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file include/visualizer/storage/MemoryPoolEntry.h - -*/ - -#ifndef AesalonVisualizer_Storage_MemoryPoolEntry_H -#define AesalonVisualizer_Storage_MemoryPoolEntry_H - -namespace Visualizer { -namespace Storage { - -class MemoryPoolEntry { -public: - MemoryPoolEntry(); - ~MemoryPoolEntry(); -}; - -} // namespace Storage -} // namespace Visualizer - -#endif diff --git a/include/visualizer/storage/MemoryPoolItem.h b/include/visualizer/storage/MemoryPoolItem.h deleted file mode 100644 index f6ff0c5..0000000 --- a/include/visualizer/storage/MemoryPoolItem.h +++ /dev/null @@ -1,26 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file include/visualizer/storage/MemoryPoolItem.h - -*/ - -#ifndef AesalonVisualizer_Storage_MemoryPoolItem_H -#define AesalonVisualizer_Storage_MemoryPoolItem_H - -namespace Visualizer { -namespace Storage { - -class MemoryPoolItem { -public: - virtual ~MemoryPoolItem() {} -}; - -} // namespace Storage -} // namespace Visualizer - -#endif diff --git a/include/visualizer/storage/RTree.h b/include/visualizer/storage/RTree.h deleted file mode 100644 index adebd35..0000000 --- a/include/visualizer/storage/RTree.h +++ /dev/null @@ -1,66 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file include/visualizer/storage/RTree.h - -*/ - -#ifndef AesalonVisualizer_Storage_RTree_H -#define AesalonVisualizer_Storage_RTree_H - -namespace Visualizer { -namespace Storage { - -template -class RTree { -public: - class Range { - private: - RangeType m_from; - RangeType m_to; - public: - Range(RangeType from, RangeType to) : m_from(from), m_to(to) {} - - RangeType from() const { return m_from; } - RangeType to() const { return m_to; } - }; - - class Bound { - private: - Range m_range[Dimensions]; - public: - Bound(Range ranges[Dimensions]) { - for(int i = 0; i < Dimensions; i ++) { - m_range[i] = ranges[i]; - } - } - - void setRange(int dimension, Range newRange) { - m_range[dimension] = newRange; - } - const Range &range(int dimension) const { - return m_range[dimension]; - } - }; -protected: - class Node { - private: - Bound m_bound; - public: - - }; -private: - -public: - RTree(); - ~RTree(); -}; - -} // namespace Storage -} // namespace Visualizer - -#endif diff --git a/include/visualizer/visualization/AbstractObject.h b/include/visualizer/visualization/AbstractObject.h deleted file mode 100644 index 89ed5df..0000000 --- a/include/visualizer/visualization/AbstractObject.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file include/visualizer/visualization/AbstractObject.h - -*/ - -#ifndef AesalonVisualizer_Visualization_AbstractObject_H -#define AesalonVisualizer_Visualization_AbstractObject_H - -namespace Visualizer { -namespace Visualization { - -class AbstractObject { -public: - virtual ~AbstractObject() {} - - virtual void paint() = 0; -}; - -} // namespace Visualization -} // namespace Visualizer - -#endif diff --git a/include/visualizer/visualization/AbstractRangeMatcher.h b/include/visualizer/visualization/AbstractRangeMatcher.h deleted file mode 100644 index e7bc465..0000000 --- a/include/visualizer/visualization/AbstractRangeMatcher.h +++ /dev/null @@ -1,30 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file include/visualizer/visualization/AbstractRangeMatcher.h - -*/ - -#ifndef AesalonVisualizer_Visualization_AbstractRangeMatcher_H -#define AesalonVisualizer_Visualization_AbstractRangeMatcher_H - -#include "AbstractObject.h" - -namespace Visualizer { -namespace Visualization { - -class AbstractRangeMatcher { -public: - virtual ~AbstractRangeMatcher() {} - - virtual bool matches(AbstractObject *object) = 0; -}; - -} // namespace Visualization -} // namespace Visualizer - -#endif diff --git a/include/visualizer/visualization/AbstractVisualization.h b/include/visualizer/visualization/AbstractVisualization.h deleted file mode 100644 index 5747d06..0000000 --- a/include/visualizer/visualization/AbstractVisualization.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file include/visualizer/visualization/AbstractVisualization.h - -*/ - -#ifndef AesalonVisualizer_Visualization_AbstractVisualization_H -#define AesalonVisualizer_Visualization_AbstractVisualization_H - -namespace Visualizer { -namespace Visualization { - -class AbstractVisualization { -public: - virtual ~AbstractVisualization() {} - - virtual void objects(); -}; - -} // namespace Visualization -} // namespace Visualizer - -#endif diff --git a/include/visualizer/visualization/Viewport.h b/include/visualizer/visualization/Viewport.h deleted file mode 100644 index 956e115..0000000 --- a/include/visualizer/visualization/Viewport.h +++ /dev/null @@ -1,29 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file include/visualizer/visualization/Viewport.h - -*/ - -#include - -#ifndef AesalonVisualizer_Visualization_Viewport_H -#define AesalonVisualizer_Visualization_Viewport_H - -namespace Visualizer { -namespace Visualization { - -class Viewport : public QMdiSubWindow { Q_OBJECT -public: - Viewport(); - ~Viewport(); -}; - -} // namespace Visualization -} // namespace Visualizer - -#endif diff --git a/src/config/.srcdir b/src/config/.srcdir deleted file mode 100644 index e69de29..0000000 diff --git a/src/config/SConscript b/src/config/SConscript new file mode 100644 index 0000000..5ece0e2 --- /dev/null +++ b/src/config/SConscript @@ -0,0 +1,3 @@ +Import("env") + +env.StaticLibrary(target = "config", source = Glob("*.cpp") + Glob("*/*.cpp")) diff --git a/src/informer/.srcdir b/src/informer/.srcdir deleted file mode 100644 index e69de29..0000000 diff --git a/src/informer/SConscript b/src/informer/SConscript index 8fb94af..f0e1f42 100644 --- a/src/informer/SConscript +++ b/src/informer/SConscript @@ -3,5 +3,5 @@ Import("env") env.Append(CCFLAGS = ["-W", "-Wall", "-D_GNU_SOURCE"]) env.Append(LIBS = ["rt", "dl"]) -env.SharedLibrary(target="collector", source=Glob("collector/*.c")) +env.SharedLibrary(target="collector", source=Glob("*.c")) diff --git a/src/informer/collector/informer.c b/src/informer/informer.c similarity index 100% rename from src/informer/collector/informer.c rename to src/informer/informer.c diff --git a/src/monitor/.srcdir b/src/monitor/.srcdir deleted file mode 100644 index e69de29..0000000 diff --git a/src/shm/SConscript b/src/shm/SConscript new file mode 100644 index 0000000..2ecbfc0 --- /dev/null +++ b/src/shm/SConscript @@ -0,0 +1,5 @@ +Import("env") + +env.StaticLibrary(target = "shm-read", source = Glob("read/*.cpp")) +env.StaticLibrary(target = "shm-write", source = Glob("write/*.c")) + diff --git a/src/monitor/program/SharedMemory.cpp b/src/shm/read/SharedMemory.cpp similarity index 100% rename from src/monitor/program/SharedMemory.cpp rename to src/shm/read/SharedMemory.cpp diff --git a/src/monitor/program/ZoneReader.cpp b/src/shm/read/ZoneReader.cpp similarity index 100% rename from src/monitor/program/ZoneReader.cpp rename to src/shm/read/ZoneReader.cpp diff --git a/src/storage/.srcdir b/src/storage/.srcdir deleted file mode 100644 index e69de29..0000000 diff --git a/src/storage/SConscript b/src/storage/SConscript new file mode 100644 index 0000000..c7e7edc --- /dev/null +++ b/src/storage/SConscript @@ -0,0 +1,3 @@ +Import("env") + +env.StaticLibrary(target = "storage", source = Glob("*.cpp") + Glob("*/*.cpp")) diff --git a/src/monitor/vcommunication/GeneralSink.cpp b/src/vcomm/vcommunication/GeneralSink.cpp similarity index 100% rename from src/monitor/vcommunication/GeneralSink.cpp rename to src/vcomm/vcommunication/GeneralSink.cpp diff --git a/src/monitor/vcommunication/LogSink.cpp b/src/vcomm/vcommunication/LogSink.cpp similarity index 100% rename from src/monitor/vcommunication/LogSink.cpp rename to src/vcomm/vcommunication/LogSink.cpp diff --git a/src/monitor/vcommunication/NetworkSink.cpp b/src/vcomm/vcommunication/NetworkSink.cpp similarity index 100% rename from src/monitor/vcommunication/NetworkSink.cpp rename to src/vcomm/vcommunication/NetworkSink.cpp diff --git a/src/visualizer/.srcdir b/src/visualizer/.srcdir deleted file mode 100644 index e69de29..0000000 diff --git a/src/visualizer/Aesalon.cpp b/src/visualizer/Aesalon.cpp deleted file mode 100644 index 524ffab..0000000 --- a/src/visualizer/Aesalon.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#include - -#include "RootWindow.h" - -#include "common/Config.h" - -int main(int argc, char *argv[]) { - QApplication app(argc, argv); - - QCoreApplication::setApplicationName("visualizer"); - QCoreApplication::setOrganizationName("aesalon"); - QCoreApplication::setApplicationVersion(AesalonVersion); - - Visualizer::RootWindow rw; - rw.show(); - - return app.exec(); -} diff --git a/src/visualizer/RootWindow.cpp b/src/visualizer/RootWindow.cpp deleted file mode 100644 index 25ca10c..0000000 --- a/src/visualizer/RootWindow.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file visualizer/src//RootWindow.cpp - -*/ - -#include "RootWindow.h" -#include -#include -#include - -namespace Visualizer { - -RootWindow::RootWindow() { - initialSetup(); -} - -RootWindow::~RootWindow() { - -} - -void RootWindow::initialSetup() { - /* Basic geometry . . . */ - setMinimumWidth(600); - setMinimumHeight(400); - - /* Icon . . . */ - setWindowIcon(QIcon(":/icon.png")); - - /* Menus . . . */ - QMenu *menu = NULL; - QAction *action = NULL; - - menu = menuBar()->addMenu(tr("&Aesalon")); - action = menu->addAction( - style()->standardIcon(QStyle::SP_FileDialogNewFolder), - tr("&New")); - connect(action, SIGNAL(triggered(bool)), SLOT(newRootWindow())); - action = menu->addAction( - style()->standardIcon(QStyle::SP_DialogCloseButton), - tr("&Close")); - connect(action, SIGNAL(triggered(bool)), SLOT(close())); - - m_mdiArea = new QMdiArea(this); - setCentralWidget(m_mdiArea); -} - -void RootWindow::newRootWindow() { - RootWindow *rw = new RootWindow(); - rw->show(); -} - -} // namespace Visualizer diff --git a/src/visualizer/SConscript b/src/visualizer/SConscript deleted file mode 100644 index af05f6a..0000000 --- a/src/visualizer/SConscript +++ /dev/null @@ -1,35 +0,0 @@ -import sys -import subprocess - -Import("qtEnv") - -env = qtEnv - -projectRoot = env.Dictionary()["projectRoot"] + "/" - -env.Replace(QT4_MOCHSUFFIX = ".cpp") -env.Replace(QT4_MOCHPREFIX = projectRoot + "visualizer/build/moc_") -env.Replace(QT4_QRCCXXPREFIX = projectRoot + "visualizer/build/qrc_") - -automocPath = [ - projectRoot + "visualizer/src/", - projectRoot + "include/visualizer/"] - -dirType = type(Dir(".")) - -for item in Glob(projectRoot + "visualizer/src/*") + Glob(projectRoot + "include/visualizer/*"): - if type(item) == dirType: - automocPath += [str(item)] - -env.Replace(QT4_AUTOMOC_CPPPATH = automocPath) - -env.EnableQt4Modules(["QtCore", "QtGui", "QtNetwork"]) - -visualizerIncludePath = env.Dictionary()["includeRoot"] + "/visualizer" - -env.Append(CPPPATH = [visualizerIncludePath]) -env.Append(CCFLAGS = ["-W", "-Wall", "-g", "-DAesalonVisualizer"]) - -sourceFiles = Glob("*.cpp", strings=True) + Glob("*/*.cpp", strings=True) + Glob("*.qrc", strings=True) - -env.Program(target = "aesalon_visualizer", source = sourceFiles) diff --git a/src/visualizer/communication/DataSource.cpp b/src/visualizer/communication/DataSource.cpp deleted file mode 100644 index 1aef2ce..0000000 --- a/src/visualizer/communication/DataSource.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file visualizer/src/communication/DataSource.cpp - -*/ - -#include "communication/DataSource.h" - -namespace Visualizer { -namespace Communication { - - - -} // namespace Communication -} // namespace Visualizer diff --git a/src/visualizer/communication/LogSource.cpp b/src/visualizer/communication/LogSource.cpp deleted file mode 100644 index 4b28603..0000000 --- a/src/visualizer/communication/LogSource.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file visualizer/src/communication/LogSource.cpp - -*/ - -#include "communication/LogSource.h" - -namespace Visualizer { -namespace Communication { - -LogSource::LogSource(const QString &filename) : m_packet(0, 0, 0, NULL, 0) { - m_file = new QFile(filename); -} - -LogSource::~LogSource() { - m_file->close(); -} - -bool LogSource::open() { - return m_file->open(QIODevice::ReadOnly); -} - -Common::VPacket *LogSource::nextPacket() { - ModuleID moduleID; - uint32_t pid, tid, dataSize; - - m_data = m_file->read(sizeof(moduleID) + sizeof(pid)*3); - moduleID = *reinterpret_cast(m_data.data()); - pid = *reinterpret_cast(m_data.data() + sizeof(moduleID)); - tid = *reinterpret_cast(m_data.data() + sizeof(moduleID) + sizeof(pid)); - dataSize = *reinterpret_cast(m_data.data() + sizeof(moduleID) + sizeof(pid)*2); - - m_data = m_file->read(dataSize); - - m_packet = Common::VPacket(pid, tid, moduleID, m_data.data(), dataSize); - - return &m_packet; -} - -} // namespace Communication -} // namespace Visualizer diff --git a/src/visualizer/communication/NetworkSource.cpp b/src/visualizer/communication/NetworkSource.cpp deleted file mode 100644 index 36d2848..0000000 --- a/src/visualizer/communication/NetworkSource.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file visualizer/src/communication/NetworkSource.cpp - -*/ - -#include "communication/NetworkSource.h" - -namespace Visualizer { -namespace Communication { - -NetworkSource::NetworkSource(const QString &hostname, quint16 port) { - m_socket = new QTcpSocket(); - m_socket->connectToHost(hostname, port); -} - -NetworkSource::~NetworkSource() { - -} - -bool NetworkSource::open() { - return m_socket->waitForConnected(30000); -} - -Common::VPacket *NetworkSource::nextPacket() { - return NULL; -} - -} // namespace Communication -} // namespace Visualizer diff --git a/src/visualizer/data b/src/visualizer/data deleted file mode 120000 index eed2d0b..0000000 --- a/src/visualizer/data +++ /dev/null @@ -1 +0,0 @@ -../data/ \ No newline at end of file diff --git a/src/visualizer/resources.qrc b/src/visualizer/resources.qrc deleted file mode 100644 index 53a102f..0000000 --- a/src/visualizer/resources.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - -data/aesalon-icon-96x96.png - - - diff --git a/src/visualizer/storage/MemoryPool.cpp b/src/visualizer/storage/MemoryPool.cpp deleted file mode 100644 index 2ba3022..0000000 --- a/src/visualizer/storage/MemoryPool.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file visualizer/src/storage/MemoryPool.cpp - -*/ - -#include "storage/MemoryPool.h" - -namespace Visualizer { -namespace Storage { - - - -} // namespace Storage -} // namespace Visualizer diff --git a/src/visualizer/storage/MemoryPoolEntry.cpp b/src/visualizer/storage/MemoryPoolEntry.cpp deleted file mode 100644 index 7415e8f..0000000 --- a/src/visualizer/storage/MemoryPoolEntry.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file visualizer/src/storage/MemoryPoolEntry.cpp - -*/ - -#include "storage/MemoryPoolEntry.h" - -namespace Visualizer { -namespace Storage { - - - -} // namespace Storage -} // namespace Visualizer diff --git a/src/visualizer/storage/MemoryPoolItem.cpp b/src/visualizer/storage/MemoryPoolItem.cpp deleted file mode 100644 index de8e4a7..0000000 --- a/src/visualizer/storage/MemoryPoolItem.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file visualizer/src/storage/MemoryPoolItem.cpp - -*/ - -#include "storage/MemoryPoolItem.h" - -namespace Visualizer { -namespace Storage { - - - -} // namespace Storage -} // namespace Visualizer diff --git a/src/visualizer/storage/RTree.cpp b/src/visualizer/storage/RTree.cpp deleted file mode 100644 index ecf318a..0000000 --- a/src/visualizer/storage/RTree.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file visualizer/src/storage/RTree.cpp - -*/ - -#include "storage/RTree.h" - -namespace Visualizer { -namespace Storage { - -/*template -const typename RTree::Range & - RTree::Bound::range(int dimension) const { - - -}*/ - - - -} // namespace Storage -} // namespace Visualizer diff --git a/src/visualizer/visualization/AbstractObject.cpp b/src/visualizer/visualization/AbstractObject.cpp deleted file mode 100644 index 1ad163a..0000000 --- a/src/visualizer/visualization/AbstractObject.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file visualizer/src/visualization/AbstractObject.cpp - -*/ - -#include "visualization/AbstractObject.h" - -namespace Visualizer { -namespace Visualization { - - - -} // namespace Visualization -} // namespace Visualizer diff --git a/src/visualizer/visualization/AbstractRangeMatcher.cpp b/src/visualizer/visualization/AbstractRangeMatcher.cpp deleted file mode 100644 index ee015f4..0000000 --- a/src/visualizer/visualization/AbstractRangeMatcher.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file visualizer/src/visualization/AbstractRangeMatcher.cpp - -*/ - -#include "visualization/AbstractRangeMatcher.h" - -namespace Visualizer { -namespace Visualization { - - - -} // namespace Visualization -} // namespace Visualizer diff --git a/src/visualizer/visualization/AbstractVisualization.cpp b/src/visualizer/visualization/AbstractVisualization.cpp deleted file mode 100644 index 04a5447..0000000 --- a/src/visualizer/visualization/AbstractVisualization.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file visualizer/src/visualization/AbstractVisualization.cpp - -*/ - -#include "visualization/AbstractVisualization.h" - -namespace Visualizer { -namespace Visualization { - - - -} // namespace Visualization -} // namespace Visualizer diff --git a/src/visualizer/visualization/Viewport.cpp b/src/visualizer/visualization/Viewport.cpp deleted file mode 100644 index debb220..0000000 --- a/src/visualizer/visualization/Viewport.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/** - Aesalon, a tool to visualize a program's behaviour at run-time. - Copyright (C) 2010, Aesalon Development Team. - - Aesalon is distributed under the terms of the GNU GPLv3. For more - licensing information, see the file LICENSE included with the distribution. - - @file visualizer/src/visualization/Viewport.cpp - -*/ - -#include "visualization/Viewport.h" - -namespace Visualizer { -namespace Visualization { - -Viewport::Viewport() { - -} - -Viewport::~Viewport() { - -} - -} // namespace Visualization -} // namespace Visualizer -- 2.11.4.GIT