Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

Move villasDump from dft to dumper class

Browse source
This commit is contained in:
Manuel Pitz 2020-10-12 15:26:03 +02:00
parent 9b58bd15c8
commit 6cacb0a2b2
4 changed files with 144 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
include/villas/dumper.hpp Normal file
View file

@ -0,0 +1,42 @@
/** Dump fields and values in a socket to plot them with villasDump.py.
*
* @file
* @author Manuel Pitz <manuel.pitz@eonerc.rwth-aachen.de>
* @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
* @license GNU General Public License (version 3)
*
* VILLASnode
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************************/
#include <string>
namespace villas {
namespace node {
class Dumper {
protected:
int socketFd;
std::string socketName;
public:
Dumper(std::string socketNameIn);
~Dumper();
int openSocket(std::string socketNameIn);
void closeSocket();
void writeData(uint len, double* yData, double* xData = nullptr);
};
}
}

1
lib/CMakeLists.txt
View file

@ -48,6 +48,7 @@ endif()
set(LIB_SRC
config_helper.cpp
config.cpp
dumper.cpp
mapping.cpp
memory.cpp
memory/heap.cpp

89
lib/dumper.cpp Normal file
View file

@ -0,0 +1,89 @@
/** Dump fields and values in a socket to plot them with villasDump.py.
*
* @file
* @author Manuel Pitz <manuel.pitz@eonerc.rwth-aachen.de>
* @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
* @license GNU General Public License (version 3)
*
* VILLASnode
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************************/
#include "villas/dumper.hpp"
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
#include "villas/log.h"
#include <unistd.h>
using namespace villas;
using namespace villas::node;
Dumper::Dumper(std::string socketNameIn) :
socketName("")
{
openSocket(socketNameIn);
}
Dumper::~Dumper() {
closeSocket();
}
int Dumper::openSocket(std::string socketNameIn) {
socketName = socketNameIn;
socketFd = socket(AF_LOCAL,SOCK_STREAM, 0);
if (socketFd < 0) {
info("Error creating socket %s", socketName.c_str());
return -1;
}
sockaddr_un socketaddr_un;
socketaddr_un.sun_family = AF_UNIX;
strcpy(socketaddr_un.sun_path, socketName.c_str());
socketName = socketNameIn;
//unlink(socketName.c_str());
//bind(socketFd, (struct sockaddr *) &socketaddr_un, sizeof(socketaddr_un));
connect(socketFd, (struct sockaddr *) &socketaddr_un, sizeof(socketaddr_un));
return 1;
}
void Dumper::closeSocket() {
info("Remove socket");
//unlink(socketName.c_str());
close(socketFd);
}
void Dumper::writeData(uint len, double* yData, double* xData) {
ssize_t bytesWritten;
for (uint i = 0; i<len; i++) {
std::string str = std::to_string(yData[i]);
if( xData != nullptr) {
str+= ";" + std::to_string(xData[i]);
}
str += "\n";
bytesWritten = write(socketFd, str.c_str(), str.length());
if( (long unsigned int) bytesWritten != str.length() ) {
warning("Could not send all content to socket %s", socketName.c_str());
}
}
}

122
lib/hooks/dft.cpp
View file

@ -25,87 +25,18 @@
*/
#include <cstring>
#include "villas/dumper.hpp"
#include <villas/hook.hpp>
#include <villas/path.h>
#include <villas/sample.h>
#include <villas/io.h>
#include <villas/plugin.h>
#include <complex>
#include <iostream>
#include <fstream>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
namespace villas {
namespace node {
class dataDump {
protected:
int socketFd;
std::string socketName;
public:
dataDump(std::string socketNameIn) :
socketName("")
{
openSocket(socketNameIn);
}
~dataDump() {
closeSocket();
}
int openSocket(std::string socketNameIn) {
socketName = socketNameIn;
socketFd = socket(AF_LOCAL,SOCK_STREAM, 0);
if (socketFd < 0) {
info("Error creating socket %s", socketName.c_str());
return -1;
}
sockaddr_un socketaddr_un;
socketaddr_un.sun_family = AF_UNIX;
strcpy(socketaddr_un.sun_path, socketName.c_str());
socketName = socketNameIn;
//unlink(socketName.c_str());
//bind(socketFd, (struct sockaddr *) &socketaddr_un, sizeof(socketaddr_un));
connect(socketFd, (struct sockaddr *) &socketaddr_un, sizeof(socketaddr_un));
return 1;
}
void closeSocket() {
info("Remove socket");
//unlink(socketName.c_str());
close(socketFd);
}
void writeData(uint len, double* yData, double* xData = nullptr) {
ssize_t bytesWritten;
for (uint i = 0; i<len; i++) {
std::string str = std::to_string(yData[i]);
if( xData != nullptr) {
str+= ";" + std::to_string(xData[i]);
}
str += "\n";
bytesWritten = write(socketFd, str.c_str(), str.length());
if( (long unsigned int) bytesWritten != str.length() ) {
warning("Could not send all content to socket %s", socketName.c_str());
}
}
}
};
class DftHook : public Hook {
protected:
@ -121,10 +52,10 @@ protected:
HAMMING
};
dataDump* originalSignalDump;
dataDump* ppsSignalDump;
dataDump* originalSignalDumpSynced;
dataDump* ppsSignalDumpSynced;
Dumper* originalSignalDump;
Dumper* ppsSignalDump;
Dumper* originalSignalDumpSynced;
Dumper* ppsSignalDumpSynced;
windowType window_type;
paddingType padding_type;
@ -184,10 +115,10 @@ public:
{
format = format_type_lookup("villas.human");
originalSignalDump = new dataDump("/tmp/plot/originalSignalDump");
ppsSignalDump = new dataDump("/tmp/plot/ppsSignalDump");
originalSignalDumpSynced = new dataDump("/tmp/plot/originalSignalDumpSynced");
ppsSignalDumpSynced = new dataDump("/tmp/plot/ppsSignalDumpSynced");
originalSignalDump = new Dumper("/tmp/plot/originalSignalDump");
ppsSignalDump = new Dumper("/tmp/plot/ppsSignalDump");
originalSignalDumpSynced = new Dumper("/tmp/plot/originalSignalDumpSynced");
ppsSignalDumpSynced = new Dumper("/tmp/plot/ppsSignalDumpSynced");
}
virtual void prepare(){
@ -408,35 +339,6 @@ public:
delete ppsSignalDump;
}
void appendDumpData(const char *path, double ydata){
std::ofstream fh;
fh.open(path,std::ios_base::app);
if(fh.tellp()>0)
fh << ";";
fh << ydata;
fh.close();
}
void dumpData(const char *path, double *ydata, uint size, double *xdata=nullptr){
std::ofstream fh;
fh.open(path);
for(uint i = 0 ; i < size ; i++){
if(i>0)fh << ";";
fh << ydata[i];
}
if(xdata){
fh << "\n";
for(uint i = 0 ; i < size ; i++){
if(i>0)fh << ";";
fh << xdata[i];
}
}
fh.close();
}
void genDftMatrix(){
using namespace std::complex_literals;
@ -480,9 +382,9 @@ return;
for(uint i = 0; i< window_size; i++){
tmp_smp_window[i] *= filterWindowCoefficents[i];
}
dumpData("/tmp/plot/signal_windowed",tmp_smp_window,window_size);
//dumpData("/tmp/plot/signal_windowed",tmp_smp_window,window_size);
dumpData("/tmp/plot/smp_window",smp_memory,window_size);
//dumpData("/tmp/plot/smp_window",smp_memory,window_size);
for( uint i=0; i < freq_count; i++){
dftResults[i] = 0;
@ -529,7 +431,7 @@ return;
}
}
window_corretion_factor /= window_size;
dumpData("/tmp/plot/filter_window",filterWindowCoefficents,window_size);
//dumpData("/tmp/plot/filter_window",filterWindowCoefficents,window_size);
}
};