mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

planner: encapsulate deco state cache in a struct

Browse source 
Removes memory management pain: the struct cleans up when it
goes out of scope.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-07 19:08:22 +01:00 • committed by bstoeger
parent 77e8c3655e
commit f69686d429
7 changed files with 90 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/deco.cpp
View file

@ -13,8 +13,6 @@
* set_gf() - set Buehlmann gradient factors
* set_vpmb_conservatism() - set VPM-B conservatism value
* clear_deco()
* cache_deco_state()
* restore_deco_state()
* dump_tissues()
*/
#include <stdlib.h>
@ -522,19 +520,17 @@ extern "C" void clear_deco(struct deco_state *ds, double surface_pressure, bool
ds->ci_pointing_to_guiding_tissue = -1;
}
extern "C" void cache_deco_state(struct deco_state *src, struct deco_state **cached_datap)
void deco_state_cache::cache(const struct deco_state *src)
{
struct deco_state *data = *cached_datap;
if (!data) {
data = (deco_state *)malloc(sizeof(struct deco_state));
*cached_datap = data;
}
if (!data)
data = std::make_unique<deco_state>();
*data = *src;
}
extern "C" void restore_deco_state(struct deco_state *data, struct deco_state *target, bool keep_vpmb_state)
void deco_state_cache::restore(struct deco_state *target, bool keep_vpmb_state) const
{
if (!data)
return;
if (keep_vpmb_state) {
int ci;
for (ci = 0; ci < 16; ci++) {
@ -547,7 +543,6 @@ extern "C" void restore_deco_state(struct deco_state *data, struct deco_state *t
data->max_bottom_ceiling_pressure = target->max_bottom_ceiling_pressure;
}
*target = *data;
}
extern "C" int deco_allowed_depth(double tissues_tolerance, double surface_pressure, const struct dive *dive, bool smooth)