mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Add bailout code to prevent infinite loop in deco calculation
This appears to happen if we have impossible dive sequences in the dive_list (i.e., merging XML files from two different divers with overlapping trips). We need to fix the underlying cause for this issue (i.e., only pick the 'right' dives to calculate the residual tissue saturation), but at least this code prevents the hang in an infinite loop. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
e6afd055d8
commit
e47e37e5a6
1 changed files with 7 additions and 0 deletions
7
deco.c
7
deco.c
|
@ -273,6 +273,7 @@ unsigned int deco_allowed_depth(double tissues_tolerance, double surface_pressur
|
|||
double new_gradient_factor;
|
||||
double pressure_delta = tissues_tolerance - surface_pressure;
|
||||
struct dive_data mydata;
|
||||
int bail = 1000;
|
||||
|
||||
if (pressure_delta > 0) {
|
||||
if (!smooth) {
|
||||
|
@ -291,6 +292,12 @@ unsigned int deco_allowed_depth(double tissues_tolerance, double surface_pressur
|
|||
below_gradient_limit = (new_gradient_factor < actual_gradient_limit(&mydata));
|
||||
while(!below_gradient_limit)
|
||||
{
|
||||
/* we run into bugs where this turns into an infinite loop; so add
|
||||
* some bailout code that prints a warning but prevents the code from hanging */
|
||||
if (--bail == 0) {
|
||||
printf("WARNING!!!\n==========\nThe deco_allowed_depth() loop appears to hang.\nBailing out.\n");
|
||||
break;
|
||||
}
|
||||
if (!smooth)
|
||||
mydata.pressure += PRESSURE_CHANGE_3M;
|
||||
else
|
||||
|
|
Loading…
Add table
Reference in a new issue