From ad8ee1c3f7c381ddd40f5aec9e94ecf3e12fb2a7 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 8 Jun 2016 23:21:42 +0200 Subject: [PATCH] renamed S2SS to VILLASnode --- .gitignore | 2 +- Dockerfile | 42 +++++++++---------- Doxyfile | 2 +- Makefile | 38 ++++++++--------- README.md | 4 +- clients/README.md | 10 ++--- .../udp/models/send_receive/include/config.h | 2 +- .../udp/models/send_receive/include/msg.h | 2 +- .../models/send_receive/include/msg_format.h | 2 +- .../udp/models/send_receive/include/utils.h | 2 +- .../udp/models/send_receive/send_receive.llm | 4 +- .../udp/models/send_receive/send_receive.mdl | 2 +- .../send_receive/src/{s2ss.c => main.c} | 4 +- .../opal/udp/models/send_receive/src/msg.c | 2 +- .../opal/udp/models/send_receive/src/utils.c | 2 +- .../send_receive/{s2ss.mk => villas.mk} | 2 +- clients/opal/udp_readme.txt | 6 +-- config.h | 8 ++-- contrib/websocket/index.html | 4 +- contrib/websocket/msg.js | 4 +- doc/Concept.md | 2 +- doc/Configuration.md | 8 ++-- doc/Development.md | 8 ++-- doc/GettingStarted.md | 8 ++-- doc/Install.md | 4 +- doc/Mainpage.md | 10 ++--- doc/Nodes.md | 4 +- doc/Tools.md | 30 ++++++------- doc/Tuning.md | 4 +- doc/Usage.md | 14 +++---- doc/nodes/LabView.md | 2 +- doc/nodes/OPAL.md | 8 ++-- doc/nodes/Socket.md | 4 +- doc/nodes/WebSocket.md | 2 +- etc/example.conf | 4 +- etc/websocket-stats.conf | 2 +- include/cfg.h | 2 +- include/file.h | 2 +- include/gtfpga.h | 2 +- include/hist.h | 2 +- include/hooks.h | 2 +- include/if.h | 2 +- include/kernel.h | 2 +- include/list.h | 2 +- include/log.h | 2 +- include/lstack.h | 2 +- include/msg.h | 2 +- include/msg_format.h | 2 +- include/ngsi.h | 2 +- include/nl.h | 2 +- include/node.h | 8 +--- include/opal.h | 2 +- include/path.h | 2 +- include/pool.h | 2 +- include/queue.h | 2 +- include/sample.h | 2 +- include/socket.h | 2 +- include/tc.h | 2 +- include/timing.h | 2 +- include/utils.h | 2 +- include/websocket.h | 2 +- lib/cfg.c | 2 +- lib/file.c | 2 +- lib/gtfpga.c | 2 +- lib/hist.c | 2 +- lib/hooks-other.c | 2 +- lib/hooks-stats.c | 2 +- lib/hooks.c | 2 +- lib/if.c | 2 +- lib/kernel.c | 2 +- lib/list.c | 2 +- lib/log.c | 4 +- lib/lstack.c | 2 +- lib/msg.c | 2 +- lib/ngsi.c | 2 +- lib/nl.c | 4 +- lib/node.c | 2 +- lib/opal.c | 4 +- lib/path.c | 2 +- lib/pool.c | 2 +- lib/queue.c | 2 +- lib/sample.c | 2 +- lib/socket.c | 6 +-- lib/tc.c | 4 +- lib/timing.c | 2 +- lib/utils.c | 6 +-- lib/websocket-http.c | 2 +- lib/websocket-live.c | 2 +- lib/websocket.c | 2 +- src/pipe.c | 2 +- src/server.c | 4 +- src/signal.c | 4 +- src/test.c | 2 +- tools/python/README.md | 2 +- tools/python/file-filter.py | 10 ++--- tools/python/file-merge.py | 10 ++--- tools/python/{s2ss => villas}/__init__.py | 0 tools/python/{s2ss => villas}/msg.py | 2 +- tools/python/{s2ss => villas}/ocb.py | 0 tools/python/{s2ss => villas}/ts.py | 2 +- tools/tests.sh | 6 +-- tools/{s2ss.sh => villas.sh} | 12 +++--- 102 files changed, 217 insertions(+), 225 deletions(-) rename clients/opal/udp/models/send_receive/src/{s2ss.c => main.c} (99%) rename clients/opal/udp/models/send_receive/{s2ss.mk => villas.mk} (97%) rename tools/python/{s2ss => villas}/__init__.py (100%) rename tools/python/{s2ss => villas}/msg.py (86%) rename tools/python/{s2ss => villas}/ocb.py (100%) rename tools/python/{s2ss => villas}/ts.py (94%) rename tools/{s2ss.sh => villas.sh} (72%) diff --git a/.gitignore b/.gitignore index b77d301af..616224223 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ *.so *~ -server +node pipe test signal diff --git a/Dockerfile b/Dockerfile index d282a1b01..b7931dbf0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -# Dockerfile for S2SS development and testing +# Dockerfile for VILLASnode development and testing # # Use this Dockerfile running: # $ make docker # # @copyright 2014-2015, Institute for Automation of Complex Power Systems, EONERC -# This file is part of S2SS. All Rights Reserved. Proprietary and confidential. +# This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. # Unauthorized copying of this file, via any medium is strictly prohibited. ################################################################################### @@ -20,7 +20,7 @@ EXPOSE 443 # Install development environement RUN apt-get update && \ apt-get -y install \ - gcc \ + gcc \ g++ \ clang \ gdb \ @@ -29,7 +29,7 @@ RUN apt-get update && \ make \ cmake \ libc6-dev \ - pkg-config \ + pkg-config \ doxygen \ dia \ graphviz \ @@ -39,14 +39,14 @@ RUN apt-get update && \ # Install dependencies for native arch RUN apt-get update && \ apt-get -y install \ - libconfig-dev \ - libnl-3-dev \ - libnl-route-3-dev \ - libpci-dev \ - libjansson-dev \ - libcurl4-openssl-dev \ + libconfig-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libpci-dev \ + libjansson-dev \ + libcurl4-openssl-dev \ libssl-dev \ - uuid-dev + uuid-dev # Install dependencies for 32bit x86 arch (required for 32bit libOpalAsync) # (64 bit header files are used) @@ -55,20 +55,20 @@ RUN dpkg --add-architecture i386 && \ apt-get -y install \ libc6-dev-i386 \ lib32gcc-4.9-dev \ - libconfig9:i386 \ - libnl-3-200:i386 \ - libnl-route-3-200:i386 \ - libpci3:i386 \ - libjansson4:i386 \ - libcurl3:i386 \ - libuuid1:i386 + libconfig9:i386 \ + libnl-3-200:i386 \ + libnl-route-3-200:i386 \ + libpci3:i386 \ + libjansson4:i386 \ + libcurl3:i386 \ + libuuid1:i386 # Checkout source code from GitHub -#RUN git clone git@github.com:RWTH-ACS/S2SS.git /s2ss +#RUN git clone git@github.com:RWTH-ACS/VILLASnode.git /villas -WORKDIR /s2ss +WORKDIR /villas # Compile -#RUN make -C /s2ss +#RUN make -C /villas ENTRYPOINT /bin/bash \ No newline at end of file diff --git a/Doxyfile b/Doxyfile index f7f1a2be1..37b9f586f 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "Simulator2Simulator Server (S2SS)" +PROJECT_NAME = "VILLASnode" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version diff --git a/Makefile b/Makefile index 830975a39..38d4f8447 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ # Executables -TARGETS = server pipe signal test +TARGETS = node pipe signal test # Libraries -LIBS = libs2ss.so +LIBS = libvillas.so DEBUG = 1 -# Object files for libs2ss +# Object files for libvillas LIB_OBJS = sample.o path.o node.o \ kernel.o \ list.o pool.o queue.o lstack.o \ @@ -30,7 +30,7 @@ GIT_REV=$(shell git rev-parse --short HEAD) # Compiler and linker flags CC ?= gcc -LDLIBS = -pthread -lrt -lm -lconfig -ls2ss +LDLIBS = -pthread -lrt -lm -lconfig -lvillas CFLAGS += -std=c11 -Iinclude/ -I. -MMD -mcx16 CFLAGS += -Wall -fdiagnostics-color=auto @@ -104,10 +104,10 @@ LIB_LDLIBS += $(shell pkg-config --libs ${PKGS}) all: $(LIBS) $(TARGETS) # Dependencies for individual binaries -server: server.o $(LIBS) -pipe: pipe.o $(LIBS) -test: test.o $(LIBS) -signal: signal.o $(LIBS) +node: server.o $(LIBS) +pipe: pipe.o $(LIBS) +test: test.o $(LIBS) +signal: signal.o $(LIBS) # Libraries $(LIBS): CFLAGS += -fPIC $(LIB_CFLAGS) @@ -117,18 +117,18 @@ $(LIBS): $(LIB_OBJS) # Common targets install: $(TARGETS) $(LIBS) install -m 0644 $(LIBS) $(PREFIX)/lib - install -m 0755 server -T $(PREFIX)/bin/s2ss-server - install -m 0755 signal $(PREFIX)/bin/s2ss-signal - install -m 0755 pipe $(PREFIX)/bin/s2ss-pipe - install -m 0755 test $(PREFIX)/bin/s2ss-test - install -m 0755 tools/s2ss.sh $(PREFIX)/bin/s2ss - install -m 0755 -d $(PREFIX)/include/s2ss/ - install -m 0644 include/*.h $(PREFIX)/include/s2ss/ + install -m 0755 node -T $(PREFIX)/bin/villas-node + install -m 0755 signal $(PREFIX)/bin/villas-signal + install -m 0755 pipe $(PREFIX)/bin/villas-pipe + install -m 0755 test $(PREFIX)/bin/villas-test + install -m 0755 tools/villas.sh $(PREFIX)/bin/villas + install -m 0755 -d $(PREFIX)/include/villas/ + install -m 0644 include/*.h $(PREFIX)/include/villas/ ldconfig release: all - tar czf s2ss-$(COMMIT)-doc.tar.gz doc/html/ - tar czf s2ss-$(COMMIT).tar.gz server test pipe signal etc/ + tar czf villas-$(COMMIT)-doc.tar.gz doc/html/ + tar czf villas-$(COMMIT).tar.gz node test pipe signal etc/ rsync *.tar.gz $(DEPLOY_USER)@$(DEPLOY_HOST):$(DEPLOY_PATH)/ rsync --archive --delete doc/html/ $(DEPLOY_USER)@$(DEPLOY_HOST):$(DEPLOY_PATH)/doc/ @@ -138,8 +138,8 @@ clean: $(RM) -rf doc/{html,latex} docker: - docker build -t s2ss . - docker run -it $(DOCKEROPTS) -v $(PWD):/s2ss s2ss + docker build -t villas . + docker run -it $(DOCKEROPTS) -v $(PWD):/villas villas doc: doxygen diff --git a/README.md b/README.md index 70d9e03c3..b7aee823d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Simulator to Simulator Server -[![Travis-CI](https://magnum.travis-ci.com/RWTH-ACS/S2SS.svg?token=9zFzh6dGWonz6LyBspW3&branch=master)](https://magnum.travis-ci.com/RWTH-ACS/S2SS) +[![Travis-CI](https://magnum.travis-ci.com/RWTH-ACS/VILLASnode.svg?token=9zFzh6dGWonz6LyBspW3&branch=master)](https://magnum.travis-ci.com/RWTH-ACS/VILLASnode) -This is S2SS, a gateway to forward and process simulation data between real time simulators. +This is VILLASnode, a gateway to forward and process simulation data between real time simulators. ## Documentation diff --git a/clients/README.md b/clients/README.md index 776cd2609..51f110358 100644 --- a/clients/README.md +++ b/clients/README.md @@ -1,14 +1,14 @@ -# S2SS clients +# VILLASnode clients -This directory contains code and projects to connect various simulators and tools to the S2SS server. -Usually, this are projects which are not based on the S2SS source code but which are using the same protocol as defined by the `socket` node-type. +This directory contains code and projects to connect various simulators and tools to VILLASnode. +Usually, this are projects which are not based on the VILLASnode source code but which are using the same protocol as defined by the `socket` node-type. For a protocol specification, please see `include/msg_format.h`. - opal/udp Contains the implementation of an asynchronous process block for RT-LAB. - This block allows exchanging sample values with S2SS over UDP using the `socket` node-type. + This block allows exchanging sample values with VILLASnode over UDP using the `socket` node-type. Author: Steffen Vogel - labview - This example model is using LabView standard UDP blocks to exchange sample values with S2SS over UDP using the `socket` node-type. + This example model is using LabView standard UDP blocks to exchange sample values with VILLASnode over UDP using the `socket` node-type. Author: Eyke Liegmann diff --git a/clients/opal/udp/models/send_receive/include/config.h b/clients/opal/udp/models/send_receive/include/config.h index 37b594ea2..cbf09b8af 100644 --- a/clients/opal/udp/models/send_receive/include/config.h +++ b/clients/opal/udp/models/send_receive/include/config.h @@ -8,7 +8,7 @@ #ifndef _CONFIG_H_ #define _CONFIG_H_ -#define PROGNAME "S2SS-OPAL-UDP" +#define PROGNAME "VILLASnode-OPAL-UDP" #define VERSION "0.5" #define MAX_VALUES 64 diff --git a/clients/opal/udp/models/send_receive/include/msg.h b/clients/opal/udp/models/send_receive/include/msg.h index 183eac980..5da3b679e 100644 --- a/clients/opal/udp/models/send_receive/include/msg.h +++ b/clients/opal/udp/models/send_receive/include/msg.h @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/clients/opal/udp/models/send_receive/include/msg_format.h b/clients/opal/udp/models/send_receive/include/msg_format.h index d4078a553..f378c130f 100644 --- a/clients/opal/udp/models/send_receive/include/msg_format.h +++ b/clients/opal/udp/models/send_receive/include/msg_format.h @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/clients/opal/udp/models/send_receive/include/utils.h b/clients/opal/udp/models/send_receive/include/utils.h index 050de80ba..06646626e 100644 --- a/clients/opal/udp/models/send_receive/include/utils.h +++ b/clients/opal/udp/models/send_receive/include/utils.h @@ -5,7 +5,7 @@ * @author Mathieu Dubé-Dallaire * @copyright 2003, OPAL-RT Technologies inc * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/clients/opal/udp/models/send_receive/send_receive.llm b/clients/opal/udp/models/send_receive/send_receive.llm index d6cd1fb19..7dc26b5b9 100644 --- a/clients/opal/udp/models/send_receive/send_receive.llm +++ b/clients/opal/udp/models/send_receive/send_receive.llm @@ -42,9 +42,9 @@ include\msg.h=Ascii include\msg_format.h=Ascii include\socket.h=Ascii include\utils.h=Ascii -s2ss.mk=Ascii +villas.mk=Ascii src\msg.c=Ascii -src\s2ss.c=Ascii +src\main.c=Ascii src\socket.c=Ascii src\utils.c=Ascii [ExtraPutFilesComp_1_RT_LAB] diff --git a/clients/opal/udp/models/send_receive/send_receive.mdl b/clients/opal/udp/models/send_receive/send_receive.mdl index af07a97e3..85cd66088 100644 --- a/clients/opal/udp/models/send_receive/send_receive.mdl +++ b/clients/opal/udp/models/send_receive/send_receive.mdl @@ -1442,7 +1442,7 @@ Model { DstPort 2 } Annotation { - Name "Simple S2SS to OPAL test using UDP messages" + Name "Simple VILLASnode to OPAL test using UDP messages" Position [288, 52] FontName "Verdana" FontSize 14 diff --git a/clients/opal/udp/models/send_receive/src/s2ss.c b/clients/opal/udp/models/send_receive/src/main.c similarity index 99% rename from clients/opal/udp/models/send_receive/src/s2ss.c rename to clients/opal/udp/models/send_receive/src/main.c index 9e88a2eac..e8398db11 100644 --- a/clients/opal/udp/models/send_receive/src/s2ss.c +++ b/clients/opal/udp/models/send_receive/src/main.c @@ -87,7 +87,7 @@ static void *SendToIPPort(void *arg) double mdldata[MSG_VALUES]; int mdldata_size; - /* Data from the S2SS server */ + /* Data from VILLASnode */ struct msg msg = MSG_INIT(0); #ifdef _DEBUG // TODO: workaround @@ -175,7 +175,7 @@ static void *RecvFromIPPort(void *arg) double mdldata[MSG_VALUES]; int mdldata_size; - /* Data from the S2SS server */ + /* Data from VILLASnode */ struct msg msg = MSG_INIT(0); OpalPrint("%s: RecvFromIPPort thread started\n", PROGNAME); diff --git a/clients/opal/udp/models/send_receive/src/msg.c b/clients/opal/udp/models/send_receive/src/msg.c index 12a218343..e9607c685 100644 --- a/clients/opal/udp/models/send_receive/src/msg.c +++ b/clients/opal/udp/models/send_receive/src/msg.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/clients/opal/udp/models/send_receive/src/utils.c b/clients/opal/udp/models/send_receive/src/utils.c index a10ad72e9..01025435e 100644 --- a/clients/opal/udp/models/send_receive/src/utils.c +++ b/clients/opal/udp/models/send_receive/src/utils.c @@ -5,7 +5,7 @@ * @author Mathieu Dubé-Dallaire * @copyright 2003, OPAL-RT Technologies inc * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/clients/opal/udp/models/send_receive/s2ss.mk b/clients/opal/udp/models/send_receive/villas.mk similarity index 97% rename from clients/opal/udp/models/send_receive/s2ss.mk rename to clients/opal/udp/models/send_receive/villas.mk index b2b20b766..1762c66f3 100644 --- a/clients/opal/udp/models/send_receive/s2ss.mk +++ b/clients/opal/udp/models/send_receive/villas.mk @@ -51,7 +51,7 @@ INCLUDES = -I. LIBPATH = -L. CC_OPTS = -std=c99 LD_OPTS = -OBJS = s2ss.o msg.o utils.o socket.o +OBJS = main.o msg.o utils.o socket.o ADDLIB = -lOpalCore -lOpalUtils LIBS = -lOpalAsyncApiCore $(ADDLIB) $(TARGET_LIB) diff --git a/clients/opal/udp_readme.txt b/clients/opal/udp_readme.txt index 1dbd36f77..fd524e393 100644 --- a/clients/opal/udp_readme.txt +++ b/clients/opal/udp_readme.txt @@ -2,7 +2,7 @@ To "models" folder of OPAL project folder copy: folder: include folder: src -file: s2ss.mk +file: villas.mk ---------------------------------------------- @@ -16,9 +16,9 @@ include\msg.h=Ascii include\msg_format.h=Ascii include\socket.h=Ascii include\utils.h=Ascii -s2ss.mk=Ascii +villas.mk=Ascii src\msg.c=Ascii -src\s2ss.c=Ascii +src\villas.c=Ascii src\socket.c=Ascii src\utils.c=Ascii diff --git a/config.h b/config.h index d20c35882..523adbcad 100644 --- a/config.h +++ b/config.h @@ -6,7 +6,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ @@ -17,7 +17,7 @@ #define _GIT_REV "nogit" #endif -/** The version number of the s2ss server */ +/** The version number of VILLASnode */ #define VERSION "v0.5-" _GIT_REV /** Default number of values in a message */ @@ -31,8 +31,8 @@ #define SOCKET_PRIO 7 /* Protocol numbers */ -#define IPPROTO_S2SS 137 -#define ETH_P_S2SS 0xBABE +#define IPPROTO_VILLAS 137 +#define ETH_P_VILLAS 0xBABE #define SYSFS_PATH "/sys" #define PROCFS_PATH "/proc" diff --git a/contrib/websocket/index.html b/contrib/websocket/index.html index 769659c3c..06b70f3f4 100644 --- a/contrib/websocket/index.html +++ b/contrib/websocket/index.html @@ -2,7 +2,7 @@ - S2SS / WebSocket Mockup + VILLASnode / WebSocket Mockup @@ -18,7 +18,7 @@
    diff --git a/contrib/websocket/msg.js b/contrib/websocket/msg.js index b7dc5bf47..5098a8683 100644 --- a/contrib/websocket/msg.js +++ b/contrib/websocket/msg.js @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2015, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ /** @@ -12,8 +12,6 @@ * @{ **********************************************************************************/ -//var S2SS = S2SS || {}; - /* Class for parsing and printing a message / sample */ function Msg(members) { for(var k in members) diff --git a/doc/Concept.md b/doc/Concept.md index 432f1f2bb..5d03ceb10 100644 --- a/doc/Concept.md +++ b/doc/Concept.md @@ -12,7 +12,7 @@ All communication partners are represented by nodes. Possible types of nodes are: * Simulators (OPAL, RTDS) - * Servers (S2SS instances) + * Servers (VILLASnode instances) * Workstations (Simulink, Labview, ...) * Data Loggers * etc.. diff --git a/doc/Configuration.md b/doc/Configuration.md index 8c7d29594..3fd3dd6f6 100644 --- a/doc/Configuration.md +++ b/doc/Configuration.md @@ -1,6 +1,6 @@ # Configuration -The S2SS configuration is completly contained in a single file. +The VILLASnode configuration is completly contained in a single file. Take a look at the example configuration: `server/etc/example.conf`. The configuration file consists of three sections: @@ -37,13 +37,13 @@ By default, the daemon uses a real-time optimized FIFO scheduling algorithm. #### `name` *(integer)* -By default the `name` of a S2SS instance is equalt to the hostname of the machine it is running on. +By default the `name` of a VILLASnode instance is equalt to the hostname of the machine it is running on. Some node types are using this name to identify themselves agains their remotes. An example is the `ngsi` node type which adds a metadata attribute `source` to its updates. ## Nodes -The node section is a **directory** of nodes (clients) which are connected to the S2SS instance. +The node section is a **directory** of nodes (clients) which are connected to the VILLASnode instance. The directory is indexed by the name of the node: nodes = { @@ -113,7 +113,7 @@ The value of this setting determines how many samples will be combined into one ##### `rate` *(float)* A non-zero value for this setting will change this path to an asynchronous mode. -In this mode S2SS will send with a fixed rate to all destination nodes. +In this mode VILLASnode will send with a fixed rate to all destination nodes. It will always send the latest value it received, possible skipping values which have been received in between. If `vectorize` is larger than 1, it will send the last `vectorize` samples at once. diff --git a/doc/Development.md b/doc/Development.md index c0531ad7e..00d811569 100644 --- a/doc/Development.md +++ b/doc/Development.md @@ -1,15 +1,15 @@ # Development -Developement is currently coordinated by Steffen Vogel using [GitHub](http://github.com/RWTH-ACS/S2SS). +Developement is currently coordinated by Steffen Vogel using [GitHub](http://github.com/RWTH-ACS/VILLASnode). Please feel free to submit pull requests or bug reports. -## Shared library: libs2ss +## Shared library: libvillas -S2SS is split into a shared library called libs2ss and a couple of executables (`s2ss-server`, `s2ss-pipe`, `s2ss-test`, `s2ss-signal`) which are linked agains the library. +VILLASnode is split into a shared library called libvillas and a couple of executables (`villas-server`, `villas-pipe`, `villas-test`, `villas-signal`) which are linked agains the library. ## Extensibilty -There are two main places where S2SS can easily extended: +There are two main places where VILLASnode can easily extended: #### New node-type diff --git a/doc/GettingStarted.md b/doc/GettingStarted.md index cbd132bd8..363c462e2 100644 --- a/doc/GettingStarted.md +++ b/doc/GettingStarted.md @@ -13,13 +13,13 @@ We prepared a image which you can download and run out of the box: 2. After installing the toolbox, open the "Docker Quickstart Terminal" -3. Start the latest S2SS container by running: +3. Start the latest VILLASnode container by running: - $ docker run rwthacs/s2ss + $ docker run rwthacs/villas ### To be added -S2SS ... +VILLASnode ... - is written in object-oriented C11 - is compiled with Clang / LLVM or GCC @@ -28,4 +28,4 @@ S2SS ... - is extensible with new node types - heavily multi-threaded - follows the Unix philosophy -- is separated into a library (libs2ss) and a few binaries (server, pipe, test, signal) which link against the lib. \ No newline at end of file +- is separated into a library (libvillas) and a few binaries (server, pipe, test, signal) which link against the lib. \ No newline at end of file diff --git a/doc/Install.md b/doc/Install.md index f94db3baf..32730a346 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -8,7 +8,7 @@ Install libraries and developement headers for: - [libconfig](http://www.hyperrealm.com/libconfig/) for parsing the configuration file. - [libnl3](http://www.infradead.org/~tgr/libnl/) for the network communication & emulation support of the `socket` node-type. - - libOpal{AsyncApi,Core,Utils} for running the S2SS server as an Asynchronous process inside your RT-LAB model. + - libOpal{AsyncApi,Core,Utils} for running VILLASnode as an Asynchronous process inside your RT-LAB model. - [pciuitils](http://mj.ucw.cz/sw/pciutils/) for enumerating PCI devices. Required by `gtfpga` node-type. - [libjansson](http://www.digip.org/jansson/) JSON parser for `websocket` and `ngsi` node-types. - [libwebsockets](http://libwebsockets.org) for the `websocket` node-type. @@ -46,6 +46,6 @@ Append `PREFIX=/opt/local` to change the installation destination. Verify everything is working and required node-types are compiled-in: - $ s2ss server + $ villas server Will show you the current version of the server including a list of all supported node-types. diff --git a/doc/Mainpage.md b/doc/Mainpage.md index 97809857e..42b376f97 100644 --- a/doc/Mainpage.md +++ b/doc/Mainpage.md @@ -1,4 +1,4 @@ -S2SS is a client/server application to connect simulation equipment and software such as: +VILLASnode is a client/server application to connect simulation equipment and software such as: - OPAL-RT eMegaSim, - RTDS GTFPGA cards, @@ -7,7 +7,7 @@ S2SS is a client/server application to connect simulation equipment and software - and FPGA models. It's designed with a focus on very low latency to achieve almost realtime exchange of simulation data. -S2SS is used in distributed- and co-simulation scenarios and developed for the field of power grid simulation at the EON Energy Research Center in Aachen, Germany. +VILLASnode is used in distributed- and co-simulation scenarios and developed for the field of power grid simulation at the EON Energy Research Center in Aachen, Germany. ## Overview @@ -37,10 +37,10 @@ There are two types of clients: An example for such a node is the 'gtfpga' type which directly fetches and pushes data to a PCIe card. Or the 'file' type which logs or replays simulation data from the harddisk. -2. An other way to connect simulation equipment is by using a client-application which itself sends the data over the network to the S2SS server. - In this scenario, the S2SS server uses the 'socket' node-type to communicate with the client-application. +2. An other way to connect simulation equipment is by using a client-application which itself sends the data over the network to VILLASnode. + In this scenario, VILLASnode uses the 'socket' node-type to communicate with the client-application. -Usually, new clients / equipemnt should be implemented as a new node-type as part of the S2SS server. +Usually, new clients / equipemnt should be implemented as a new node-type as part of VILLASnode. Using a dedicated client-application which communicates via the 'socket' type is deprecated because it leads to code duplication. ## Contact diff --git a/doc/Nodes.md b/doc/Nodes.md index 323fe8b76..c2c8f111c 100644 --- a/doc/Nodes.md +++ b/doc/Nodes.md @@ -1,7 +1,7 @@ # Node-types {#nodes} -Every server needs clients which act as sinks / sources for simulation data. In case of S2SS these clients are called _nodes_. -Every node is an instance of a node-type. S2SS currently supports the following node-types: +Every server needs clients which act as sinks / sources for simulation data. In case of VILLASnode these clients are called _nodes_. +Every node is an instance of a node-type. VILLASnode currently supports the following node-types: #### @subpage gtfpga - RTDS via GTFPGA and PCIexpress (Linux vfio, uio) diff --git a/doc/Tools.md b/doc/Tools.md index 4d534cbd1..9952aaebf 100644 --- a/doc/Tools.md +++ b/doc/Tools.md @@ -1,13 +1,13 @@ # Tools {#tools} -S2SS comes with a couple of tools to test and debug connectivity and configurations. -All S2SS tools are available as subcommands to the `s2ss` wrapper: +VILLASnode comes with a couple of tools to test and debug connectivity and configurations. +All VILLASnode tools are available as subcommands to the `villas` wrapper: -### `s2ss server` +### `villas node` Starts the simulator to simulator server. The server acts as a central gateway to forward simulation data. - Usage: s2ss-server CONFIG + Usage: villas-node CONFIG CONFIG is a required path to a configuration file Supported node types: @@ -17,21 +17,21 @@ Starts the simulator to simulator server. The server acts as a central gateway t - ngsi: OMA Next Generation Services Interface 10 (libcurl, libjansson, libuuid) - websocket: Send and receive samples of a WebSocket connection (libwebsockets) -### `s2ss pipe` +### `villas pipe` The `pipe` subcommand allows to read and write samples to `stdin` / `stdout`. - Usage: s2ss-pipe CONFIG [-r] NODE + Usage: villas-pipe CONFIG [-r] NODE CONFIG path to a configuration file NODE the name of the node to which samples are sent and received from -r swap read / write endpoints) -### `s2ss signal` +### `villas signal` The `signal` subcommand is a signal generator which writes samples to `stdout`. This command can be combined with the `pipe` subcommand. - Usage: s2ss-signal SIGNAL [OPTIONS] + Usage: villas-signal SIGNAL [OPTIONS] SIGNAL is on of: 'mixed', 'random', 'sine', 'triangle', 'square', 'ramp' -v NUM specifies how many values a message should contain -r HZ how many messages per second @@ -40,9 +40,9 @@ This command can be combined with the `pipe` subcommand. -d FLT the standard deviation for 'random' signals -l NUM only send LIMIT messages and stop -### `s2ss test` +### `villas test` - Usage: s2ss-test CONFIG TEST NODE [ARGS] + Usage: villas-test CONFIG TEST NODE [ARGS] CONFIG path to a configuration file TEST the name of the test to execute: 'rtt' NODE name of the node which shoud be used @@ -51,20 +51,20 @@ This command can be combined with the `pipe` subcommand. 1. Start server: - $ s2ss server etc/example.conf + $ villas node etc/example.conf 2. Receive/dump data to file - $ s2ss pipe etc/example.conf node_name > dump.csv + $ villas pipe etc/example.conf node_name > dump.csv 3. Replay recorded data: - $ s2ss pipe etc/example.conf -r node_name < dump.csv + $ villas pipe etc/example.conf -r node_name < dump.csv 4. Send random generated values: - $ s2ss signal random 4 100 | s2ss pipe etc/example.conf destination_node + $ villas signal random 4 100 | villas pipe etc/example.conf destination_node 5. Test ping/pong latency: - $ s2ss test latency etc/example.conf test_node \ No newline at end of file + $ villas test latency etc/example.conf test_node \ No newline at end of file diff --git a/doc/Tuning.md b/doc/Tuning.md index 495f6e532..8183c8c8f 100644 --- a/doc/Tuning.md +++ b/doc/Tuning.md @@ -7,14 +7,14 @@ A [PREEMPT_RT patched Linux](https://rt.wiki.kernel.org/index.php/Main_Page) ker Precompiled kernels for Fedora can be found here: http://ccrma.stanford.edu/planetccrma/software/ - Install `tuned` package and activate the `realtime` profile. This profile will: - - Reserve some CPU cores solely for S2SS (Kernel cmdline: `isolcpus=[cpu_numbers]`) + - Reserve some CPU cores solely for VILLASnode (Kernel cmdline: `isolcpus=[cpu_numbers]`) - Activate sub-profiles: - `network-latency` - `latency-performance` - See `/etc/tuned/realtime-variables.conf` - See `/usr/lib/tuned/realtime/` -- S2SS configuration: +- VILLASnode configuration: - `affinity`: Maps network card IRQs and threads to isolated cores - `priority`: Increases priority of network packets and threads diff --git a/doc/Usage.md b/doc/Usage.md index a3501510e..093dbcd92 100644 --- a/doc/Usage.md +++ b/doc/Usage.md @@ -1,11 +1,11 @@ # Usage {#usage} -The S2SS server (`s2ss server`) expects the path to a configuration file as a single argument. +VILLASnode (`villas node`) expects the path to a configuration file as a single argument. - Usage: ./s2ss-server CONFIG + Usage: ./villas-node CONFIG CONFIG is a required path to a configuration file - Simulator2Simulator Server 0.1-d7de19c (Jun 4 2014 02:50:13) + VILLASnode 0.1-d7de19c (Jun 4 2014 02:50:13) Copyright 2015, Institute for Automation of Complex Power Systems, EONERC Steffen Vogel @@ -24,7 +24,7 @@ The server requires root privileges for: - Or load .exe from this website (no installation required) http://the.earth.li/~sgtatham/putty/latest/x86/putty.exe -2. Connect to S2SS server +2. Connect to VILLASnode | Setting | Value | | :------- | :-------------- | @@ -34,9 +34,9 @@ The server requires root privileges for: | User | root | | Password | *please ask msv | -3. Go to S2SS directory +3. Go to VILLASnode directory - $ cd /s2ss/ + $ cd /villas/ 4. Edit configuration file @@ -48,7 +48,7 @@ The server requires root privileges for: 5. Start server - $ s2ss server etc/opal-test.conf + $ villas node etc/opal-test.conf 6. Terminate server by pressing Ctrl+C diff --git a/doc/nodes/LabView.md b/doc/nodes/LabView.md index f9f335989..33f5e7731 100644 --- a/doc/nodes/LabView.md +++ b/doc/nodes/LabView.md @@ -1,6 +1,6 @@ # LabView {#labview} -We build an example LabView model which is using the UDP message format of the `socket` node-type to communicate with the S2SS server. +We build an example LabView model which is using the UDP message format of the `socket` node-type to communicate with VILLASnode. Have a look at the `clients/labview/` directory. diff --git a/doc/nodes/OPAL.md b/doc/nodes/OPAL.md index 55792261b..eb8b0c3a5 100644 --- a/doc/nodes/OPAL.md +++ b/doc/nodes/OPAL.md @@ -1,13 +1,13 @@ # OPAL-RT Asynchronous Process {#opal} -The communication between OPAL-RT models and the S2SS is established by using asynchronous programs. +The communication between OPAL-RT models and VILLASnode is established by using asynchronous programs. Asynchronous programs are are a feature of RT-LAB. They are used to exchange data between Simulink models and custom C programs. There are two ways to exchange sample values with an OPAL-RT simulator: 1. Use our adapted version of OPAL-RT's AsyncIP example for asynchronous processes (see `clients/opal/` directory) - In this mode, OPAL will send sample data via UDP to S2SS. S2SS has to use the `socket` node-type. -2. Run S2SS as an asynchronous process itself. This is a highly experimental feature and implemented in the node-type `opal`. - It requires a 32-bit version of the `s2ss-server`. Data exchange is then handled using OPAL-RT's libOpalAsyncApi. + In this mode, OPAL will send sample data via UDP to VILLASnode. VILLASnode has to use the `socket` node-type. +2. Run VILLASnode as an asynchronous process itself. This is a highly experimental feature and implemented in the node-type `opal`. + It requires a 32-bit version of the `villas-node`. Data exchange is then handled using OPAL-RT's libOpalAsyncApi. The following description applies only to the `opal` node-type: diff --git a/doc/nodes/Socket.md b/doc/nodes/Socket.md index 308bfc881..486453be8 100644 --- a/doc/nodes/Socket.md +++ b/doc/nodes/Socket.md @@ -98,7 +98,7 @@ This allows us to reduce the amount of conversions during one transfer. ## Network Emulation {#netem} -S2SS supports the emulation of wide-area network characterisics. +VILLASnode supports the emulation of wide-area network characterisics. This emulation can be configured on a per-node basis for **outgoing** (egress) data only. Incoming data is not processed by the network emulation! @@ -106,7 +106,7 @@ Incoming data is not processed by the network emulation! This network emulation is handled by Linux' [netem queuing discipline](http://www.linuxfoundation.org/collaborate/workgroups/networking/netem) which is part of the traffic control subsystem. Take a look at the following manual page for supported metrics: [tc-netem(8)](http://man7.org/linux/man-pages/man8/tc-netem.8.html). -S2SS only takes care of setup and initalizing the netem queuing discipline inside the kernel. +VILLASnode only takes care of setup and initalizing the netem queuing discipline inside the kernel. For this the iproute2 software package (`ip` & `tc` commands) must be installed. The configuration is done via the config file. Look at `etc/example.conf` for a section called `netem` or `tc-netem(8)` for more details. diff --git a/doc/nodes/WebSocket.md b/doc/nodes/WebSocket.md index a59e97eb0..81a46949e 100644 --- a/doc/nodes/WebSocket.md +++ b/doc/nodes/WebSocket.md @@ -16,7 +16,7 @@ There is no node specific configuration. http = { port = 8080; - htdocs = "/opt/s2ss/contrib/websocket/"; + htdocs = "/villas/contrib/websocket/"; ssl_cert = "/etc/ssl/certs/mycert.pem"; ssl_private_key= "/etc/ssl/private/mykey.pem"; } \ No newline at end of file diff --git a/etc/example.conf b/etc/example.conf index a11fb4b2e..d27994b05 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -1,4 +1,4 @@ -# Example configuration file for the S2SS server +# Example configuration file for VILLASnode # # This example includes all valid configuration options for the server. # Please note, that using all options at the same time does not really @@ -27,7 +27,7 @@ debug = 5; # The level of verbosity for debug messages stats = 3; # The interval in seconds to print path statistics. # A value of 0 disables the statistics. -name = "s2ss-acs" # The name of this S2SS instance. Might by used by node-types +name = "villas-acs" # The name of this VILLASnode. Might by used by node-types # to identify themselves (default is the hostname). diff --git a/etc/websocket-stats.conf b/etc/websocket-stats.conf index 24122d4c1..c350efed6 100644 --- a/etc/websocket-stats.conf +++ b/etc/websocket-stats.conf @@ -5,7 +5,7 @@ * * @author Steffen Vogel * @copyright 2014-2015, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/cfg.h b/include/cfg.h index 52b2a2c57..cfc93c954 100644 --- a/include/cfg.h +++ b/include/cfg.h @@ -7,7 +7,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/file.h b/include/file.h index 2d65a2f84..3eba00fa6 100644 --- a/include/file.h +++ b/include/file.h @@ -5,7 +5,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ /** diff --git a/include/gtfpga.h b/include/gtfpga.h index 1d3430e94..2ba68f773 100644 --- a/include/gtfpga.h +++ b/include/gtfpga.h @@ -8,7 +8,7 @@ * @file * @author Steffen Vogel * @copyright 2015-2016, Steffen Vogel - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ /** diff --git a/include/hist.h b/include/hist.h index edfec67b6..72b232a21 100644 --- a/include/hist.h +++ b/include/hist.h @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/hooks.h b/include/hooks.h index 71cdbd403..67356df87 100644 --- a/include/hooks.h +++ b/include/hooks.h @@ -9,7 +9,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ /** diff --git a/include/if.h b/include/if.h index 22d4ada2c..3d676694b 100644 --- a/include/if.h +++ b/include/if.h @@ -6,7 +6,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/kernel.h b/include/kernel.h index 08ca042ae..daf63dc1e 100644 --- a/include/kernel.h +++ b/include/kernel.h @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/list.h b/include/list.h index 4e7568521..4487ad10c 100644 --- a/include/list.h +++ b/include/list.h @@ -9,7 +9,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/log.h b/include/log.h index d09757a2e..c993a72f5 100644 --- a/include/log.h +++ b/include/log.h @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/lstack.h b/include/lstack.h index 86882184e..d5e4858b4 100644 --- a/include/lstack.h +++ b/include/lstack.h @@ -8,7 +8,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/msg.h b/include/msg.h index 3ace639a0..8379969f5 100644 --- a/include/msg.h +++ b/include/msg.h @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/msg_format.h b/include/msg_format.h index 58d3eb778..3762825f2 100644 --- a/include/msg_format.h +++ b/include/msg_format.h @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/ngsi.h b/include/ngsi.h index 28a5767ba..8b9c20fae 100644 --- a/include/ngsi.h +++ b/include/ngsi.h @@ -9,7 +9,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ /** diff --git a/include/nl.h b/include/nl.h index 90491601e..6e1fb055e 100644 --- a/include/nl.h +++ b/include/nl.h @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/node.h b/include/node.h index 3e72eec05..7cb8394db 100644 --- a/include/node.h +++ b/include/node.h @@ -1,15 +1,9 @@ /** Nodes - * - * The S2SS server connects multiple nodes. - * There are multiple types of nodes: - * - simulators - * - servers - * - workstations * * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. * * @addtogroup node Node diff --git a/include/opal.h b/include/opal.h index e392f48ae..e1b1fb390 100644 --- a/include/opal.h +++ b/include/opal.h @@ -5,7 +5,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ /** diff --git a/include/path.h b/include/path.h index b975ef925..fa6c9839e 100644 --- a/include/path.h +++ b/include/path.h @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ /** A path connects one input node to multiple output nodes (1-to-n). diff --git a/include/pool.h b/include/pool.h index 6131f1a94..bfa77935b 100644 --- a/include/pool.h +++ b/include/pool.h @@ -5,7 +5,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ diff --git a/include/queue.h b/include/queue.h index cbe9ee3ea..feee51e4f 100644 --- a/include/queue.h +++ b/include/queue.h @@ -12,7 +12,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ diff --git a/include/sample.h b/include/sample.h index 7875ce3d2..2a6c02767 100644 --- a/include/sample.h +++ b/include/sample.h @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ diff --git a/include/socket.h b/include/socket.h index 166f81e5c..4af49ed20 100644 --- a/include/socket.h +++ b/include/socket.h @@ -5,7 +5,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ /** diff --git a/include/tc.h b/include/tc.h index 832206998..973da527b 100644 --- a/include/tc.h +++ b/include/tc.h @@ -8,7 +8,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/timing.h b/include/timing.h index 814535859..20b2e6baf 100644 --- a/include/timing.h +++ b/include/timing.h @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/utils.h b/include/utils.h index 8e4dd922b..5cf34ab37 100644 --- a/include/utils.h +++ b/include/utils.h @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/include/websocket.h b/include/websocket.h index d60fd7ee3..10af64f06 100644 --- a/include/websocket.h +++ b/include/websocket.h @@ -6,7 +6,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ /** diff --git a/lib/cfg.c b/lib/cfg.c index 8f5bcfc31..8498f71c2 100644 --- a/lib/cfg.c +++ b/lib/cfg.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/file.c b/lib/file.c index cf3c2e55a..51459401e 100644 --- a/lib/file.c +++ b/lib/file.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/gtfpga.c b/lib/gtfpga.c index 7e07921d2..72dbc5cc4 100644 --- a/lib/gtfpga.c +++ b/lib/gtfpga.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2015-2016, Steffen Vogel - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/hist.c b/lib/hist.c index 02cb3ba4e..8f29f6597 100644 --- a/lib/hist.c +++ b/lib/hist.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/hooks-other.c b/lib/hooks-other.c index 1d69542b0..06db59450 100644 --- a/lib/hooks-other.c +++ b/lib/hooks-other.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/hooks-stats.c b/lib/hooks-stats.c index f0af6273c..7d178e11a 100644 --- a/lib/hooks-stats.c +++ b/lib/hooks-stats.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/hooks.c b/lib/hooks.c index 2c1a7c6a2..ea4745e80 100644 --- a/lib/hooks.c +++ b/lib/hooks.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/if.c b/lib/if.c index 9ec35f07e..ccde603bd 100644 --- a/lib/if.c +++ b/lib/if.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/kernel.c b/lib/kernel.c index b2ff8c396..922e1c854 100644 --- a/lib/kernel.c +++ b/lib/kernel.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/list.c b/lib/list.c index 55be8c7ba..36c321c64 100644 --- a/lib/list.c +++ b/lib/list.c @@ -4,7 +4,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/log.c b/lib/log.c index 2986e3c15..5f7a3e90d 100644 --- a/lib/log.c +++ b/lib/log.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ @@ -96,7 +96,7 @@ void log_vprint(const char *lvl, const char *fmt, va_list ap) /* Output */ #ifdef ENABLE_OPAL_ASYNC - OpalPrint("S2SS: %s\n", buf); + OpalPrint("VILLASnode: %s\n", buf); #endif fprintf(stderr, "\r%s\n", buf); free(buf); diff --git a/lib/lstack.c b/lib/lstack.c index 0b6c8ff56..d930b9cd9 100644 --- a/lib/lstack.c +++ b/lib/lstack.c @@ -7,7 +7,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/msg.c b/lib/msg.c index b888c1abc..04fae60d1 100644 --- a/lib/msg.c +++ b/lib/msg.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/ngsi.c b/lib/ngsi.c index de83d9830..2302e6e7b 100644 --- a/lib/ngsi.c +++ b/lib/ngsi.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. **********************************************************************************/ diff --git a/lib/nl.c b/lib/nl.c index c07dd0bd1..a7d3ed8c7 100644 --- a/lib/nl.c +++ b/lib/nl.c @@ -1,10 +1,10 @@ /** Netlink related functions. * - * S2SS uses libnl3 to talk to the Linux kernel to gather networking related information + * VILLASnode uses libnl3 to talk to the Linux kernel to gather networking related information * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/node.c b/lib/node.c index 4a7396b52..7baa1a407 100644 --- a/lib/node.c +++ b/lib/node.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/opal.c b/lib/opal.c index 76ccf586b..d6a268384 100644 --- a/lib/opal.c +++ b/lib/opal.c @@ -4,7 +4,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ @@ -72,7 +72,7 @@ int opal_init(int argc, char *argv[], config_setting_t *cfg) error("Failed to get list of recv ids (%d)", err); info("Started as OPAL Asynchronous process"); - info("This is Simulator2Simulator Server (S2SS) %s (built on %s, %s)", + info("This is VILLASnode %s (built on %s, %s)", VERSION, __DATE__, __TIME__); opal_print_global(); diff --git a/lib/path.c b/lib/path.c index 4aabbde86..585c6b20b 100644 --- a/lib/path.c +++ b/lib/path.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/pool.c b/lib/pool.c index fbcf2c084..28af00428 100644 --- a/lib/pool.c +++ b/lib/pool.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ diff --git a/lib/queue.c b/lib/queue.c index ab6790d6d..40b420693 100644 --- a/lib/queue.c +++ b/lib/queue.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. */ diff --git a/lib/sample.c b/lib/sample.c index bad1ecdc1..8206bb97e 100644 --- a/lib/sample.c +++ b/lib/sample.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/socket.c b/lib/socket.c index 28c5bdc0d..db84f136d 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ @@ -451,7 +451,7 @@ int socket_parse_addr(const char *addr, struct sockaddr *saddr, enum socket_laye if (!link) error("Failed to get network interface: '%s'", ifname); - sa->sll.sll_protocol = htons((proto) ? strtol(proto, NULL, 0) : ETH_P_S2SS); + sa->sll.sll_protocol = htons((proto) ? strtol(proto, NULL, 0) : ETH_P_VILLAS); sa->sll.sll_halen = 6; sa->sll.sll_family = AF_PACKET; sa->sll.sll_ifindex = rtnl_link_get_ifindex(link); @@ -477,7 +477,7 @@ int socket_parse_addr(const char *addr, struct sockaddr *saddr, enum socket_laye switch (layer) { case LAYER_IP: hint.ai_socktype = SOCK_RAW; - hint.ai_protocol = (service) ? strtol(service, NULL, 0) : IPPROTO_S2SS; + hint.ai_protocol = (service) ? strtol(service, NULL, 0) : IPPROTO_VILLAS; hint.ai_flags |= AI_NUMERICSERV; break; diff --git a/lib/tc.c b/lib/tc.c index 95e8aacdb..6be3ce0b8 100644 --- a/lib/tc.c +++ b/lib/tc.c @@ -1,10 +1,10 @@ /** Traffic control (tc): setup interface queuing desciplines. * - * S2SS uses these functions to setup the network emulation feature. + * VILLASnode uses these functions to setup the network emulation feature. * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/timing.c b/lib/timing.c index e3e9820a1..5f8529f36 100644 --- a/lib/timing.c +++ b/lib/timing.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/utils.c b/lib/utils.c index c3240e021..918841a75 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ @@ -21,9 +21,9 @@ void print_copyright() { - printf("Simulator2Simulator Server %s (built on %s %s)\n", + printf("VILLASnode %s (built on %s %s)\n", BLU(VERSION), MAG(__DATE__), MAG(__TIME__)); - printf(" copyright 2014-2015, Institute for Automation of Complex Power Systems, EONERC\n"); + printf(" copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC\n"); printf(" Steffen Vogel \n"); } diff --git a/lib/websocket-http.c b/lib/websocket-http.c index bdb8782c5..ef7153e9e 100644 --- a/lib/websocket-http.c +++ b/lib/websocket-http.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/websocket-live.c b/lib/websocket-live.c index 4dff1d72c..864b22887 100644 --- a/lib/websocket-live.c +++ b/lib/websocket-live.c @@ -5,7 +5,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/lib/websocket.c b/lib/websocket.c index ece8725ce..c00c7e8bd 100644 --- a/lib/websocket.c +++ b/lib/websocket.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/src/pipe.c b/src/pipe.c index 1359ea3c2..32b426d6b 100644 --- a/src/pipe.c +++ b/src/pipe.c @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. * * @addtogroup tools Test and debug tools diff --git a/src/server.c b/src/server.c index bcdd6cb8a..579b3d25f 100644 --- a/src/server.c +++ b/src/server.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ @@ -144,7 +144,7 @@ int main(int argc, char *argv[]) char *configfile = (argc == 2) ? argv[1] : "opal-shmem.conf"; log_init(); - info("This is Simulator2Simulator Server (S2SS) %s (built on %s, %s)", BLD(YEL(VERSION)), + info("This is VILLASnode %s (built on %s, %s)", BLD(YEL(VERSION)), BLD(MAG(__DATE__)), BLD(MAG(__TIME__))); /* Checks system requirements*/ diff --git a/src/signal.c b/src/signal.c index 8e5178e96..dfac63271 100644 --- a/src/signal.c +++ b/src/signal.c @@ -3,7 +3,7 @@ * @file * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. * * @addtogroup tools Test and debug tools @@ -112,7 +112,7 @@ check: if (optarg == endptr) struct sample *s = alloc(SAMPLE_LEN(values)); /* Print header */ - printf("# S2SS signal params: type=%s, values=%u, rate=%f, limit=%d, amplitude=%f, freq=%f\n", + printf("# VILLASnode signal params: type=%s, values=%u, rate=%f, limit=%d, amplitude=%f, freq=%f\n", argv[1], values, rate, limit, ampl, freq); printf("# %-20s\t\t%s\n", "sec.nsec(seq)", "data[]"); diff --git a/src/test.c b/src/test.c index 047c056ad..3cd4c613f 100644 --- a/src/test.c +++ b/src/test.c @@ -2,7 +2,7 @@ * * @author Steffen Vogel * @copyright 2014-2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of S2SS. All Rights Reserved. Proprietary and confidential. + * This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. * Unauthorized copying of this file, via any medium is strictly prohibited. *********************************************************************************/ diff --git a/tools/python/README.md b/tools/python/README.md index a12819265..2e703ac5b 100644 --- a/tools/python/README.md +++ b/tools/python/README.md @@ -1,6 +1,6 @@ # Python tools -These python scripts are intended to manipulate measurements recorded by S2SS's `file` node-type. +These python scripts are intended to manipulate measurements recorded by VILLASnode's `file` node-type. ## Exampples diff --git a/tools/python/file-filter.py b/tools/python/file-filter.py index c7eefd294..de9e145d6 100755 --- a/tools/python/file-filter.py +++ b/tools/python/file-filter.py @@ -2,19 +2,19 @@ import sys -import s2ss -from s2ss import * +import villas +from villas import * def main(): if len(sys.argv) != 3: print "Usage: %s from to" % (sys.argv[0]) sys.exit(-1) - start = s2ss.Timestamp.parse(sys.argv[1]) - end = s2ss.Timestamp.parse(sys.argv[2]) + start = villas.Timestamp.parse(sys.argv[1]) + end = villas.Timestamp.parse(sys.argv[2]) for line in sys.stdin: - msg = s2ss.Message.parse(line) + msg = villas.Message.parse(line) if start <= msg.ts <= end: print msg diff --git a/tools/python/file-merge.py b/tools/python/file-merge.py index c2e58a8cd..8188ba129 100755 --- a/tools/python/file-merge.py +++ b/tools/python/file-merge.py @@ -2,8 +2,8 @@ import sys -import s2ss -from s2ss import * +import villas +from villas import * def main(): files = sys.argv[1:] @@ -16,10 +16,10 @@ def main(): msgs = [ ] for line in handle.xreadlines(): - msgs.append(s2ss.Message.parse(line, file)) + msgs.append(villas.Message.parse(line, file)) all += msgs - last[file] = s2ss.Message(s2ss.Timestamp(), [0] * len(msgs[0].values), file) + last[file] = villas.Message(villas.Timestamp(), [0] * len(msgs[0].values), file) all.sort() for msg in all: @@ -29,7 +29,7 @@ def main(): for file in files: values += last[file].values - print s2ss.Message(msg.ts, values, "") + print villas.Message(msg.ts, values, "") if __name__ == "__main__": main() diff --git a/tools/python/s2ss/__init__.py b/tools/python/villas/__init__.py similarity index 100% rename from tools/python/s2ss/__init__.py rename to tools/python/villas/__init__.py diff --git a/tools/python/s2ss/msg.py b/tools/python/villas/msg.py similarity index 86% rename from tools/python/s2ss/msg.py rename to tools/python/villas/msg.py index 1905fc77a..a4801ff78 100644 --- a/tools/python/s2ss/msg.py +++ b/tools/python/villas/msg.py @@ -1,7 +1,7 @@ from . import ts class Message: - """Parsing a S2SS from a file (not a UDP package!!)""" + """Parsing a VILLASnode sample from a file (not a UDP package!!)""" def __init__(self, ts, values, source = None): self.source = source diff --git a/tools/python/s2ss/ocb.py b/tools/python/villas/ocb.py similarity index 100% rename from tools/python/s2ss/ocb.py rename to tools/python/villas/ocb.py diff --git a/tools/python/s2ss/ts.py b/tools/python/villas/ts.py similarity index 94% rename from tools/python/s2ss/ts.py rename to tools/python/villas/ts.py index 0b4ac7384..511d444d2 100644 --- a/tools/python/s2ss/ts.py +++ b/tools/python/villas/ts.py @@ -1,7 +1,7 @@ import re class Timestamp: - """Parsing the S2SS timestamp format""" + """Parsing the VILLASnode human-readable timestamp format""" def __init__(self, seconds = 0, nanoseconds = None, offset = None, sequence = None): self.seconds = seconds diff --git a/tools/tests.sh b/tools/tests.sh index fdb36faff..ab49eb1fb 100755 --- a/tools/tests.sh +++ b/tools/tests.sh @@ -14,9 +14,9 @@ LOCAL_PORT=12001 REMOTE_IP=127.0.0.1 REMOTE_PORT=12002 -#LOCAL_DIR=/s2ss/server/ -#REMOTE_DIR=/s2ss/server/ -LOCAL_DIR=/home/stv0g/workspace/rwth/acs/s2ss/server +#LOCAL_DIR=/villas/server/ +#REMOTE_DIR=/villas/server/ +LOCAL_DIR=/home/stv0g/workspace/rwth/acs/villas/server REMOTE_DIR=$LOCAL_DIR ######################### End of Configuration ################################ # There's no need to change something below this line diff --git a/tools/s2ss.sh b/tools/villas.sh similarity index 72% rename from tools/s2ss.sh rename to tools/villas.sh index 3db0f4c11..a2d8fc01f 100755 --- a/tools/s2ss.sh +++ b/tools/villas.sh @@ -1,20 +1,20 @@ #!/bin/bash -# Wrapper to start tool of the S2SS suite +# Wrapper to start tool of the VILLASnode suite # -# This allows you to use S2SS tools like this: -# $ s2ss server /etc/cosima/test.cfg +# This allows you to use VILLASnode tools like this: +# $ villas node /etc/villas/test.cfg # # Install by: # $ make install # # @author Steffen Vogel # @copyright 2014-2015, Institute for Automation of Complex Power Systems, EONERC -# This file is part of S2SS. All Rights Reserved. Proprietary and confidential. +# This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential. # Unauthorized copying of this file, via any medium is strictly prohibited. # ################################################################################## -PREFIX=s2ss +PREFIX=villas # Get a list of all available tools TOOLS=$(compgen -c | egrep "^$PREFIX-" | sort | cut -d- -f2 | paste -sd\|) @@ -27,7 +27,7 @@ ARGS=${@:2} # Check if tool is available if ! [[ "$TOOL" =~ $(echo ^\($TOOLS\)$) ]]; then - echo "Usage s2ss ($TOOLS)" 1>&2 + echo "Usage villas ($TOOLS)" 1>&2 exit 1 fi