From d46696e39eecf1548b5871dff0015c1b0aad491c Mon Sep 17 00:00:00 2001 From: Ethereal Date: Sat, 19 Feb 2011 15:40:47 -0700 Subject: [PATCH] Began refactoring the entire source tree. --- .gitignore | 1 + SConstruct | 5 +- aesalon | 1 - aesalon_visualizer | 1 - build/SConscript | 4 +- {visualizer/data => data}/aesalon-icon-96x96.png | Bin include/.gitignore | 2 + include/storage/RTree.h | 26 ++ monitor/.gitignore | 1 - monitor/SConscript | 1 - newsource.pl | 144 ----------- newsource.py | 265 +++++++++++++++++++++ src/SConscript | 4 + src/config/.srcdir | 0 {monitor/src => src}/config/ArgumentParser.cpp | 0 {monitor/src => src}/config/ConcreteVault.cpp | 0 {monitor/src => src}/config/Parser.cpp | 0 {monitor/src => src}/config/Vault.cpp | 0 src/informer/.srcdir | 0 {modules/informer/src => src/informer}/SConscript | 0 .../src => src/informer}/collector/informer.c | 0 src/monitor/.srcdir | 0 {monitor/src => src/monitor}/Aesalon.cpp | 0 {monitor/src => src/monitor}/Coordinator.cpp | 0 {monitor/src => src/monitor}/SConscript | 3 - .../src => src/monitor}/analyzer/ElfAnalyzer.cpp | 0 .../monitor}/analyzer/ExecutableAnalyzer.cpp | 0 {monitor/src => src/monitor}/module/List.cpp | 0 {monitor/src => src/monitor}/module/Loader.cpp | 0 {monitor/src => src/monitor}/module/Module.cpp | 0 {monitor/src => src/monitor}/program/Conductor.cpp | 0 {monitor/src => src/monitor}/program/Launcher.cpp | 0 .../src => src/monitor}/program/SharedMemory.cpp | 0 .../src => src/monitor}/program/ZoneReader.cpp | 0 .../monitor}/vcommunication/GeneralSink.cpp | 0 .../src => src/monitor}/vcommunication/LogSink.cpp | 0 .../monitor}/vcommunication/NetworkSink.cpp | 0 src/storage/.srcdir | 0 src/storage/RTree.cpp | 13 + src/visualizer/.srcdir | 0 {visualizer/src => src/visualizer}/Aesalon.cpp | 0 {visualizer/src => src/visualizer}/RootWindow.cpp | 0 {visualizer/src => src/visualizer}/SConscript | 0 .../visualizer}/communication/DataSource.cpp | 0 .../visualizer}/communication/LogSource.cpp | 0 .../visualizer}/communication/NetworkSource.cpp | 0 {visualizer/src => src/visualizer}/data | 0 {visualizer/src => src/visualizer}/resources.qrc | 0 .../src => src/visualizer}/storage/MemoryPool.cpp | 0 .../visualizer}/storage/MemoryPoolEntry.cpp | 0 .../visualizer}/storage/MemoryPoolItem.cpp | 0 .../src => src/visualizer}/storage/RTree.cpp | 0 .../visualizer}/visualization/AbstractObject.cpp | 0 .../visualization/AbstractRangeMatcher.cpp | 0 .../visualization/AbstractVisualization.cpp | 0 .../visualizer}/visualization/Viewport.cpp | 0 visualizer/.gitignore | 1 - visualizer/SConscript | 1 - 58 files changed, 314 insertions(+), 159 deletions(-) delete mode 120000 aesalon delete mode 120000 aesalon_visualizer rename {visualizer/data => data}/aesalon-icon-96x96.png (100%) create mode 100644 include/.gitignore create mode 100644 include/storage/RTree.h delete mode 100644 monitor/.gitignore delete mode 100644 monitor/SConscript delete mode 100755 newsource.pl create mode 100755 newsource.py create mode 100644 src/SConscript create mode 100644 src/config/.srcdir rename {monitor/src => src}/config/ArgumentParser.cpp (100%) rename {monitor/src => src}/config/ConcreteVault.cpp (100%) rename {monitor/src => src}/config/Parser.cpp (100%) rename {monitor/src => src}/config/Vault.cpp (100%) create mode 100644 src/informer/.srcdir rename {modules/informer/src => src/informer}/SConscript (100%) rename {modules/informer/src => src/informer}/collector/informer.c (100%) create mode 100644 src/monitor/.srcdir rename {monitor/src => src/monitor}/Aesalon.cpp (100%) rename {monitor/src => src/monitor}/Coordinator.cpp (100%) rename {monitor/src => src/monitor}/SConscript (62%) rename {monitor/src => src/monitor}/analyzer/ElfAnalyzer.cpp (100%) rename {monitor/src => src/monitor}/analyzer/ExecutableAnalyzer.cpp (100%) rename {monitor/src => src/monitor}/module/List.cpp (100%) rename {monitor/src => src/monitor}/module/Loader.cpp (100%) rename {monitor/src => src/monitor}/module/Module.cpp (100%) rename {monitor/src => src/monitor}/program/Conductor.cpp (100%) rename {monitor/src => src/monitor}/program/Launcher.cpp (100%) rename {monitor/src => src/monitor}/program/SharedMemory.cpp (100%) rename {monitor/src => src/monitor}/program/ZoneReader.cpp (100%) rename {monitor/src => src/monitor}/vcommunication/GeneralSink.cpp (100%) rename {monitor/src => src/monitor}/vcommunication/LogSink.cpp (100%) rename {monitor/src => src/monitor}/vcommunication/NetworkSink.cpp (100%) create mode 100644 src/storage/.srcdir create mode 100644 src/storage/RTree.cpp create mode 100644 src/visualizer/.srcdir rename {visualizer/src => src/visualizer}/Aesalon.cpp (100%) rename {visualizer/src => src/visualizer}/RootWindow.cpp (100%) rename {visualizer/src => src/visualizer}/SConscript (100%) rename {visualizer/src => src/visualizer}/communication/DataSource.cpp (100%) rename {visualizer/src => src/visualizer}/communication/LogSource.cpp (100%) rename {visualizer/src => src/visualizer}/communication/NetworkSource.cpp (100%) rename {visualizer/src => src/visualizer}/data (100%) rename {visualizer/src => src/visualizer}/resources.qrc (100%) rename {visualizer/src => src/visualizer}/storage/MemoryPool.cpp (100%) rename {visualizer/src => src/visualizer}/storage/MemoryPoolEntry.cpp (100%) rename {visualizer/src => src/visualizer}/storage/MemoryPoolItem.cpp (100%) rename {visualizer/src => src/visualizer}/storage/RTree.cpp (100%) rename {visualizer/src => src/visualizer}/visualization/AbstractObject.cpp (100%) rename {visualizer/src => src/visualizer}/visualization/AbstractRangeMatcher.cpp (100%) rename {visualizer/src => src/visualizer}/visualization/AbstractVisualization.cpp (100%) rename {visualizer/src => src/visualizer}/visualization/Viewport.cpp (100%) delete mode 100644 visualizer/.gitignore delete mode 100644 visualizer/SConscript diff --git a/.gitignore b/.gitignore index 5996917..cb8ad7d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ vgcore.* # Buildsystem (scons) ignores .sconsign.dblite +.build # IDE (KDevelop 4) ignores *kdev* diff --git a/SConstruct b/SConstruct index 35bb287..7ab3c7c 100644 --- a/SConstruct +++ b/SConstruct @@ -67,7 +67,4 @@ qt4(qtEnv) Export("qtEnv") SConscript("build/SConscript") -SConscript("monitor/SConscript") -SConscript("modules/SConscript") -SConscript("tests/SConscript") -SConscript("visualizer/SConscript") +SConscript("src/SConscript", variant_dir=".build", duplicate=0) diff --git a/aesalon b/aesalon deleted file mode 120000 index c571103..0000000 --- a/aesalon +++ /dev/null @@ -1 +0,0 @@ -monitor/build/aesalon \ No newline at end of file diff --git a/aesalon_visualizer b/aesalon_visualizer deleted file mode 120000 index bb65070..0000000 --- a/aesalon_visualizer +++ /dev/null @@ -1 +0,0 @@ -visualizer/build/aesalon_visualizer \ No newline at end of file diff --git a/build/SConscript b/build/SConscript index 9b35a5e..6c7e4f9 100644 --- a/build/SConscript +++ b/build/SConscript @@ -21,6 +21,6 @@ config = file("config", "r") buildConfig = eval(config.read()) config.close() -createConfig("../include/common/Config.h", "templates/Config.h.in", buildConfig) +createConfig("../include/Config.h", "templates/Config.h.in", buildConfig) -generateConfig("../include/common/Config.h.auto") +generateConfig("../include/Config.h.auto") diff --git a/visualizer/data/aesalon-icon-96x96.png b/data/aesalon-icon-96x96.png similarity index 100% rename from visualizer/data/aesalon-icon-96x96.png rename to data/aesalon-icon-96x96.png diff --git a/include/.gitignore b/include/.gitignore new file mode 100644 index 0000000..9841695 --- /dev/null +++ b/include/.gitignore @@ -0,0 +1,2 @@ +Config.h +Config.h.auto diff --git a/include/storage/RTree.h b/include/storage/RTree.h new file mode 100644 index 0000000..464312b --- /dev/null +++ b/include/storage/RTree.h @@ -0,0 +1,26 @@ + +/** Aesalon, a tool to visualize program behaviour in real time. + Copyright (C) 2009-2011, Aesalon development team. + + Aesalon is distributed under the terms of the GNU GPLv3. See + the included file LICENSE for more information. + + @file include/storage/RTree.h +*/ + +#ifndef AesalonStorage_RTree_H +#define AesalonStorage_RTree_H + + +namespace Storage { + +class RTree { +public: + RTree(); + ~RTree(); +}; + +} // namespace Storage + +#endif + diff --git a/monitor/.gitignore b/monitor/.gitignore deleted file mode 100644 index 378eac2..0000000 --- a/monitor/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/monitor/SConscript b/monitor/SConscript deleted file mode 100644 index ad755cf..0000000 --- a/monitor/SConscript +++ /dev/null @@ -1 +0,0 @@ -SConscript("src/SConscript", variant_dir="build", duplicate=0) diff --git a/newsource.pl b/newsource.pl deleted file mode 100755 index 23edcc5..0000000 --- a/newsource.pl +++ /dev/null @@ -1,144 +0,0 @@ -#!/usr/bin/env perl - -sub openNamespace { - print FILE "namespace @_[1] {\n"; -} - -sub closeNamespace { - print FILE "} // namespace @_[1]\n"; -} - -sub classDefinition { - print FILE "class @_[1] {\n"; - print FILE "public:\n"; - print FILE "\t@_[1]();\n"; - print FILE "\t~@_[1]();\n"; - print FILE "};\n"; -} - -sub printCopyright { - # Copyright notice . . . - print FILE <$filename") or die("Can't open $filename . . ."); - - printCopyright($filename); - - # Inclusion guard . . . - #$guard = "Aesalon" . @_[3] . "_" . @_[1] . "_" . @_[2] . "_H"; - if(@_[1] ne "") { - $guard = "Aesalon@_[3]_@_[1]_@_[2]_H"; - } - else { - $guard = "Aesalon@_[3]_@_[2]_H"; - } - - # Remove duplicate . . . - #$guard =~ s/@_[1]@_[1]/@_[1]/e; - - print FILE "#ifndef $guard\n"; - print FILE "#define $guard\n\n"; - - openNamespace(FILE, @_[3]); - openNamespace(FILE, @_[1]) if @_[1] ne ""; - - print FILE "\n"; - - classDefinition(FILE, @_[2]); - - print FILE "\n"; - - closeNamespace(FILE, @_[1]) if @_[1] ne ""; - closeNamespace(FILE, @_[3]); - - print FILE "\n#endif\n"; - - close(FILE); -} - -sub createSource { - $filename = @_[0] . (lc @_[1]) . "/" . @_[2] . ".cpp\n"; - - open(FILE, ">$filename") or die("Can't open $filename . . ."); - - printCopyright($filename); - - if(@_[1] ne "") { - print FILE "#include \"" . (lc @_[1]) . "/@_[2].h\"\n\n"; - } - else { - print FILE "#include \"@_[2].h\"\n\n"; - } - - openNamespace(FILE, @_[3]); - openNamespace(FILE, @_[1]) if @_[1] ne ""; - - print FILE "\n\n\n"; - - closeNamespace(FILE, @_[1]) if @_[1] ne ""; - closeNamespace(FILE, @_[3]); - - close(FILE); -} - -sub extractNamespace { - if(!(@_[0] =~ m/(.+)\:\:(.+)/)) { return "", @_[0]; } - -# print "1: $1, 2: $2\n"; - - if($2 eq "") { return "", $1; } - return $1, $2 -} - -$argumentCount = $#ARGV + 1; - -if($argumentCount < 1) { - die("Not enough arguments given"); -} - -$mode = ""; - -# Parse mode . . . -if($argumentCount == 1) { - $mode = "common"; -} -else { - if(lc $ARGV[0] eq "monitor") { $mode = "monitor"; } - elsif(lc $ARGV[0] eq "visualizer") { $mode = "visualizer"; } - elsif(lc $ARGV[0] eq "common") { $mode = "common"; } - else { - die "Unknown mode"; - } -} - -if($mode eq "monitor") { - createHeader("include/monitor/", extractNamespace($ARGV[1]), "Monitor"); - createSource("monitor/src/", extractNamespace($ARGV[1]), "Monitor"); -} -elsif($mode eq "visualizer") { - createHeader("include/visualizer/", extractNamespace($ARGV[1]), "Visualizer"); - createSource("visualizer/src/", extractNamespace($ARGV[1]), "Visualizer"); -} -elsif($mode eq "common") { - createHeader("include/common", extractNamespace($ARGV[1]), "Common"); -} diff --git a/newsource.py b/newsource.py new file mode 100755 index 0000000..0db3a1d --- /dev/null +++ b/newsource.py @@ -0,0 +1,265 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import sys +import os +import string + +config = { + "project": "Aesalon", + "desc": "a tool to visualize program behaviour in real time", + "authors": "Aesalon development team", + "license": "GNU GPLv3", + "devyears": "2009-2011", + "website": "http://aesalon.berlios.de/", + "srcBase": "src", + "incBase": "include", + "guardBase": "Aesalon", + "fileHeader": +""" +/** %(project)s, %(desc)s. + Copyright (C) %(devyears)s, %(authors)s. + + %(project)s is distributed under the terms of the %(license)s. See + the included file LICENSE for more information. + + @file %(path)s +*/ +""", + "cHeader": +""" +#ifndef %(includeGuard)s +#define %(includeGuard)s + + + +#endif +""", + + "cSource": +""" +#include "%(incPath)s" + + +""", + "cppHeader": +""" +#ifndef %(includeGuard)s +#define %(includeGuard)s + +""", + "openNamespace": +""" +namespace %(namespace)s { +""", + + "cppClassDef": +""" +class %(className)s { +public: + %(className)s(); + ~%(className)s(); +}; +""", + "closeNamespace": +""" +} // namespace %(namespace)s +""", + "cppHeaderEnd": +""" +#endif + +""" +} + +class Generator: + def __init__(self): + self.__name = "Unknown name" + pass + + def name(self): + return self.__name + def setName(self, name): + self.__name = name + + def generate(self, name): + pass + +class CHeader(Generator): + def __init__(self): + Generator.__init__(self) + self.setName("cheader") + + def generate(self, name): + path = name + path += ".h" + + fp = file(os.path.join(config["incBase"], path), "w") + + includeGuard = config["guardBase"] + " " + name.replace("/", " ") + while True: + index = includeGuard.find(" ") + if index == -1: break + + includeGuard = includeGuard[:index] + includeGuard[index+1].upper() + includeGuard[index+2:] + + includeGuard += "_H" + + fileConfig = config + fileConfig["path"] = path + fileConfig["includeGuard"] = includeGuard + + fp.write(config["fileHeader"] % fileConfig) + fp.write(config["cHeader"] % fileConfig) + + fp.close() + + return path + +class CSource(Generator): + def __init__(self): + Generator.__init__(self) + self.setName("csource") + + def generate(self, name, incPath=""): + path = os.path.join(config["srcBase"], name) + path += ".c" + + fp = file(path, "w") + + fileConfig = config + fileConfig["path"] = path + fileConfig["incPath"] = incPath + + fp.write(fileConfig["fileHeader"] % fileConfig) + if incPath != "": + fp.write(fileConfig["cSource"] % fileConfig) + + fp.close() + +class CGenerator(Generator): + def __init__(self): + Generator.__init__(self) + self.setName("c") + + def generate(self, name): + CHeader().generate(name) + CSource().generate(name, True) + + + +class CppHeader(Generator): + def __init__(self): + Generator.__init__(self) + self.setName("cppheader") + + def generate(self, name): + path = name + path = path.replace("::", "/") + last = path.rfind("/") + if last != -1: + path = path[:last].lower() + path[last:] + path += ".h" + filepath = os.path.join(config["incBase"], path) + + fp = file(filepath, "w") + + includeGuard = config["guardBase"] + " " + name.replace("/", "_") + includeGuard = includeGuard.replace("::", "_") + while True: + index = includeGuard.find(" ") + if index == -1: break + + includeGuard = includeGuard[:index] + includeGuard[index+1].upper() + includeGuard[index+2:] + + includeGuard += "_H" + + fileConfig = config + fileConfig["path"] = filepath + fileConfig["includeGuard"] = includeGuard + + fp.write(config["fileHeader"] % fileConfig) + fp.write(config["cppHeader"] % fileConfig) + + namespaceList = name.split("::") + if len(namespaceList) != 1: + className = namespaceList[-1] + namespaceList = namespaceList[:-1] + for namespace in namespaceList: + fileConfig["namespace"] = namespace + fp.write(fileConfig["openNamespace"] % fileConfig) + + fileConfig["className"] = className + fp.write(fileConfig["cppClassDef"] % fileConfig) + + for namespace in namespaceList[::-1]: + fileConfig["namespace"] = namespace + fp.write(fileConfig["closeNamespace"] % fileConfig) + + fp.write(config["cppHeaderEnd"] % fileConfig) + + fp.close() + + return path + +class CppSource(Generator): + def __init__(self): + Generator.__init__(self) + self.setName("cppsource") + + def generate(self, name, incPath=""): + path = os.path.join(config["srcBase"], name) + path = path.replace("::", "/") + last = path.rfind("/") + if last != -1: + path = path[:last].lower() + path[last:] + path += ".cpp" + + fp = file(path, "w") + + fileConfig = config + fileConfig["path"] = path + fileConfig["incPath"] = incPath + + fp.write(fileConfig["fileHeader"] % fileConfig) + if incPath != "": + fp.write(fileConfig["cSource"] % fileConfig) + + fp.close() + +class CppGenerator(Generator): + def __init__(self): + Generator.__init__(self) + self.setName("cpp") + + def generate(self, name): + incPath = CppHeader().generate(name) + CppSource().generate(name, incPath) + + + +def main(): + generatorMap = dict() + def addGenerator(generator): + generatorMap[generator.name()] = generator + + addGenerator(CHeader()) + addGenerator(CSource()) + addGenerator(CGenerator()) + + addGenerator(CppHeader()) + addGenerator(CppSource()) + addGenerator(CppGenerator()) + + if len(sys.argv) < 3: + print "Usage:", sys.argv[0], "generator name1 [name2 name3 . . .]" + print "Where generator is one of:" + for g in generatorMap.values(): + print "\t", g.name() + return + generator = generatorMap[sys.argv[1]] + + for name in sys.argv[2:]: + generator.generate(name) + +main() diff --git a/src/SConscript b/src/SConscript new file mode 100644 index 0000000..c20a622 --- /dev/null +++ b/src/SConscript @@ -0,0 +1,4 @@ +dirglob = Glob("*/SConscript", strings=True) + +for path in dirglob: + SConscript(path) diff --git a/src/config/.srcdir b/src/config/.srcdir new file mode 100644 index 0000000..e69de29 diff --git a/monitor/src/config/ArgumentParser.cpp b/src/config/ArgumentParser.cpp similarity index 100% rename from monitor/src/config/ArgumentParser.cpp rename to src/config/ArgumentParser.cpp diff --git a/monitor/src/config/ConcreteVault.cpp b/src/config/ConcreteVault.cpp similarity index 100% rename from monitor/src/config/ConcreteVault.cpp rename to src/config/ConcreteVault.cpp diff --git a/monitor/src/config/Parser.cpp b/src/config/Parser.cpp similarity index 100% rename from monitor/src/config/Parser.cpp rename to src/config/Parser.cpp diff --git a/monitor/src/config/Vault.cpp b/src/config/Vault.cpp similarity index 100% rename from monitor/src/config/Vault.cpp rename to src/config/Vault.cpp diff --git a/src/informer/.srcdir b/src/informer/.srcdir new file mode 100644 index 0000000..e69de29 diff --git a/modules/informer/src/SConscript b/src/informer/SConscript similarity index 100% rename from modules/informer/src/SConscript rename to src/informer/SConscript diff --git a/modules/informer/src/collector/informer.c b/src/informer/collector/informer.c similarity index 100% rename from modules/informer/src/collector/informer.c rename to src/informer/collector/informer.c diff --git a/src/monitor/.srcdir b/src/monitor/.srcdir new file mode 100644 index 0000000..e69de29 diff --git a/monitor/src/Aesalon.cpp b/src/monitor/Aesalon.cpp similarity index 100% rename from monitor/src/Aesalon.cpp rename to src/monitor/Aesalon.cpp diff --git a/monitor/src/Coordinator.cpp b/src/monitor/Coordinator.cpp similarity index 100% rename from monitor/src/Coordinator.cpp rename to src/monitor/Coordinator.cpp diff --git a/monitor/src/SConscript b/src/monitor/SConscript similarity index 62% rename from monitor/src/SConscript rename to src/monitor/SConscript index 0cc5426..ea455cc 100644 --- a/monitor/src/SConscript +++ b/src/monitor/SConscript @@ -1,8 +1,5 @@ Import("env") -monitorIncludePath = env.Dictionary()["includeRoot"] + "/monitor" - -env.Append(CPPPATH = [monitorIncludePath]) env.Append(CCFLAGS = ["-W", "-Wall", "-g", "-DAesalonMonitor"]) env.Append(LIBS = ["rt"]) diff --git a/monitor/src/analyzer/ElfAnalyzer.cpp b/src/monitor/analyzer/ElfAnalyzer.cpp similarity index 100% rename from monitor/src/analyzer/ElfAnalyzer.cpp rename to src/monitor/analyzer/ElfAnalyzer.cpp diff --git a/monitor/src/analyzer/ExecutableAnalyzer.cpp b/src/monitor/analyzer/ExecutableAnalyzer.cpp similarity index 100% rename from monitor/src/analyzer/ExecutableAnalyzer.cpp rename to src/monitor/analyzer/ExecutableAnalyzer.cpp diff --git a/monitor/src/module/List.cpp b/src/monitor/module/List.cpp similarity index 100% rename from monitor/src/module/List.cpp rename to src/monitor/module/List.cpp diff --git a/monitor/src/module/Loader.cpp b/src/monitor/module/Loader.cpp similarity index 100% rename from monitor/src/module/Loader.cpp rename to src/monitor/module/Loader.cpp diff --git a/monitor/src/module/Module.cpp b/src/monitor/module/Module.cpp similarity index 100% rename from monitor/src/module/Module.cpp rename to src/monitor/module/Module.cpp diff --git a/monitor/src/program/Conductor.cpp b/src/monitor/program/Conductor.cpp similarity index 100% rename from monitor/src/program/Conductor.cpp rename to src/monitor/program/Conductor.cpp diff --git a/monitor/src/program/Launcher.cpp b/src/monitor/program/Launcher.cpp similarity index 100% rename from monitor/src/program/Launcher.cpp rename to src/monitor/program/Launcher.cpp diff --git a/monitor/src/program/SharedMemory.cpp b/src/monitor/program/SharedMemory.cpp similarity index 100% rename from monitor/src/program/SharedMemory.cpp rename to src/monitor/program/SharedMemory.cpp diff --git a/monitor/src/program/ZoneReader.cpp b/src/monitor/program/ZoneReader.cpp similarity index 100% rename from monitor/src/program/ZoneReader.cpp rename to src/monitor/program/ZoneReader.cpp diff --git a/monitor/src/vcommunication/GeneralSink.cpp b/src/monitor/vcommunication/GeneralSink.cpp similarity index 100% rename from monitor/src/vcommunication/GeneralSink.cpp rename to src/monitor/vcommunication/GeneralSink.cpp diff --git a/monitor/src/vcommunication/LogSink.cpp b/src/monitor/vcommunication/LogSink.cpp similarity index 100% rename from monitor/src/vcommunication/LogSink.cpp rename to src/monitor/vcommunication/LogSink.cpp diff --git a/monitor/src/vcommunication/NetworkSink.cpp b/src/monitor/vcommunication/NetworkSink.cpp similarity index 100% rename from monitor/src/vcommunication/NetworkSink.cpp rename to src/monitor/vcommunication/NetworkSink.cpp diff --git a/src/storage/.srcdir b/src/storage/.srcdir new file mode 100644 index 0000000..e69de29 diff --git a/src/storage/RTree.cpp b/src/storage/RTree.cpp new file mode 100644 index 0000000..3b37df5 --- /dev/null +++ b/src/storage/RTree.cpp @@ -0,0 +1,13 @@ + +/** Aesalon, a tool to visualize program behaviour in real time. + Copyright (C) 2009-2011, Aesalon development team. + + Aesalon is distributed under the terms of the GNU GPLv3. See + the included file LICENSE for more information. + + @file src/storage/RTree.cpp +*/ + +#include "storage/RTree.h" + + diff --git a/src/visualizer/.srcdir b/src/visualizer/.srcdir new file mode 100644 index 0000000..e69de29 diff --git a/visualizer/src/Aesalon.cpp b/src/visualizer/Aesalon.cpp similarity index 100% rename from visualizer/src/Aesalon.cpp rename to src/visualizer/Aesalon.cpp diff --git a/visualizer/src/RootWindow.cpp b/src/visualizer/RootWindow.cpp similarity index 100% rename from visualizer/src/RootWindow.cpp rename to src/visualizer/RootWindow.cpp diff --git a/visualizer/src/SConscript b/src/visualizer/SConscript similarity index 100% rename from visualizer/src/SConscript rename to src/visualizer/SConscript diff --git a/visualizer/src/communication/DataSource.cpp b/src/visualizer/communication/DataSource.cpp similarity index 100% rename from visualizer/src/communication/DataSource.cpp rename to src/visualizer/communication/DataSource.cpp diff --git a/visualizer/src/communication/LogSource.cpp b/src/visualizer/communication/LogSource.cpp similarity index 100% rename from visualizer/src/communication/LogSource.cpp rename to src/visualizer/communication/LogSource.cpp diff --git a/visualizer/src/communication/NetworkSource.cpp b/src/visualizer/communication/NetworkSource.cpp similarity index 100% rename from visualizer/src/communication/NetworkSource.cpp rename to src/visualizer/communication/NetworkSource.cpp diff --git a/visualizer/src/data b/src/visualizer/data similarity index 100% rename from visualizer/src/data rename to src/visualizer/data diff --git a/visualizer/src/resources.qrc b/src/visualizer/resources.qrc similarity index 100% rename from visualizer/src/resources.qrc rename to src/visualizer/resources.qrc diff --git a/visualizer/src/storage/MemoryPool.cpp b/src/visualizer/storage/MemoryPool.cpp similarity index 100% rename from visualizer/src/storage/MemoryPool.cpp rename to src/visualizer/storage/MemoryPool.cpp diff --git a/visualizer/src/storage/MemoryPoolEntry.cpp b/src/visualizer/storage/MemoryPoolEntry.cpp similarity index 100% rename from visualizer/src/storage/MemoryPoolEntry.cpp rename to src/visualizer/storage/MemoryPoolEntry.cpp diff --git a/visualizer/src/storage/MemoryPoolItem.cpp b/src/visualizer/storage/MemoryPoolItem.cpp similarity index 100% rename from visualizer/src/storage/MemoryPoolItem.cpp rename to src/visualizer/storage/MemoryPoolItem.cpp diff --git a/visualizer/src/storage/RTree.cpp b/src/visualizer/storage/RTree.cpp similarity index 100% rename from visualizer/src/storage/RTree.cpp rename to src/visualizer/storage/RTree.cpp diff --git a/visualizer/src/visualization/AbstractObject.cpp b/src/visualizer/visualization/AbstractObject.cpp similarity index 100% rename from visualizer/src/visualization/AbstractObject.cpp rename to src/visualizer/visualization/AbstractObject.cpp diff --git a/visualizer/src/visualization/AbstractRangeMatcher.cpp b/src/visualizer/visualization/AbstractRangeMatcher.cpp similarity index 100% rename from visualizer/src/visualization/AbstractRangeMatcher.cpp rename to src/visualizer/visualization/AbstractRangeMatcher.cpp diff --git a/visualizer/src/visualization/AbstractVisualization.cpp b/src/visualizer/visualization/AbstractVisualization.cpp similarity index 100% rename from visualizer/src/visualization/AbstractVisualization.cpp rename to src/visualizer/visualization/AbstractVisualization.cpp diff --git a/visualizer/src/visualization/Viewport.cpp b/src/visualizer/visualization/Viewport.cpp similarity index 100% rename from visualizer/src/visualization/Viewport.cpp rename to src/visualizer/visualization/Viewport.cpp diff --git a/visualizer/.gitignore b/visualizer/.gitignore deleted file mode 100644 index 378eac2..0000000 --- a/visualizer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/visualizer/SConscript b/visualizer/SConscript deleted file mode 100644 index ad755cf..0000000 --- a/visualizer/SConscript +++ /dev/null @@ -1 +0,0 @@ -SConscript("src/SConscript", variant_dir="build", duplicate=0) -- 2.11.4.GIT