mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Parser: make parser (mostly) reentrant
Introduce a parser_state structure, which describes (most) of the global parser state. Create such a structure in the entry routines to the parser and pass it down to the individual functions. The parser state is initialized and freed with the init_parser_state() and free_parser_state() functions. The main benefits are: 1) Isolation of parser state. 2) Keeping the global name space tidy. 3) Prevent memory leaks which could happen in truncated files by freeing all the parser state after parse. A somewhat controversial point might be that the individual parsing functions are split in those that need parser-state and those that don't. This means that there are now two versions of the MATCH macro, viz. one for the former and one for the latter. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger
Dirk Hohndel
parent
343808271c
commit
138f27f65d
7 changed files with 1022 additions and 957 deletions
|
|
@ -13,122 +13,122 @@
|
|||
#include "membuffer.h"
|
||||
#include "gettext.h"
|
||||
|
||||
extern int dm4_events(void *handle, int columns, char **data, char **column)
|
||||
static int dm4_events(void *param, int columns, char **data, char **column)
|
||||
{
|
||||
UNUSED(handle);
|
||||
UNUSED(columns);
|
||||
UNUSED(column);
|
||||
struct parser_state *state = (struct parser_state *)param;
|
||||
|
||||
event_start();
|
||||
event_start(state);
|
||||
if (data[1])
|
||||
cur_event.time.seconds = atoi(data[1]);
|
||||
state->cur_event.time.seconds = atoi(data[1]);
|
||||
|
||||
if (data[2]) {
|
||||
switch (atoi(data[2])) {
|
||||
case 1:
|
||||
/* 1 Mandatory Safety Stop */
|
||||
strcpy(cur_event.name, "safety stop (mandatory)");
|
||||
strcpy(state->cur_event.name, "safety stop (mandatory)");
|
||||
break;
|
||||
case 3:
|
||||
/* 3 Deco */
|
||||
/* What is Subsurface's term for going to
|
||||
* deco? */
|
||||
strcpy(cur_event.name, "deco");
|
||||
strcpy(state->cur_event.name, "deco");
|
||||
break;
|
||||
case 4:
|
||||
/* 4 Ascent warning */
|
||||
strcpy(cur_event.name, "ascent");
|
||||
strcpy(state->cur_event.name, "ascent");
|
||||
break;
|
||||
case 5:
|
||||
/* 5 Ceiling broken */
|
||||
strcpy(cur_event.name, "violation");
|
||||
strcpy(state->cur_event.name, "violation");
|
||||
break;
|
||||
case 6:
|
||||
/* 6 Mandatory safety stop ceiling error */
|
||||
strcpy(cur_event.name, "violation");
|
||||
strcpy(state->cur_event.name, "violation");
|
||||
break;
|
||||
case 7:
|
||||
/* 7 Below deco floor */
|
||||
strcpy(cur_event.name, "below floor");
|
||||
strcpy(state->cur_event.name, "below floor");
|
||||
break;
|
||||
case 8:
|
||||
/* 8 Dive time alarm */
|
||||
strcpy(cur_event.name, "divetime");
|
||||
strcpy(state->cur_event.name, "divetime");
|
||||
break;
|
||||
case 9:
|
||||
/* 9 Depth alarm */
|
||||
strcpy(cur_event.name, "maxdepth");
|
||||
strcpy(state->cur_event.name, "maxdepth");
|
||||
break;
|
||||
case 10:
|
||||
/* 10 OLF 80% */
|
||||
case 11:
|
||||
/* 11 OLF 100% */
|
||||
strcpy(cur_event.name, "OLF");
|
||||
strcpy(state->cur_event.name, "OLF");
|
||||
break;
|
||||
case 12:
|
||||
/* 12 High pO₂ */
|
||||
strcpy(cur_event.name, "PO2");
|
||||
strcpy(state->cur_event.name, "PO2");
|
||||
break;
|
||||
case 13:
|
||||
/* 13 Air time */
|
||||
strcpy(cur_event.name, "airtime");
|
||||
strcpy(state->cur_event.name, "airtime");
|
||||
break;
|
||||
case 17:
|
||||
/* 17 Ascent warning */
|
||||
strcpy(cur_event.name, "ascent");
|
||||
strcpy(state->cur_event.name, "ascent");
|
||||
break;
|
||||
case 18:
|
||||
/* 18 Ceiling error */
|
||||
strcpy(cur_event.name, "ceiling");
|
||||
strcpy(state->cur_event.name, "ceiling");
|
||||
break;
|
||||
case 19:
|
||||
/* 19 Surfaced */
|
||||
strcpy(cur_event.name, "surface");
|
||||
strcpy(state->cur_event.name, "surface");
|
||||
break;
|
||||
case 20:
|
||||
/* 20 Deco */
|
||||
strcpy(cur_event.name, "deco");
|
||||
strcpy(state->cur_event.name, "deco");
|
||||
break;
|
||||
case 22:
|
||||
case 32:
|
||||
/* 22 Mandatory safety stop violation */
|
||||
/* 32 Deep stop violation */
|
||||
strcpy(cur_event.name, "violation");
|
||||
strcpy(state->cur_event.name, "violation");
|
||||
break;
|
||||
case 30:
|
||||
/* Tissue level warning */
|
||||
strcpy(cur_event.name, "tissue warning");
|
||||
strcpy(state->cur_event.name, "tissue warning");
|
||||
break;
|
||||
case 37:
|
||||
/* Tank pressure alarm */
|
||||
strcpy(cur_event.name, "tank pressure");
|
||||
strcpy(state->cur_event.name, "tank pressure");
|
||||
break;
|
||||
case 257:
|
||||
/* 257 Dive active */
|
||||
/* This seems to be given after surface when
|
||||
* descending again. */
|
||||
strcpy(cur_event.name, "surface");
|
||||
strcpy(state->cur_event.name, "surface");
|
||||
break;
|
||||
case 258:
|
||||
/* 258 Bookmark */
|
||||
if (data[3]) {
|
||||
strcpy(cur_event.name, "heading");
|
||||
cur_event.value = atoi(data[3]);
|
||||
strcpy(state->cur_event.name, "heading");
|
||||
state->cur_event.value = atoi(data[3]);
|
||||
} else {
|
||||
strcpy(cur_event.name, "bookmark");
|
||||
strcpy(state->cur_event.name, "bookmark");
|
||||
}
|
||||
break;
|
||||
case 259:
|
||||
/* Deep stop */
|
||||
strcpy(cur_event.name, "Deep stop");
|
||||
strcpy(state->cur_event.name, "Deep stop");
|
||||
break;
|
||||
case 260:
|
||||
/* Deep stop */
|
||||
strcpy(cur_event.name, "Deep stop cleared");
|
||||
strcpy(state->cur_event.name, "Deep stop cleared");
|
||||
break;
|
||||
case 266:
|
||||
/* Mandatory safety stop activated */
|
||||
strcpy(cur_event.name, "safety stop (mandatory)");
|
||||
strcpy(state->cur_event.name, "safety stop (mandatory)");
|
||||
break;
|
||||
case 267:
|
||||
/* Mandatory safety stop deactivated */
|
||||
|
|
@ -136,35 +136,36 @@ extern int dm4_events(void *handle, int columns, char **data, char **column)
|
|||
* profile so skipping as well for now */
|
||||
break;
|
||||
default:
|
||||
strcpy(cur_event.name, "unknown");
|
||||
cur_event.value = atoi(data[2]);
|
||||
strcpy(state->cur_event.name, "unknown");
|
||||
state->cur_event.value = atoi(data[2]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
event_end();
|
||||
event_end(state);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern int dm4_tags(void *handle, int columns, char **data, char **column)
|
||||
static int dm4_tags(void *param, int columns, char **data, char **column)
|
||||
{
|
||||
UNUSED(handle);
|
||||
UNUSED(columns);
|
||||
UNUSED(column);
|
||||
struct parser_state *state = (struct parser_state *)param;
|
||||
|
||||
if (data[0])
|
||||
taglist_add_tag(&cur_dive->tag_list, data[0]);
|
||||
taglist_add_tag(&state->cur_dive->tag_list, data[0]);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern int dm4_dive(void *param, int columns, char **data, char **column)
|
||||
static int dm4_dive(void *param, int columns, char **data, char **column)
|
||||
{
|
||||
UNUSED(columns);
|
||||
UNUSED(column);
|
||||
int i;
|
||||
int interval, retval = 0;
|
||||
sqlite3 *handle = (sqlite3 *)param;
|
||||
struct parser_state *state = (struct parser_state *)param;
|
||||
sqlite3 *handle = state->sql_handle;
|
||||
float *profileBlob;
|
||||
unsigned char *tempBlob;
|
||||
int *pressureBlob;
|
||||
|
|
@ -173,12 +174,12 @@ extern int dm4_dive(void *param, int columns, char **data, char **column)
|
|||
char get_tags_template[] = "select Text from DiveTag where DiveId = %d";
|
||||
char get_events[64];
|
||||
|
||||
dive_start();
|
||||
cur_dive->number = atoi(data[0]);
|
||||
dive_start(state);
|
||||
state->cur_dive->number = atoi(data[0]);
|
||||
|
||||
cur_dive->when = (time_t)(atol(data[1]));
|
||||
state->cur_dive->when = (time_t)(atol(data[1]));
|
||||
if (data[2])
|
||||
utf8_string(data[2], &cur_dive->notes);
|
||||
utf8_string(data[2], &state->cur_dive->notes);
|
||||
|
||||
/*
|
||||
* DM4 stores Duration and DiveTime. It looks like DiveTime is
|
||||
|
|
@ -188,90 +189,90 @@ extern int dm4_dive(void *param, int columns, char **data, char **column)
|
|||
* DiveTime = data[15]
|
||||
*/
|
||||
if (data[3])
|
||||
cur_dive->duration.seconds = atoi(data[3]);
|
||||
state->cur_dive->duration.seconds = atoi(data[3]);
|
||||
if (data[15])
|
||||
cur_dive->dc.duration.seconds = atoi(data[15]);
|
||||
state->cur_dive->dc.duration.seconds = atoi(data[15]);
|
||||
|
||||
/*
|
||||
* TODO: the deviceid hash should be calculated here.
|
||||
*/
|
||||
settings_start();
|
||||
dc_settings_start();
|
||||
settings_start(state);
|
||||
dc_settings_start(state);
|
||||
if (data[4])
|
||||
utf8_string(data[4], &cur_settings.dc.serial_nr);
|
||||
utf8_string(data[4], &state->cur_settings.dc.serial_nr);
|
||||
if (data[5])
|
||||
utf8_string(data[5], &cur_settings.dc.model);
|
||||
utf8_string(data[5], &state->cur_settings.dc.model);
|
||||
|
||||
cur_settings.dc.deviceid = 0xffffffff;
|
||||
dc_settings_end();
|
||||
settings_end();
|
||||
state->cur_settings.dc.deviceid = 0xffffffff;
|
||||
dc_settings_end(state);
|
||||
settings_end(state);
|
||||
|
||||
if (data[6])
|
||||
cur_dive->dc.maxdepth.mm = lrint(strtod_flags(data[6], NULL, 0) * 1000);
|
||||
state->cur_dive->dc.maxdepth.mm = lrint(strtod_flags(data[6], NULL, 0) * 1000);
|
||||
if (data[8])
|
||||
cur_dive->dc.airtemp.mkelvin = C_to_mkelvin(atoi(data[8]));
|
||||
state->cur_dive->dc.airtemp.mkelvin = C_to_mkelvin(atoi(data[8]));
|
||||
if (data[9])
|
||||
cur_dive->dc.watertemp.mkelvin = C_to_mkelvin(atoi(data[9]));
|
||||
state->cur_dive->dc.watertemp.mkelvin = C_to_mkelvin(atoi(data[9]));
|
||||
|
||||
/*
|
||||
* TODO: handle multiple cylinders
|
||||
*/
|
||||
cylinder_start();
|
||||
cylinder_start(state);
|
||||
if (data[22] && atoi(data[22]) > 0)
|
||||
cur_dive->cylinder[cur_cylinder_index].start.mbar = atoi(data[22]);
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].start.mbar = atoi(data[22]);
|
||||
else if (data[10] && atoi(data[10]) > 0)
|
||||
cur_dive->cylinder[cur_cylinder_index].start.mbar = atoi(data[10]);
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].start.mbar = atoi(data[10]);
|
||||
if (data[23] && atoi(data[23]) > 0)
|
||||
cur_dive->cylinder[cur_cylinder_index].end.mbar = (atoi(data[23]));
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].end.mbar = (atoi(data[23]));
|
||||
if (data[11] && atoi(data[11]) > 0)
|
||||
cur_dive->cylinder[cur_cylinder_index].end.mbar = (atoi(data[11]));
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].end.mbar = (atoi(data[11]));
|
||||
if (data[12])
|
||||
cur_dive->cylinder[cur_cylinder_index].type.size.mliter = lrint((strtod_flags(data[12], NULL, 0)) * 1000);
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].type.size.mliter = lrint((strtod_flags(data[12], NULL, 0)) * 1000);
|
||||
if (data[13])
|
||||
cur_dive->cylinder[cur_cylinder_index].type.workingpressure.mbar = (atoi(data[13]));
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].type.workingpressure.mbar = (atoi(data[13]));
|
||||
if (data[20])
|
||||
cur_dive->cylinder[cur_cylinder_index].gasmix.o2.permille = atoi(data[20]) * 10;
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].gasmix.o2.permille = atoi(data[20]) * 10;
|
||||
if (data[21])
|
||||
cur_dive->cylinder[cur_cylinder_index].gasmix.he.permille = atoi(data[21]) * 10;
|
||||
cylinder_end();
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].gasmix.he.permille = atoi(data[21]) * 10;
|
||||
cylinder_end(state);
|
||||
|
||||
if (data[14])
|
||||
cur_dive->dc.surface_pressure.mbar = (atoi(data[14]) * 1000);
|
||||
state->cur_dive->dc.surface_pressure.mbar = (atoi(data[14]) * 1000);
|
||||
|
||||
interval = data[16] ? atoi(data[16]) : 0;
|
||||
profileBlob = (float *)data[17];
|
||||
tempBlob = (unsigned char *)data[18];
|
||||
pressureBlob = (int *)data[19];
|
||||
for (i = 0; interval && i * interval < cur_dive->duration.seconds; i++) {
|
||||
sample_start();
|
||||
cur_sample->time.seconds = i * interval;
|
||||
for (i = 0; interval && i * interval < state->cur_dive->duration.seconds; i++) {
|
||||
sample_start(state);
|
||||
state->cur_sample->time.seconds = i * interval;
|
||||
if (profileBlob)
|
||||
cur_sample->depth.mm = lrintf(profileBlob[i] * 1000.0f);
|
||||
state->cur_sample->depth.mm = lrintf(profileBlob[i] * 1000.0f);
|
||||
else
|
||||
cur_sample->depth.mm = cur_dive->dc.maxdepth.mm;
|
||||
state->cur_sample->depth.mm = state->cur_dive->dc.maxdepth.mm;
|
||||
|
||||
if (data[18] && data[18][0])
|
||||
cur_sample->temperature.mkelvin = C_to_mkelvin(tempBlob[i]);
|
||||
state->cur_sample->temperature.mkelvin = C_to_mkelvin(tempBlob[i]);
|
||||
if (data[19] && data[19][0])
|
||||
cur_sample->pressure[0].mbar = pressureBlob[i];
|
||||
sample_end();
|
||||
state->cur_sample->pressure[0].mbar = pressureBlob[i];
|
||||
sample_end(state);
|
||||
}
|
||||
|
||||
snprintf(get_events, sizeof(get_events) - 1, get_events_template, cur_dive->number);
|
||||
retval = sqlite3_exec(handle, get_events, &dm4_events, 0, &err);
|
||||
snprintf(get_events, sizeof(get_events) - 1, get_events_template, state->cur_dive->number);
|
||||
retval = sqlite3_exec(handle, get_events, &dm4_events, state, &err);
|
||||
if (retval != SQLITE_OK) {
|
||||
fprintf(stderr, "%s", "Database query dm4_events failed.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
snprintf(get_events, sizeof(get_events) - 1, get_tags_template, cur_dive->number);
|
||||
retval = sqlite3_exec(handle, get_events, &dm4_tags, 0, &err);
|
||||
snprintf(get_events, sizeof(get_events) - 1, get_tags_template, state->cur_dive->number);
|
||||
retval = sqlite3_exec(handle, get_events, &dm4_tags, state, &err);
|
||||
if (retval != SQLITE_OK) {
|
||||
fprintf(stderr, "%s", "Database query dm4_tags failed.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
dive_end();
|
||||
dive_end(state);
|
||||
|
||||
/*
|
||||
for (i=0; i<columns;++i) {
|
||||
|
|
@ -295,13 +296,18 @@ int parse_dm4_buffer(sqlite3 *handle, const char *url, const char *buffer, int s
|
|||
|
||||
int retval;
|
||||
char *err = NULL;
|
||||
target_table = table;
|
||||
struct parser_state state;
|
||||
|
||||
init_parser_state(&state);
|
||||
state.target_table = table;
|
||||
state.sql_handle = handle;
|
||||
|
||||
/* StartTime is converted from Suunto's nano seconds to standard
|
||||
* time. We also need epoch, not seconds since year 1. */
|
||||
char get_dives[] = "select D.DiveId,StartTime/10000000-62135596800,Note,Duration,SourceSerialNumber,Source,MaxDepth,SampleInterval,StartTemperature,BottomTemperature,D.StartPressure,D.EndPressure,Size,CylinderWorkPressure,SurfacePressure,DiveTime,SampleInterval,ProfileBlob,TemperatureBlob,PressureBlob,Oxygen,Helium,MIX.StartPressure,MIX.EndPressure FROM Dive AS D JOIN DiveMixture AS MIX ON D.DiveId=MIX.DiveId";
|
||||
|
||||
retval = sqlite3_exec(handle, get_dives, &dm4_dive, handle, &err);
|
||||
retval = sqlite3_exec(handle, get_dives, &dm4_dive, &state, &err);
|
||||
free_parser_state(&state);
|
||||
|
||||
if (retval != SQLITE_OK) {
|
||||
fprintf(stderr, "Database query failed '%s'.\n", url);
|
||||
|
|
@ -311,64 +317,65 @@ int parse_dm4_buffer(sqlite3 *handle, const char *url, const char *buffer, int s
|
|||
return 0;
|
||||
}
|
||||
|
||||
extern int dm5_cylinders(void *handle, int columns, char **data, char **column)
|
||||
static int dm5_cylinders(void *param, int columns, char **data, char **column)
|
||||
{
|
||||
UNUSED(handle);
|
||||
UNUSED(columns);
|
||||
UNUSED(column);
|
||||
struct parser_state *state = (struct parser_state *)param;
|
||||
|
||||
cylinder_start();
|
||||
cylinder_start(state);
|
||||
if (data[7] && atoi(data[7]) > 0 && atoi(data[7]) < 350000)
|
||||
cur_dive->cylinder[cur_cylinder_index].start.mbar = atoi(data[7]);
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].start.mbar = atoi(data[7]);
|
||||
if (data[8] && atoi(data[8]) > 0 && atoi(data[8]) < 350000)
|
||||
cur_dive->cylinder[cur_cylinder_index].end.mbar = (atoi(data[8]));
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].end.mbar = (atoi(data[8]));
|
||||
if (data[6]) {
|
||||
/* DM5 shows tank size of 12 liters when the actual
|
||||
* value is 0 (and using metric units). So we just use
|
||||
* the same 12 liters when size is not available */
|
||||
if (strtod_flags(data[6], NULL, 0) == 0.0 && cur_dive->cylinder[cur_cylinder_index].start.mbar)
|
||||
cur_dive->cylinder[cur_cylinder_index].type.size.mliter = 12000;
|
||||
if (strtod_flags(data[6], NULL, 0) == 0.0 && state->cur_dive->cylinder[state->cur_cylinder_index].start.mbar)
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].type.size.mliter = 12000;
|
||||
else
|
||||
cur_dive->cylinder[cur_cylinder_index].type.size.mliter = lrint((strtod_flags(data[6], NULL, 0)) * 1000);
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].type.size.mliter = lrint((strtod_flags(data[6], NULL, 0)) * 1000);
|
||||
}
|
||||
if (data[2])
|
||||
cur_dive->cylinder[cur_cylinder_index].gasmix.o2.permille = atoi(data[2]) * 10;
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].gasmix.o2.permille = atoi(data[2]) * 10;
|
||||
if (data[3])
|
||||
cur_dive->cylinder[cur_cylinder_index].gasmix.he.permille = atoi(data[3]) * 10;
|
||||
cylinder_end();
|
||||
state->cur_dive->cylinder[state->cur_cylinder_index].gasmix.he.permille = atoi(data[3]) * 10;
|
||||
cylinder_end(state);
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern int dm5_gaschange(void *handle, int columns, char **data, char **column)
|
||||
static int dm5_gaschange(void *param, int columns, char **data, char **column)
|
||||
{
|
||||
UNUSED(handle);
|
||||
UNUSED(columns);
|
||||
UNUSED(column);
|
||||
struct parser_state *state = (struct parser_state *)param;
|
||||
|
||||
event_start();
|
||||
event_start(state);
|
||||
if (data[0])
|
||||
cur_event.time.seconds = atoi(data[0]);
|
||||
state->cur_event.time.seconds = atoi(data[0]);
|
||||
if (data[1]) {
|
||||
strcpy(cur_event.name, "gaschange");
|
||||
cur_event.value = lrint(strtod_flags(data[1], NULL, 0));
|
||||
strcpy(state->cur_event.name, "gaschange");
|
||||
state->cur_event.value = lrint(strtod_flags(data[1], NULL, 0));
|
||||
}
|
||||
|
||||
/* He part of the mix */
|
||||
if (data[2])
|
||||
cur_event.value += lrint(strtod_flags(data[2], NULL, 0)) << 16;
|
||||
event_end();
|
||||
state->cur_event.value += lrint(strtod_flags(data[2], NULL, 0)) << 16;
|
||||
event_end(state);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern int dm5_dive(void *param, int columns, char **data, char **column)
|
||||
static int dm5_dive(void *param, int columns, char **data, char **column)
|
||||
{
|
||||
UNUSED(columns);
|
||||
UNUSED(column);
|
||||
int i;
|
||||
int tempformat = 0;
|
||||
int interval, retval = 0, block_size;
|
||||
sqlite3 *handle = (sqlite3 *)param;
|
||||
struct parser_state *state = (struct parser_state *)param;
|
||||
sqlite3 *handle = state->sql_handle;
|
||||
unsigned const char *sampleBlob;
|
||||
char *err = NULL;
|
||||
char get_events_template[] = "select * from Mark where DiveId = %d";
|
||||
|
|
@ -377,55 +384,55 @@ extern int dm5_dive(void *param, int columns, char **data, char **column)
|
|||
char get_gaschange_template[] = "select GasChangeTime,Oxygen,Helium from DiveGasChange join DiveMixture on DiveGasChange.DiveMixtureId=DiveMixture.DiveMixtureId where DiveId = %d";
|
||||
char get_events[512];
|
||||
|
||||
dive_start();
|
||||
cur_dive->number = atoi(data[0]);
|
||||
dive_start(state);
|
||||
state->cur_dive->number = atoi(data[0]);
|
||||
|
||||
cur_dive->when = (time_t)(atol(data[1]));
|
||||
state->cur_dive->when = (time_t)(atol(data[1]));
|
||||
if (data[2])
|
||||
utf8_string(data[2], &cur_dive->notes);
|
||||
utf8_string(data[2], &state->cur_dive->notes);
|
||||
|
||||
if (data[3])
|
||||
cur_dive->duration.seconds = atoi(data[3]);
|
||||
state->cur_dive->duration.seconds = atoi(data[3]);
|
||||
if (data[15])
|
||||
cur_dive->dc.duration.seconds = atoi(data[15]);
|
||||
state->cur_dive->dc.duration.seconds = atoi(data[15]);
|
||||
|
||||
/*
|
||||
* TODO: the deviceid hash should be calculated here.
|
||||
*/
|
||||
settings_start();
|
||||
dc_settings_start();
|
||||
settings_start(state);
|
||||
dc_settings_start(state);
|
||||
if (data[4]) {
|
||||
utf8_string(data[4], &cur_settings.dc.serial_nr);
|
||||
cur_settings.dc.deviceid = atoi(data[4]);
|
||||
utf8_string(data[4], &state->cur_settings.dc.serial_nr);
|
||||
state->cur_settings.dc.deviceid = atoi(data[4]);
|
||||
}
|
||||
if (data[5])
|
||||
utf8_string(data[5], &cur_settings.dc.model);
|
||||
utf8_string(data[5], &state->cur_settings.dc.model);
|
||||
|
||||
dc_settings_end();
|
||||
settings_end();
|
||||
dc_settings_end(state);
|
||||
settings_end(state);
|
||||
|
||||
if (data[6])
|
||||
cur_dive->dc.maxdepth.mm = lrint(strtod_flags(data[6], NULL, 0) * 1000);
|
||||
state->cur_dive->dc.maxdepth.mm = lrint(strtod_flags(data[6], NULL, 0) * 1000);
|
||||
if (data[8])
|
||||
cur_dive->dc.airtemp.mkelvin = C_to_mkelvin(atoi(data[8]));
|
||||
state->cur_dive->dc.airtemp.mkelvin = C_to_mkelvin(atoi(data[8]));
|
||||
if (data[9])
|
||||
cur_dive->dc.watertemp.mkelvin = C_to_mkelvin(atoi(data[9]));
|
||||
state->cur_dive->dc.watertemp.mkelvin = C_to_mkelvin(atoi(data[9]));
|
||||
|
||||
if (data[4]) {
|
||||
cur_dive->dc.deviceid = atoi(data[4]);
|
||||
state->cur_dive->dc.deviceid = atoi(data[4]);
|
||||
}
|
||||
if (data[5])
|
||||
utf8_string(data[5], &cur_dive->dc.model);
|
||||
utf8_string(data[5], &state->cur_dive->dc.model);
|
||||
|
||||
snprintf(get_events, sizeof(get_events) - 1, get_cylinders_template, cur_dive->number);
|
||||
retval = sqlite3_exec(handle, get_events, &dm5_cylinders, 0, &err);
|
||||
snprintf(get_events, sizeof(get_events) - 1, get_cylinders_template, state->cur_dive->number);
|
||||
retval = sqlite3_exec(handle, get_events, &dm5_cylinders, state, &err);
|
||||
if (retval != SQLITE_OK) {
|
||||
fprintf(stderr, "%s", "Database query dm5_cylinders failed.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (data[14])
|
||||
cur_dive->dc.surface_pressure.mbar = (atoi(data[14]) / 100);
|
||||
state->cur_dive->dc.surface_pressure.mbar = (atoi(data[14]) / 100);
|
||||
|
||||
interval = data[16] ? atoi(data[16]) : 0;
|
||||
|
||||
|
|
@ -469,20 +476,20 @@ extern int dm5_dive(void *param, int columns, char **data, char **column)
|
|||
}
|
||||
}
|
||||
|
||||
for (i = 0; interval && sampleBlob && i * interval < cur_dive->duration.seconds; i++) {
|
||||
for (i = 0; interval && sampleBlob && i * interval < state->cur_dive->duration.seconds; i++) {
|
||||
float *depth = (float *)&sampleBlob[i * block_size + 3];
|
||||
int32_t pressure = (sampleBlob[i * block_size + 9] << 16) + (sampleBlob[i * block_size + 8] << 8) + sampleBlob[i * block_size + 7];
|
||||
|
||||
sample_start();
|
||||
cur_sample->time.seconds = i * interval;
|
||||
cur_sample->depth.mm = lrintf(depth[0] * 1000.0f);
|
||||
sample_start(state);
|
||||
state->cur_sample->time.seconds = i * interval;
|
||||
state->cur_sample->depth.mm = lrintf(depth[0] * 1000.0f);
|
||||
|
||||
if (tempformat == 1) {
|
||||
float *temp = (float *)&(sampleBlob[i * block_size + 11]);
|
||||
cur_sample->temperature.mkelvin = C_to_mkelvin(*temp);
|
||||
state->cur_sample->temperature.mkelvin = C_to_mkelvin(*temp);
|
||||
} else {
|
||||
if ((sampleBlob[i * block_size + 11]) != 0x7F) {
|
||||
cur_sample->temperature.mkelvin = C_to_mkelvin(sampleBlob[i * block_size + 11]);
|
||||
state->cur_sample->temperature.mkelvin = C_to_mkelvin(sampleBlob[i * block_size + 11]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -490,8 +497,8 @@ extern int dm5_dive(void *param, int columns, char **data, char **column)
|
|||
* Limit cylinder pressures to somewhat sensible values
|
||||
*/
|
||||
if (pressure >= 0 && pressure < 350000)
|
||||
cur_sample->pressure[0].mbar = pressure;
|
||||
sample_end();
|
||||
state->cur_sample->pressure[0].mbar = pressure;
|
||||
sample_end(state);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -507,44 +514,44 @@ extern int dm5_dive(void *param, int columns, char **data, char **column)
|
|||
profileBlob = (float *)data[17];
|
||||
tempBlob = (unsigned char *)data[18];
|
||||
pressureBlob = (int *)data[19];
|
||||
for (i = 0; interval && i * interval < cur_dive->duration.seconds; i++) {
|
||||
sample_start();
|
||||
cur_sample->time.seconds = i * interval;
|
||||
for (i = 0; interval && i * interval < state->cur_dive->duration.seconds; i++) {
|
||||
sample_start(state);
|
||||
state->cur_sample->time.seconds = i * interval;
|
||||
if (profileBlob)
|
||||
cur_sample->depth.mm = lrintf(profileBlob[i] * 1000.0f);
|
||||
state->cur_sample->depth.mm = lrintf(profileBlob[i] * 1000.0f);
|
||||
else
|
||||
cur_sample->depth.mm = cur_dive->dc.maxdepth.mm;
|
||||
state->cur_sample->depth.mm = state->cur_dive->dc.maxdepth.mm;
|
||||
|
||||
if (data[18] && data[18][0])
|
||||
cur_sample->temperature.mkelvin = C_to_mkelvin(tempBlob[i]);
|
||||
state->cur_sample->temperature.mkelvin = C_to_mkelvin(tempBlob[i]);
|
||||
if (data[19] && data[19][0])
|
||||
cur_sample->pressure[0].mbar = pressureBlob[i];
|
||||
sample_end();
|
||||
state->cur_sample->pressure[0].mbar = pressureBlob[i];
|
||||
sample_end(state);
|
||||
}
|
||||
}
|
||||
|
||||
snprintf(get_events, sizeof(get_events) - 1, get_gaschange_template, cur_dive->number);
|
||||
retval = sqlite3_exec(handle, get_events, &dm5_gaschange, 0, &err);
|
||||
snprintf(get_events, sizeof(get_events) - 1, get_gaschange_template, state->cur_dive->number);
|
||||
retval = sqlite3_exec(handle, get_events, &dm5_gaschange, state, &err);
|
||||
if (retval != SQLITE_OK) {
|
||||
fprintf(stderr, "%s", "Database query dm5_gaschange failed.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
snprintf(get_events, sizeof(get_events) - 1, get_events_template, cur_dive->number);
|
||||
retval = sqlite3_exec(handle, get_events, &dm4_events, 0, &err);
|
||||
snprintf(get_events, sizeof(get_events) - 1, get_events_template, state->cur_dive->number);
|
||||
retval = sqlite3_exec(handle, get_events, &dm4_events, state, &err);
|
||||
if (retval != SQLITE_OK) {
|
||||
fprintf(stderr, "%s", "Database query dm4_events failed.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
snprintf(get_events, sizeof(get_events) - 1, get_tags_template, cur_dive->number);
|
||||
retval = sqlite3_exec(handle, get_events, &dm4_tags, 0, &err);
|
||||
snprintf(get_events, sizeof(get_events) - 1, get_tags_template, state->cur_dive->number);
|
||||
retval = sqlite3_exec(handle, get_events, &dm4_tags, state, &err);
|
||||
if (retval != SQLITE_OK) {
|
||||
fprintf(stderr, "%s", "Database query dm4_tags failed.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
dive_end();
|
||||
dive_end(state);
|
||||
|
||||
return SQLITE_OK;
|
||||
}
|
||||
|
|
@ -557,13 +564,18 @@ int parse_dm5_buffer(sqlite3 *handle, const char *url, const char *buffer, int s
|
|||
|
||||
int retval;
|
||||
char *err = NULL;
|
||||
target_table = table;
|
||||
struct parser_state state;
|
||||
|
||||
init_parser_state(&state);
|
||||
state.target_table = table;
|
||||
state.sql_handle = handle;
|
||||
|
||||
/* StartTime is converted from Suunto's nano seconds to standard
|
||||
* time. We also need epoch, not seconds since year 1. */
|
||||
char get_dives[] = "select DiveId,StartTime/10000000-62135596800,Note,Duration,coalesce(SourceSerialNumber,SerialNumber),Source,MaxDepth,SampleInterval,StartTemperature,BottomTemperature,StartPressure,EndPressure,'','',SurfacePressure,DiveTime,SampleInterval,ProfileBlob,TemperatureBlob,PressureBlob,'','','','',SampleBlob FROM Dive where Deleted is null";
|
||||
|
||||
retval = sqlite3_exec(handle, get_dives, &dm5_dive, handle, &err);
|
||||
retval = sqlite3_exec(handle, get_dives, &dm5_dive, &state, &err);
|
||||
free_parser_state(&state);
|
||||
|
||||
if (retval != SQLITE_OK) {
|
||||
fprintf(stderr, "Database query failed '%s'.\n", url);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue