Commit 047b4b16 authored by Claes Sjofors's avatar Claes Sjofors

Merge branch 'master' of newton:/data1/x0-0-0/pwr

parents b9172108 3eebaca2
...@@ -199,7 +199,9 @@ void sev_valuecache_double::write( int index, void *thread) ...@@ -199,7 +199,9 @@ void sev_valuecache_double::write( int index, void *thread)
} }
if ( m_write_cb) { if ( m_write_cb) {
pwr_tTime time; pwr_tTime time;
time_Aadd( &time, &m_start_time, time_Float64ToD( 0, wtime)); pwr_tDeltaTime dt;
time_Float64ToD( &dt, wtime);
time_Aadd( &time, &m_start_time, &dt);
(m_write_cb)( m_userdata, m_useridx, &wval, &time, thread); (m_write_cb)( m_userdata, m_useridx, &wval, &time, thread);
} }
} }
......
...@@ -960,6 +960,7 @@ get_tmo ( ...@@ -960,6 +960,7 @@ get_tmo (
{ {
float rto; float rto;
pwr_tTime now; pwr_tTime now;
pwr_tDeltaTime drto;
rto = lp->np->link[lp->lix].rtt_rto; rto = lp->np->link[lp->lix].rtt_rto;
...@@ -974,7 +975,7 @@ get_tmo ( ...@@ -974,7 +975,7 @@ get_tmo (
} }
time_GetTimeMonotonic( &now); time_GetTimeMonotonic( &now);
time_Aadd( tmo, &now, time_FloatToD( 0, rto)); time_Aadd( tmo, &now, time_FloatToD( &drto, rto));
} }
static void * static void *
......
...@@ -1205,6 +1205,7 @@ get_tmo ( ...@@ -1205,6 +1205,7 @@ get_tmo (
{ {
float rto; float rto;
pwr_tTime now; pwr_tTime now;
pwr_tDeltaTime drto;
rto = lp->np->link.rtt_rto; rto = lp->np->link.rtt_rto;
...@@ -1220,7 +1221,7 @@ get_tmo ( ...@@ -1220,7 +1221,7 @@ get_tmo (
} }
time_GetTimeMonotonic( &now); time_GetTimeMonotonic( &now);
time_Aadd( tmo, &now, time_FloatToD( 0, rto)); time_Aadd( tmo, &now, time_FloatToD( &drto, rto));
} }
static void * static void *
......
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