Browse Source

AP_Logger: prevent log erase from triggering watchdog

mission-4.1.18
Andrew Tridgell 6 years ago
parent
commit
0b20d972cd
  1. 20
      libraries/AP_Logger/AP_Logger_File.cpp

20
libraries/AP_Logger/AP_Logger_File.cpp

@ -87,10 +87,12 @@ void AP_Logger_File::Init() @@ -87,10 +87,12 @@ void AP_Logger_File::Init()
_log_directory = custom_dir;
}
hal.scheduler->expect_delay_ms(3000);
ret = stat(_log_directory, &st);
if (ret == -1) {
ret = mkdir(_log_directory, 0777);
}
hal.scheduler->expect_delay_ms(0);
if (ret == -1 && errno != EEXIST) {
printf("Failed to create log directory %s : %s\n", _log_directory, strerror(errno));
}
@ -122,11 +124,14 @@ void AP_Logger_File::Init() @@ -122,11 +124,14 @@ void AP_Logger_File::Init()
bool AP_Logger_File::file_exists(const char *filename) const
{
struct stat st;
hal.scheduler->expect_delay_ms(3000);
if (stat(filename, &st) == -1) {
// hopefully errno==ENOENT. If some error occurs it is
// probably better to assume this file exists.
hal.scheduler->expect_delay_ms(0);
return false;
}
hal.scheduler->expect_delay_ms(0);
return true;
}
@ -254,14 +259,18 @@ uint16_t AP_Logger_File::find_oldest_log() @@ -254,14 +259,18 @@ uint16_t AP_Logger_File::find_oldest_log()
// We could count up to find_last_log(), but if people start
// relying on the min_avail_space_percent feature we could end up
// doing a *lot* of asprintf()s and stat()s
hal.scheduler->expect_delay_ms(3000);
DIR *d = opendir(_log_directory);
hal.scheduler->expect_delay_ms(0);
if (d == nullptr) {
// SD card may have died? On linux someone may have rm-rf-d
return 0;
}
// we only remove files which look like xxx.BIN
hal.scheduler->expect_delay_ms(3000);
for (struct dirent *de=readdir(d); de; de=readdir(d)) {
hal.scheduler->expect_delay_ms(3000);
uint8_t length = strlen(de->d_name);
if (length < 5) {
// not long enough for \d+[.]BIN
@ -296,6 +305,7 @@ uint16_t AP_Logger_File::find_oldest_log() @@ -296,6 +305,7 @@ uint16_t AP_Logger_File::find_oldest_log()
}
}
closedir(d);
hal.scheduler->expect_delay_ms(0);
_cached_oldest_log = current_oldest_log;
return current_oldest_log;
@ -339,6 +349,7 @@ void AP_Logger_File::Prep_MinSpace() @@ -339,6 +349,7 @@ void AP_Logger_File::Prep_MinSpace()
if (file_exists(filename_to_remove)) {
hal.console->printf("Removing (%s) for minimum-space requirements (%.2f%% < %.0f%%)\n",
filename_to_remove, (double)avail, (double)min_avail_space_percent);
hal.scheduler->expect_delay_ms(2000);
if (unlink(filename_to_remove) == -1) {
hal.console->printf("Failed to remove %s: %s\n", filename_to_remove, strerror(errno));
free(filename_to_remove);
@ -352,6 +363,7 @@ void AP_Logger_File::Prep_MinSpace() @@ -352,6 +363,7 @@ void AP_Logger_File::Prep_MinSpace()
} else {
free(filename_to_remove);
}
hal.scheduler->expect_delay_ms(0);
}
log_to_remove++;
if (log_to_remove > MAX_LOG_FILES) {
@ -465,7 +477,9 @@ void AP_Logger_File::EraseAll() @@ -465,7 +477,9 @@ void AP_Logger_File::EraseAll()
if (fname == nullptr) {
break;
}
hal.scheduler->expect_delay_ms(3000);
unlink(fname);
hal.scheduler->expect_delay_ms(0);
free(fname);
}
char *fname = _lastlog_file_name();
@ -598,11 +612,14 @@ uint32_t AP_Logger_File::_get_log_size(const uint16_t log_num) @@ -598,11 +612,14 @@ uint32_t AP_Logger_File::_get_log_size(const uint16_t log_num)
write_fd_semaphore.give();
}
struct stat st;
hal.scheduler->expect_delay_ms(3000);
if (::stat(fname, &st) != 0) {
printf("Unable to fetch Log File Size: %s\n", strerror(errno));
free(fname);
hal.scheduler->expect_delay_ms(0);
return 0;
}
hal.scheduler->expect_delay_ms(0);
free(fname);
return st.st_size;
}
@ -627,11 +644,14 @@ uint32_t AP_Logger_File::_get_log_time(const uint16_t log_num) @@ -627,11 +644,14 @@ uint32_t AP_Logger_File::_get_log_time(const uint16_t log_num)
write_fd_semaphore.give();
}
struct stat st;
hal.scheduler->expect_delay_ms(3000);
if (::stat(fname, &st) != 0) {
free(fname);
hal.scheduler->expect_delay_ms(0);
return 0;
}
free(fname);
hal.scheduler->expect_delay_ms(0);
return st.st_mtime;
}

Loading…
Cancel
Save