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

uldaq: fix sequence number and deadlock

Browse source
This commit is contained in:
Steffen Vogel 2018-09-25 20:38:34 +02:00
parent d734eb82b4
commit fa2667986b
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/nodes/uldaq.c
View file

@ -315,7 +315,8 @@ int uldaq_check(struct node *n)
void uldaq_data_available(DaqDeviceHandle device_handle, DaqEventType event_type, unsigned long long event_data, void *ctx)
{
UlError err;
struct uldaq *u = (struct uldaq *) ctx;
struct node *n = (struct node *) ctx;
struct uldaq *u = (struct uldaq *) n->_vd;
pthread_mutex_lock(&u->in.mutex);
@ -387,7 +388,7 @@ int uldaq_start(struct node *n)
}
/* Enable the event to be notified every time samples are available */
err = ulEnableEvent(u->device_handle, DE_ON_DATA_AVAILABLE, n->in.vectorize, uldaq_data_available, u);
err = ulEnableEvent(u->device_handle, DE_ON_DATA_AVAILABLE, n->in.vectorize, uldaq_data_available, n);
/* Start the acquisition */
err = ulAInScan(u->device_handle, 0, 0, 0, 0, n->in.vectorize, &u->in.sample_rate, u->in.scan_options, u->in.flags, u->in.buffer);
@ -432,6 +433,7 @@ int uldaq_stop(struct node *n)
}
pthread_mutex_unlock(&u->in.mutex);
pthread_cond_broadcast(&u->in.cv);
err = ulDisconnectDaqDevice(u->device_handle);
if (err != ERR_NO_ERROR)
@ -470,8 +472,11 @@ int uldaq_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *re
smp->data[i].f = u->in.buffer[channel_index];
}
smp->length = 1;
smp->length = u->in.channel_count;
smp->signals = &n->signals;
smp->sequence = u->in.transfer_status.currentTotalCount / u->in.channel_count;
smp->flags = SAMPLE_HAS_SEQUENCE | SAMPLE_HAS_DATA;
}
pthread_mutex_unlock(&u->in.mutex);