Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix usage of gzip_compression #691

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix usage of gzip_compression #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2cae7f
Fix usage of gzip_compression
averater Oct 28, 2024
2bb3478
Fix bad copypaste
averater Oct 28, 2024
d4737ed
Merge branch 'master' into fix_gzip_flag_usage
averater Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/offlinelogstorage/dlt_offline_logstorage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,14 +1340,13 @@ DLT_STATIC int dlt_logstorage_check_gzip_compression(DltLogStorageFilterConfig *
} else if (strcasestr(value, "OFF") != NULL) {
config->gzip_compression = DLT_LOGSTORAGE_GZIP_OFF;
} else {
dlt_log(LOG_WARNING,
"Unknown gzip compression flag. Set default OFF\n");
config->gzip_compression = DLT_LOGSTORAGE_GZIP_OFF;
dlt_log(LOG_WARNING, "Unknown gzip compression flag\n");
config->gzip_compression = DLT_LOGSTORAGE_GZIP_ERROR;
return 1;
}
#else
dlt_log(LOG_WARNING, "dlt-daemon not compiled with logstorage gzip support\n");
config->gzip_compression = 0;
config->gzip_compression = DLT_LOGSTORAGE_GZIP_OFF;
#endif
return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions src/offlinelogstorage/dlt_offline_logstorage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@
/* Offline Logstorage disable network routing */
#define DLT_LOGSTORAGE_GZIP_ERROR -1 /* error case */
#define DLT_LOGSTORAGE_GZIP_UNSET 0 /* not set */
#define DLT_LOGSTORAGE_GZIP_OFF 1 /* default, enable network routing */
#define DLT_LOGSTORAGE_GZIP_ON (1 << 1) /* disable network routing */
#define DLT_LOGSTORAGE_GZIP_OFF 1 /* default, no compression */
#define DLT_LOGSTORAGE_GZIP_ON (1 << 1) /* enable gzip compression */

/* logstorage max cache */
extern unsigned int g_logstorage_cache_max;
Expand Down
36 changes: 21 additions & 15 deletions src/offlinelogstorage/dlt_offline_logstorage_behavior.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ void dlt_logstorage_log_file_name(char *log_file_name,
}

dlt_logstorage_concat_logfile_name(log_file_name, ".dlt");
if (filter_config->gzip_compression) {
if (filter_config->gzip_compression == DLT_LOGSTORAGE_GZIP_ON) {
dlt_logstorage_concat_logfile_name(log_file_name, ".gz");
}
}
Expand Down Expand Up @@ -370,7 +370,7 @@ int dlt_logstorage_storage_dir_info(DltLogStorageUserConfig *file_config,
config->records = NULL;
}

char *suffix = config->gzip_compression ? ".dlt.gz" : ".dlt";
char *suffix = config->gzip_compression == DLT_LOGSTORAGE_GZIP_ON ? ".dlt.gz" : ".dlt";

for (i = 0; i < cnt; i++) {
int len = 0;
Expand Down Expand Up @@ -486,12 +486,13 @@ DLT_STATIC void dlt_logstorage_open_log_output_file(DltLogStorageFilterConfig *c
return;
}
config->fd = fileno(file);
if (config->gzip_compression) {
if (config->gzip_compression == DLT_LOGSTORAGE_GZIP_ON) {
#ifdef DLT_LOGSTORAGE_USE_GZIP
dlt_vlog(LOG_DEBUG, "%s: Opening GZIP log file\n", __func__);
config->gzlog = gzdopen(config->fd, mode);
#endif
} else {
}
else {
dlt_vlog(LOG_DEBUG, "%s: Opening log file\n", __func__);
config->log = file;
}
Expand Down Expand Up @@ -824,9 +825,10 @@ DLT_STATIC int dlt_logstorage_write_to_log(void *ptr, size_t size, size_t nmemb,
DltLogStorageFilterConfig *config)
{
#ifdef DLT_LOGSTORAGE_USE_GZIP
if (config->gzip_compression) {
if (config->gzip_compression == DLT_LOGSTORAGE_GZIP_ON) {
return gzfwrite(ptr, size, nmemb, config->gzlog);
} else {
}
else {
return fwrite(ptr, size, nmemb, config->log);
}
#else
Expand All @@ -851,26 +853,28 @@ DLT_STATIC void dlt_logstorage_check_write_ret(DltLogStorageFilterConfig *config
}

if (ret <= 0) {
if (config->gzip_compression) {
if (config->gzip_compression == DLT_LOGSTORAGE_GZIP_ON) {
#ifdef DLT_LOGSTORAGE_USE_GZIP
const char *msg = gzerror(config->gzlog, &ret);
if (msg != NULL) {
dlt_vlog(LOG_ERR, "%s: failed to write cache into log file: %s\n", __func__, msg);
}
#endif
} else {
}
else {
if (ferror(config->log) != 0)
dlt_vlog(LOG_ERR, "%s: failed to write cache into log file\n", __func__);
}
}
else {
/* force sync */
if (config->gzip_compression) {
if (config->gzip_compression == DLT_LOGSTORAGE_GZIP_ON) {
#ifdef DLT_LOGSTORAGE_USE_GZIP
if (gzflush(config->gzlog, Z_SYNC_FLUSH) != 0)
dlt_vlog(LOG_ERR, "%s: failed to gzflush log file\n", __func__);
#endif
} else {
}
else {
if (fflush(config->log) != 0)
dlt_vlog(LOG_ERR, "%s: failed to flush log file\n", __func__);
}
Expand Down Expand Up @@ -1094,7 +1098,7 @@ int dlt_logstorage_prepare_on_msg(DltLogStorageFilterConfig *config,
/* Sync only if on_msg */
if ((config->sync == DLT_LOGSTORAGE_SYNC_ON_MSG) ||
(config->sync == DLT_LOGSTORAGE_SYNC_UNSET)) {
if (config->gzip_compression) {
if (config->gzip_compression == DLT_LOGSTORAGE_GZIP_ON) {
if (fsync(fileno(config->gzlog)) != 0) {
if (errno != ENOSYS) {
dlt_vlog(LOG_ERR, "%s: failed to sync gzip log file\n", __func__);
Expand Down Expand Up @@ -1190,10 +1194,11 @@ int dlt_logstorage_write_on_msg(DltLogStorageFilterConfig *config,
dlt_log(LOG_WARNING, "Wrote less data than specified\n");

#ifdef DLT_LOGSTORAGE_USE_GZIP
if (config->gzip_compression) {
if (config->gzip_compression == DLT_LOGSTORAGE_GZIP_ON) {
gzerror(config->gzlog, &ret);
return ret;
} else {
}
else {
return ferror(config->log);
}
#else
Expand Down Expand Up @@ -1224,12 +1229,13 @@ int dlt_logstorage_sync_on_msg(DltLogStorageFilterConfig *config,
return -1;

if (status == DLT_LOGSTORAGE_SYNC_ON_MSG) { /* sync on every message */
if (config->gzip_compression) {
if (config->gzip_compression == DLT_LOGSTORAGE_GZIP_ON) {
#ifdef DLT_LOGSTORAGE_USE_GZIP
if (gzflush(config->gzlog, Z_SYNC_FLUSH) != 0)
dlt_vlog(LOG_ERR, "%s: failed to gzflush log file\n", __func__);
#endif
} else {
}
else {
if (fflush(config->log) != 0)
dlt_vlog(LOG_ERR, "%s: failed to flush log file\n", __func__);
}
Expand Down
Loading