Commit 7f026d66 authored by Matteo Quintiliani's avatar Matteo Quintiliani

Fixed bug in raw stream management for data on demand timeout recv


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@708 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent a1d00f65
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy * Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it * quintiliani@ingv.it
* *
* $Id: nmxp.c,v 1.57 2007-12-28 10:55:45 mtheo Exp $ * $Id: nmxp.c,v 1.58 2008-02-15 11:31:04 mtheo Exp $
* *
*/ */
...@@ -661,8 +661,10 @@ int nmxp_raw_stream_manage(NMXP_RAW_STREAM_DATA *p, NMXP_DATA_PROCESS *a_pd, int ...@@ -661,8 +661,10 @@ int nmxp_raw_stream_manage(NMXP_RAW_STREAM_DATA *p, NMXP_DATA_PROCESS *a_pd, int
} }
/* Add pd and sort array */ /* Add pd and sort array */
if(p->n_pdlist >= p->max_pdlist_items if( (p->n_pdlist >= p->max_pdlist_items
|| latency >= p->max_tolerable_latency) { || latency >= p->max_tolerable_latency) &&
p->timeoutrecv <= 0
) {
/* Supposing p->pdlist is ordered, /* Supposing p->pdlist is ordered,
* handle the first item and over write it. * handle the first item and over write it.
*/ */
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy * Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it * quintiliani@ingv.it
* *
* $Id: nmxptool.c,v 1.124 2008-02-15 08:04:06 mtheo Exp $ * $Id: nmxptool.c,v 1.125 2008-02-15 11:31:04 mtheo Exp $
* *
*/ */
...@@ -756,7 +756,8 @@ int main (int argc, char **argv) { ...@@ -756,7 +756,8 @@ int main (int argc, char **argv) {
skip_current_packet = 0; skip_current_packet = 0;
if(pd && if(pd &&
(params.statefile || params.buffered_time) (params.statefile || params.buffered_time) &&
( params.timeoutrecv <= 0 )
) { ) {
if(params.statefile && channelList_Seq[cur_chan].after_start_time > 0.0) { if(params.statefile && channelList_Seq[cur_chan].after_start_time > 0.0) {
cur_after_start_time = channelList_Seq[cur_chan].after_start_time; cur_after_start_time = channelList_Seq[cur_chan].after_start_time;
......
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