shinys000114/odroid-power-mate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize log rotation by removing temporary file usage and improving file handling.

Browse Source 
Signed-off-by: YoungSoo Shin <shinys000114@gmail.com>
This commit is contained in:
YoungSoo Shin
2025-08-27 10:41:27 +09:00
parent e2b4b96870
commit e9921df8c6
1 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
main/service/datalog.c
View File

@@ -3,12 +3,12 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h>
#include "esp_littlefs.h" #include "esp_littlefs.h"
#include "esp_log.h" #include "esp_log.h"
static const char* TAG = "DATALOG"; static const char* TAG = "DATALOG";
static const char* LOG_FILE_PATH = "/littlefs/datalog.csv"; static const char* LOG_FILE_PATH = "/littlefs/datalog.csv";
static const char* TEMP_LOG_FILE_PATH = "/littlefs/datalog.tmp";
#define MAX_LOG_SIZE (1024 * 1024) #define MAX_LOG_SIZE (1024 * 1024)
void datalog_init(void) void datalog_init(void)
@@ -102,18 +102,10 @@ void datalog_add(uint32_t timestamp, float voltage, float current, float power)
else else
{ {
ESP_LOGI(TAG, "Log file is full. Rotating log file."); ESP_LOGI(TAG, "Log file is full. Rotating log file.");
FILE* f_read = fopen(LOG_FILE_PATH, "r"); FILE* f = fopen(LOG_FILE_PATH, "r+");
if (f_read == NULL) if (f == NULL)
{ {
ESP_LOGE(TAG, "Could not open log for reading"); ESP_LOGE(TAG, "Failed to open log file for rotation.");
return;
}
FILE* f_write = fopen(TEMP_LOG_FILE_PATH, "w");
if (f_write == NULL)
{
ESP_LOGE(TAG, "Could not open temp file for writing");
fclose(f_read);
return; return;
} }
@@ -121,51 +113,55 @@ void datalog_add(uint32_t timestamp, float voltage, float current, float power)
char line[256]; char line[256];
// Keep header // Keep header
if (fgets(line, sizeof(line), f_read) != NULL) if (fgets(line, sizeof(line), f) == NULL)
{
fputs(line, f_write);
}
else
{ {
ESP_LOGE(TAG, "Could not read header"); ESP_LOGE(TAG, "Could not read header");
fclose(f_read); fclose(f);
fclose(f_write);
return; return;
} }
long header_len = strlen(line);
// Find the starting position of the data to keep (read position)
fseek(f, header_len, SEEK_SET);
long bytes_skipped = 0; long bytes_skipped = 0;
while (fgets(line, sizeof(line), f_read) != NULL) while (fgets(line, sizeof(line), f) != NULL)
{ {
bytes_skipped += strlen(line); bytes_skipped += strlen(line);
if (bytes_skipped >= size_to_remove) if (bytes_skipped >= size_to_remove)
{ {
fputs(line, f_write);
break; break;
} }
} }
while (fgets(line, sizeof(line), f_read) != NULL) long read_pos = ftell(f) - strlen(line);
long write_pos = header_len;
char buffer[256];
while (1)
{ {
fputs(line, f_write); fseek(f, read_pos, SEEK_SET);
size_t bytes_read = fread(buffer, 1, sizeof(buffer), f);
if (bytes_read == 0)
{
break;
}
read_pos = ftell(f);
fseek(f, write_pos, SEEK_SET);
fwrite(buffer, 1, bytes_read, f);
write_pos = ftell(f);
} }
fputs(new_line, f_write); if (ftruncate(fileno(f), write_pos) != 0) {
ESP_LOGE(TAG, "Failed to truncate log file.");
}
fclose(f_read); fseek(f, 0, SEEK_END);
fclose(f_write); fputs(new_line, f);
fclose(f);
if (remove(LOG_FILE_PATH) != 0) ESP_LOGI(TAG, "Log file rotated successfully.");
{
ESP_LOGE(TAG, "Failed to remove old log file");
}
else if (rename(TEMP_LOG_FILE_PATH, LOG_FILE_PATH) != 0)
{
ESP_LOGE(TAG, "Failed to rename temp file");
}
else
{
ESP_LOGI(TAG, "Log file rotated successfully.");
}
} }
} }