Skip to content

L
LHC Instability Trigger Distribution LIST
Commit 11484285 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

wrtd:out:rt: declare variable at the beginning 

there are weird conflict with the libc otherwise. I do not know why,
but this 'fix' the issue
Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>


NOTE
This commit has been created by `git subtree` on the Mock Turtle repository
on tag mock-turtle-2.0

This commit will not compile
parent a188cd9a
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 7 deletions
rt/fd/wrtd-rt-fd.c
View file @ 11484285
......@@ -537,22 +537,27 @@ static inline uint32_t fd_ch_readl (struct lrt_output *out, uint32_t reg)
static int check_output_timeout (struct lrt_output *out)
{
struct lrt_pulse_queue *q = &out->queue;
struct pulse_queue_entry *pq_ent = pulse_queue_front(q);
struct wr_timestamp tc;
int delta;
/* Read the current WR time, order is important: first seconds, then cycles (cycles
get latched on reading secs register. */
tc.seconds = lr_readl(WRN_CPU_LR_REG_TAI_SEC);
tc.ticks = lr_readl(WRN_CPU_LR_REG_TAI_CYCLES);
if( out->last_programmed.seconds > tc.seconds + OUT_TIMEOUT )
{
struct lrt_pulse_queue *q = &out->queue;
struct pulse_queue_entry *pq_ent = pulse_queue_front(q);
pp_printf("Enqueued timestamp very far in the future [id %x:%x:%x]. Dropping.", pq_ent->trig.id.system, pq_ent->trig.id.source_port, pq_ent->trig.id.trigger);
pp_printf("Offending TS: %d:%d", out->last_programmed.seconds, out->last_programmed.ticks);
if (out->last_programmed.seconds > tc.seconds + OUT_TIMEOUT) {
pp_printf("Enqueued timestamp very far in the future [id %x:%x:%x]. Dropping.",
pq_ent->trig.id.system,
pq_ent->trig.id.source_port,
pq_ent->trig.id.trigger);
pp_printf("Offending TS: %d:%d",
out->last_programmed.seconds,
out->last_programmed.ticks);
}
int delta = tc.seconds - out->last_programmed.seconds;
delta = tc.seconds - out->last_programmed.seconds;
delta *= 125 * 1000 * 1000;
delta += tc.ticks - out->last_programmed.ticks;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment