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

node-smu: receive time signal from kernel module

Browse source 
Signed-off-by: Manuel Pitz <manuel.pitz@eonerc.rwth-aachen.de>
This commit is contained in:
Manuel Pitz 2023-09-19 16:36:02 +02:00 • committed by Alexandra
parent 6de1d8f239
commit 5cd2662fe8
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/villas/nodes/smu.hpp
View file

@ -152,7 +152,10 @@ typedef struct {
float k[SMU_NCH]; float k[SMU_NCH];
} __attribute__((__packed__)) smu_mcsk_t; } __attribute__((__packed__)) smu_mcsk_t;
typedef struct {
int64_t tv_sec;
long tv_nsec;
} __attribute__((__packed__)) timespec64_t;
/** /**
* @brief IOCTL definitions * @brief IOCTL definitions
* *
@ -165,8 +168,10 @@ typedef struct {
#define SMU_IOC_RESET _IO (SMU_IOC_MAGIC, 1) #define SMU_IOC_RESET _IO (SMU_IOC_MAGIC, 1)
#define SMU_IOC_START _IO (SMU_IOC_MAGIC, 2) #define SMU_IOC_START _IO (SMU_IOC_MAGIC, 2)
#define SMU_IOC_STOP _IO (SMU_IOC_MAGIC, 3) #define SMU_IOC_STOP _IO (SMU_IOC_MAGIC, 3)
#define SMU_IOC_SET_CONF _IOW(SMU_IOC_MAGIC, 4, smu_conf_t*) #define SMU_IOC_GET_TIME _IOR(SMU_IOC_MAGIC, 4, timespec64_t*)
#define SMU_IOC_GET_CONF _IOR(SMU_IOC_MAGIC, 5, smu_conf_t*) #define SMU_IOC_SET_CONF _IOW(SMU_IOC_MAGIC, 5, smu_conf_t*)
#define SMU_IOC_GET_CONF _IOR(SMU_IOC_MAGIC, 6, smu_conf_t*)
/** /**
* @brief Signal definitions * @brief Signal definitions
@ -190,7 +195,7 @@ private:
daq_sync_t sync; daq_sync_t sync;
smu_daq_t daq_cfg; smu_daq_t daq_cfg;
Dumper dumpers[SMU_NCH]; Dumper dumpers[SMU_NCH];
int fd; static inline int fd;
uint8_t* shared_mem; uint8_t* shared_mem;
uint32_t shared_mem_pos; uint32_t shared_mem_pos;
uint32_t shared_mem_inc; uint32_t shared_mem_inc;
@ -202,6 +207,9 @@ private:
static inline std::atomic<size_t> mem_pos = 0; static inline std::atomic<size_t> mem_pos = 0;
static inline pthread_mutex_t mutex; static inline pthread_mutex_t mutex;
static inline pthread_cond_t cv; static inline pthread_cond_t cv;
static inline timespec64_t sync_signal_mem_pos = {0};
static inline timespec sample_time ={0};
static inline int sec_cnt = 0;
protected: protected:
virtual virtual

18
lib/nodes/smu.cpp
View file

@ -241,9 +241,15 @@ int SMUNode::stop()
void SMUNode::sync_signal(int, siginfo_t *info, void*) void SMUNode::sync_signal(int, siginfo_t *info, void*)
{ {
//mem_pos = (info->si_value.sival_int);
/* Signal uldaq_read() about new data */ ioctl(fd, SMU_IOC_GET_TIME,&sync_signal_mem_pos);
//pthread_cond_signal(&u->in.cv); sample_time.tv_nsec = sync_signal_mem_pos.tv_nsec;
sample_time.tv_sec = sync_signal_mem_pos.tv_sec;
if (sample_time.tv_nsec > 500000000)
sample_time.tv_sec += 1;
sec_cnt = 0;
//std::cout << "pps event";
} }
void SMUNode::data_available_signal(int, siginfo_t *info, void*) void SMUNode::data_available_signal(int, siginfo_t *info, void*)
@ -258,8 +264,8 @@ void SMUNode::data_available_signal(int, siginfo_t *info, void*)
int SMUNode::_read(struct Sample *smps[], unsigned cnt) int SMUNode::_read(struct Sample *smps[], unsigned cnt)
{ {
struct timespec ts; struct timespec ts;
ts.tv_sec = time(nullptr); ts.tv_sec = sample_time.tv_sec;
ts.tv_nsec = 0; ts.tv_nsec = sec_cnt * 1e9 / fps;
pthread_mutex_lock(&mutex); pthread_mutex_lock(&mutex);
@ -271,6 +277,7 @@ int SMUNode::_read(struct Sample *smps[], unsigned cnt)
for (unsigned j = 0; j < cnt; j++) { for (unsigned j = 0; j < cnt; j++) {
struct Sample *t = smps[j]; struct Sample *t = smps[j];
ts.tv_nsec += 1000 * 1000 * sample_rate;
for (unsigned i = 0; i < 8; i++) { for (unsigned i = 0; i < 8; i++) {
int16_t data = p[mem_pos_local].ch[i]; int16_t data = p[mem_pos_local].ch[i];
@ -280,6 +287,7 @@ int SMUNode::_read(struct Sample *smps[], unsigned cnt)
} }
mem_pos_local++; mem_pos_local++;
ts.tv_nsec = 0;
t->flags = (int) SampleFlags::HAS_TS_ORIGIN | (int) SampleFlags::HAS_DATA | (int) SampleFlags::HAS_SEQUENCE; t->flags = (int) SampleFlags::HAS_TS_ORIGIN | (int) SampleFlags::HAS_DATA | (int) SampleFlags::HAS_SEQUENCE;
t->ts.origin = ts; t->ts.origin = ts;