mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

uemis: turn UEMIS_MEM_* defines into enum

Browse source 
One value (UEMIS_MEM_CRITICAL) wasn't ever used. Remove it.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-01 17:40:25 +02:00 committed by bstoeger
parent 6d8a904981
commit 018884dfde
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
core/uemis-downloader.cpp
View file

@ -52,8 +52,6 @@ constexpr size_t num_param_bufs = 10;
//#define UEMIS_DEBUG 1 + 2 + 4 + 8 + 16 + 32 //#define UEMIS_DEBUG 1 + 2 + 4 + 8 + 16 + 32
#define UEMIS_MAX_FILES 4000 #define UEMIS_MAX_FILES 4000
#define UEMIS_MEM_FULL 1
#define UEMIS_MEM_OK 0
#define UEMIS_SPOT_BLOCK_SIZE 1 #define UEMIS_SPOT_BLOCK_SIZE 1
#define UEMIS_DIVE_DETAILS_SIZE 2 #define UEMIS_DIVE_DETAILS_SIZE 2
#define UEMIS_LOG_BLOCK_SIZE 10 #define UEMIS_LOG_BLOCK_SIZE 10
@ -61,6 +59,10 @@ constexpr size_t num_param_bufs = 10;
#define UEMIS_CHECK_DETAILS 2 #define UEMIS_CHECK_DETAILS 2
#define UEMIS_CHECK_SINGLE_DIVE 3 #define UEMIS_CHECK_SINGLE_DIVE 3
enum class uemis_mem_status {
ok, full
};
#if UEMIS_DEBUG #if UEMIS_DEBUG
static std::string home, user, d_time; static std::string home, user, d_time;
static int debug_round = 0; static int debug_round = 0;
@ -1029,14 +1031,13 @@ static bool do_dump_buffer_to_file(std::string_view buf, const char *prefix)
* filenr holds now the uemis filenr after having read several logs including the dive details, * filenr holds now the uemis filenr after having read several logs including the dive details,
* fCapacity will five us the average number of files needed for all currently loaded data * fCapacity will five us the average number of files needed for all currently loaded data
* remember the maximum file usage per dive * remember the maximum file usage per dive
* return : UEMIS_MEM_OK if there is enough memory for a full round * return : ok if there is enough memory for a full round
* UEMIS_MEM_CRITICAL if the memory is good for reading the dive logs * full if the memory is exhausted
* UEMIS_MEM_FULL if the memory is exhausted
*/ */
static int get_memory(struct dive_table *td, int checkpoint) static uemis_mem_status get_memory(struct dive_table *td, int checkpoint)
{ {
if (td->nr <= 0) if (td->nr <= 0)
return UEMIS_MEM_OK; return uemis_mem_status::ok;
switch (checkpoint) { switch (checkpoint) {
case UEMIS_CHECK_LOG: case UEMIS_CHECK_LOG:
@ -1048,19 +1049,19 @@ static int get_memory(struct dive_table *td, int checkpoint)
report_info("max_mem_used %d (from td->nr %d) * block_size %d > max_files %d - filenr %d?\n", max_mem_used, td->nr, UEMIS_LOG_BLOCK_SIZE, UEMIS_MAX_FILES, filenr); report_info("max_mem_used %d (from td->nr %d) * block_size %d > max_files %d - filenr %d?\n", max_mem_used, td->nr, UEMIS_LOG_BLOCK_SIZE, UEMIS_MAX_FILES, filenr);
#endif #endif
if (max_mem_used * UEMIS_LOG_BLOCK_SIZE > UEMIS_MAX_FILES - filenr) if (max_mem_used * UEMIS_LOG_BLOCK_SIZE > UEMIS_MAX_FILES - filenr)
return UEMIS_MEM_FULL; return uemis_mem_status::full;
break; break;
case UEMIS_CHECK_DETAILS: case UEMIS_CHECK_DETAILS:
/* check if the next set of dive details and dive spot fit into the UEMIS buffer */ /* check if the next set of dive details and dive spot fit into the UEMIS buffer */
if ((UEMIS_DIVE_DETAILS_SIZE + UEMIS_SPOT_BLOCK_SIZE) * UEMIS_LOG_BLOCK_SIZE > UEMIS_MAX_FILES - filenr) if ((UEMIS_DIVE_DETAILS_SIZE + UEMIS_SPOT_BLOCK_SIZE) * UEMIS_LOG_BLOCK_SIZE > UEMIS_MAX_FILES - filenr)
return UEMIS_MEM_FULL; return uemis_mem_status::full;
break; break;
case UEMIS_CHECK_SINGLE_DIVE: case UEMIS_CHECK_SINGLE_DIVE:
if (UEMIS_DIVE_DETAILS_SIZE + UEMIS_SPOT_BLOCK_SIZE > UEMIS_MAX_FILES - filenr) if (UEMIS_DIVE_DETAILS_SIZE + UEMIS_SPOT_BLOCK_SIZE > UEMIS_MAX_FILES - filenr)
return UEMIS_MEM_FULL; return uemis_mem_status::full;
break; break;
} }
return UEMIS_MEM_OK; return uemis_mem_status::ok;
} }
/* we misuse the hidden_by_filter flag to mark a dive as deleted. /* we misuse the hidden_by_filter flag to mark a dive as deleted.
@ -1126,7 +1127,7 @@ static void get_uemis_divespot(device_data_t *devdata, const char *mountpath, in
} }
} }
static bool get_matching_dive(int idx, int &newmax, int *uemis_mem_status, device_data_t *data, const char *mountpath, const char deviceidnr) static bool get_matching_dive(int idx, int &newmax, uemis_mem_status &mem_status, device_data_t *data, const char *mountpath, const char deviceidnr)
{ {
struct dive *dive = data->log->dives->dives[idx]; struct dive *dive = data->log->dives->dives[idx];
char log_file_no_to_find[20]; char log_file_no_to_find[20];
@ -1149,10 +1150,9 @@ static bool get_matching_dive(int idx, int &newmax, int *uemis_mem_status, devic
#if UEMIS_DEBUG & 16 #if UEMIS_DEBUG & 16
do_dump_buffer_to_file(mbuf, "Dive"); do_dump_buffer_to_file(mbuf, "Dive");
#endif #endif
*uemis_mem_status = get_memory(data->log->dives, UEMIS_CHECK_SINGLE_DIVE); mem_status = get_memory(data->log->dives, UEMIS_CHECK_SINGLE_DIVE);
if (*uemis_mem_status == UEMIS_MEM_OK) { if (mem_status == uemis_mem_status::ok) {
/* if the memory isn's completely full we can try to read more dive log vs. dive details /* if the memory isn's completely full we can try to read more dive log vs. dive details
* UEMIS_MEM_CRITICAL means not enough space for a full round but the dive details
* and the dive spots should fit into the UEMIS memory * and the dive spots should fit into the UEMIS memory
* The match we do here is to map the object_id to the logfilenr, we do this * The match we do here is to map the object_id to the logfilenr, we do this
* by iterating through the last set of loaded dive logs and then find the corresponding * by iterating through the last set of loaded dive logs and then find the corresponding
@ -1237,7 +1237,7 @@ std::string do_uemis_import(device_data_t *data)
bool once = true; bool once = true;
int match_dive_and_log = 0; int match_dive_and_log = 0;
int dive_offset = 0; int dive_offset = 0;
int uemis_mem_status = UEMIS_MEM_OK; uemis_mem_status mem_status = uemis_mem_status::ok;
// To speed up sync you can skip downloading old dives by defining UEMIS_DIVE_OFFSET // To speed up sync you can skip downloading old dives by defining UEMIS_DIVE_OFFSET
if (getenv("UEMIS_DIVE_OFFSET")) { if (getenv("UEMIS_DIVE_OFFSET")) {
@ -1297,13 +1297,13 @@ std::string do_uemis_import(device_data_t *data)
param_buff[2] = newmax_str.c_str(); param_buff[2] = newmax_str.c_str();
param_buff[3].clear(); param_buff[3].clear();
std::string mbuf = uemis_get_answer(mountpath, "getDivelogs", 3, 0, result); std::string mbuf = uemis_get_answer(mountpath, "getDivelogs", 3, 0, result);
uemis_mem_status = get_memory(data->log->dives, UEMIS_CHECK_DETAILS); mem_status = get_memory(data->log->dives, UEMIS_CHECK_DETAILS);
/* first, remove any leading garbage... this needs to start with a '{' */ /* first, remove any leading garbage... this needs to start with a '{' */
std::string_view realmbuf = mbuf; std::string_view realmbuf = mbuf;
size_t pos = realmbuf.find('{'); size_t pos = realmbuf.find('{');
if (pos != std::string::npos) if (pos != std::string::npos)
realmbuf = realmbuf.substr(pos); realmbuf = realmbuf.substr(pos);
if (!realmbuf.empty() && uemis_mem_status != UEMIS_MEM_FULL) { if (!realmbuf.empty() && mem_status != uemis_mem_status::full) {
#if UEMIS_DEBUG & 16 #if UEMIS_DEBUG & 16
do_dump_buffer_to_file(realmbuf, "Dive logs"); do_dump_buffer_to_file(realmbuf, "Dive logs");
#endif #endif
@ -1341,7 +1341,7 @@ std::string do_uemis_import(device_data_t *data)
* dive_to_read = the dive details entry that need to be read using the object_id * dive_to_read = the dive details entry that need to be read using the object_id
* logFileNoToFind = map the logfilenr of the dive details with the object_id = diveid from the get dive logs */ * logFileNoToFind = map the logfilenr of the dive details with the object_id = diveid from the get dive logs */
for (int i = match_dive_and_log; i < data->log->dives->nr; i++) { for (int i = match_dive_and_log; i < data->log->dives->nr; i++) {
if (!get_matching_dive(i, newmax, &uemis_mem_status, data, mountpath, deviceidnr)) if (!get_matching_dive(i, newmax, mem_status, data, mountpath, deviceidnr))
break; break;
if (import_thread_cancelled) if (import_thread_cancelled)
break; break;
@ -1350,8 +1350,8 @@ std::string do_uemis_import(device_data_t *data)
start = end; start = end;
/* Do some memory checking here */ /* Do some memory checking here */
uemis_mem_status = get_memory(data->log->dives, UEMIS_CHECK_LOG); mem_status = get_memory(data->log->dives, UEMIS_CHECK_LOG);
if (uemis_mem_status != UEMIS_MEM_OK) { if (mem_status != uemis_mem_status::ok) {
#if UEMIS_DEBUG & 4 #if UEMIS_DEBUG & 4
report_info("d_u_i out of memory, bailing\n"); report_info("d_u_i out of memory, bailing\n");
#endif #endif
@ -1364,7 +1364,7 @@ std::string do_uemis_import(device_data_t *data)
// Resetting to original state // Resetting to original state
filenr = 0; filenr = 0;
max_mem_used = -1; max_mem_used = -1;
uemis_mem_status = get_memory(data->log->dives, UEMIS_CHECK_DETAILS); mem_status = get_memory(data->log->dives, UEMIS_CHECK_DETAILS);
if (uemis_get_answer(mountpath, "getDeviceId", 0, 1, result).empty()) if (uemis_get_answer(mountpath, "getDeviceId", 0, 1, result).empty())
goto bail; goto bail;
if (deviceid != param_buff[0]) { if (deviceid != param_buff[0]) {
@ -1406,7 +1406,7 @@ std::string do_uemis_import(device_data_t *data)
* The loaded block of dive logs is useless and all new loaded dive logs need to * The loaded block of dive logs is useless and all new loaded dive logs need to
* be deleted from the download_table. * be deleted from the download_table.
*/ */
if (uemis_mem_status == UEMIS_MEM_FULL) if (mem_status == uemis_mem_status::full)
do_delete_dives(data->log->dives, match_dive_and_log); do_delete_dives(data->log->dives, match_dive_and_log);
#if UEMIS_DEBUG & 4 #if UEMIS_DEBUG & 4
report_info("d_u_i out of memory, bailing instead of processing\n"); report_info("d_u_i out of memory, bailing instead of processing\n");
@ -1431,7 +1431,7 @@ std::string do_uemis_import(device_data_t *data)
next_table_index++; next_table_index++;
} }
if (uemis_mem_status != UEMIS_MEM_OK) if (mem_status != uemis_mem_status::ok)
result = translate("gettextFromC", ERR_FS_ALMOST_FULL); result = translate("gettextFromC", ERR_FS_ALMOST_FULL);
if (data->sync_time) if (data->sync_time)