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

39
qt-models/diveplannermodel.cpp
View file

@ -1073,12 +1073,12 @@ void DivePlannerPointsModel::updateDiveProfile()
if (diveplan_empty(&diveplan))
return;
struct deco_state *cache = NULL;
deco_state_cache cache;
struct decostop stoptable[60];
struct deco_state plan_deco_state;
memset(&plan_deco_state, 0, sizeof(struct deco_state));
plan(&plan_deco_state, &diveplan, d, DECOTIMESTEP, stoptable, &cache, isPlanner(), false);
plan(&plan_deco_state, &diveplan, d, DECOTIMESTEP, stoptable, cache, isPlanner(), false);
updateMaxDepth();
if (isPlanner() && shouldComputeVariations()) {
@ -1103,8 +1103,6 @@ void DivePlannerPointsModel::updateDiveProfile()
emit calculatedPlanNotes(QString(d->notes));
// throw away the cache
free(cache);
#if DEBUG_PLAN
save_dive(stderr, d);
dump_plan(&diveplan);
@ -1196,13 +1194,13 @@ void DivePlannerPointsModel::computeVariations(struct diveplan *original_plan, c
struct dive *dive = alloc_dive();
copy_dive(d, dive);
struct decostop original[60], deeper[60], shallower[60], shorter[60], longer[60];
struct deco_state *cache = NULL, *save = NULL;
deco_state_cache cache, save;
struct diveplan plan_copy;
struct divedatapoint *last_segment;
struct deco_state ds = *previous_ds;
int my_instance = ++instanceCounter;
cache_deco_state(&ds, &save);
save.cache(&ds);
duration_t delta_time = { .seconds = 60 };
QString time_units = tr("min");
@ -1222,43 +1220,43 @@ void DivePlannerPointsModel::computeVariations(struct diveplan *original_plan, c
goto finish;
if (my_instance != instanceCounter)
goto finish;
plan(&ds, &plan_copy, dive, 1, original, &cache, true, false);
plan(&ds, &plan_copy, dive, 1, original, cache, true, false);
free_dps(&plan_copy);
restore_deco_state(save, &ds, false);
save.restore(&ds, false);
last_segment = cloneDiveplan(original_plan, &plan_copy);
last_segment->depth.mm += delta_depth.mm;
last_segment->next->depth.mm += delta_depth.mm;
if (my_instance != instanceCounter)
goto finish;
plan(&ds, &plan_copy, dive, 1, deeper, &cache, true, false);
plan(&ds, &plan_copy, dive, 1, deeper, cache, true, false);
free_dps(&plan_copy);
restore_deco_state(save, &ds, false);
save.restore(&ds, false);
last_segment = cloneDiveplan(original_plan, &plan_copy);
last_segment->depth.mm -= delta_depth.mm;
last_segment->next->depth.mm -= delta_depth.mm;
if (my_instance != instanceCounter)
goto finish;
plan(&ds, &plan_copy, dive, 1, shallower, &cache, true, false);
plan(&ds, &plan_copy, dive, 1, shallower, cache, true, false);
free_dps(&plan_copy);
restore_deco_state(save, &ds, false);
save.restore(&ds, false);
last_segment = cloneDiveplan(original_plan, &plan_copy);
last_segment->next->time += delta_time.seconds;
if (my_instance != instanceCounter)
goto finish;
plan(&ds, &plan_copy, dive, 1, longer, &cache, true, false);
plan(&ds, &plan_copy, dive, 1, longer, cache, true, false);
free_dps(&plan_copy);
restore_deco_state(save, &ds, false);
save.restore(&ds, false);
last_segment = cloneDiveplan(original_plan, &plan_copy);
last_segment->next->time -= delta_time.seconds;
if (my_instance != instanceCounter)
goto finish;
plan(&ds, &plan_copy, dive, 1, shorter, &cache, true, false);
plan(&ds, &plan_copy, dive, 1, shorter, cache, true, false);
free_dps(&plan_copy);
restore_deco_state(save, &ds, false);
save.restore(&ds, false);
char buf[200];
sprintf(buf, ", %s: %c %d:%02d /%s %c %d:%02d /min", qPrintable(tr("Stop times")),
@ -1273,8 +1271,6 @@ void DivePlannerPointsModel::computeVariations(struct diveplan *original_plan, c
finish:
free_dps(original_plan);
free(original_plan);
free(save);
free(cache);
free_dive(dive);
}
@ -1289,13 +1285,12 @@ void DivePlannerPointsModel::computeVariationsDone(QString variations)
void DivePlannerPointsModel::createPlan(bool replanCopy)
{
// Ok, so, here the diveplan creates a dive
struct deco_state *cache = NULL;
deco_state_cache cache;
removeDeco();
createTemporaryPlan();
//TODO: C-based function here?
struct decostop stoptable[60];
plan(&ds_after_previous_dives, &diveplan, d, DECOTIMESTEP, stoptable, &cache, isPlanner(), true);
plan(&ds_after_previous_dives, &diveplan, d, DECOTIMESTEP, stoptable, cache, isPlanner(), true);
if (shouldComputeVariations()) {
struct diveplan *plan_copy;
@ -1306,8 +1301,6 @@ void DivePlannerPointsModel::createPlan(bool replanCopy)
computeVariations(plan_copy, &ds_after_previous_dives);
}
free(cache);
// Fixup planner notes.
if (current_dive && d->id == current_dive->id) {
// Try to identify old planner output and remove only this part