Miroirs/libliftoff
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/emersion/libliftoff.git synced 2024-12-25 21:59:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add buffered log

Browse source 
This adds a buffer struct and some utility functions for continously logging
into a small buffer. In the end the buffer is flushed as a single line to the
specified log channel.
This commit is contained in:
Roman Gilg 2020-03-18 02:17:49 +01:00
parent 780c5b457c
commit 82153bfd5a
2 changed files with 76 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/log.h
View file

@ -15,4 +15,14 @@ void liftoff_log(enum liftoff_log_importance verbosity,
const char *format, ...) _LIFTOFF_ATTRIB_PRINTF(2, 3);
void liftoff_log_errno(enum liftoff_log_importance verbosity, const char *msg);
struct liftoff_log_buffer {
char *data;
size_t len, cap;
};
void liftoff_log_buffer_append(struct liftoff_log_buffer *buf,
const char *fmt, ...);
void liftoff_log_buffer_flush(struct liftoff_log_buffer *buf,
enum liftoff_log_importance verbosity);
#endif

66
log.c
View file

@ -1,5 +1,6 @@
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "log.h"
@ -45,3 +46,68 @@ void liftoff_log_errno(enum liftoff_log_importance verbosity, const char *msg)
{
liftoff_log(verbosity, "%s: %s", msg, strerror(errno));
}
void liftoff_log_buffer_append(struct liftoff_log_buffer *buf,
const char *fmt, ...)
{
if (!buf) {
return;
}
va_list args;
va_start(args, fmt);
if (buf->data == NULL) {
buf->data = malloc(4096);
if (buf->data == NULL) {
liftoff_log_errno(LIFTOFF_ERROR, "malloc");
goto cleanup_out;
}
buf->len = 4096 / sizeof(char);
}
do {
size_t max_len = buf->len - buf->cap;
int ret;
ret = vsnprintf(buf->data + buf->cap, max_len, fmt, args);
if (ret < 0) {
goto cleanup_out;
}
if (ret - (int)max_len > 0) {
buf->cap = buf->len;
buf->len *= 2;
if (realloc(buf->data, buf->len) == NULL) {
liftoff_log_errno(LIFTOFF_ERROR, "realloc");
goto cleanup_out;
}
} else {
buf->cap += ret;
goto final_out;
}
} while (1);
cleanup_out:
free(buf->data);
buf->data = NULL;
buf->cap = 0;
buf->len = 0;
final_out:
va_end(args);
}
void liftoff_log_buffer_flush(struct liftoff_log_buffer *buf,
enum liftoff_log_importance verbosity)
{
if (!buf || !buf->data || buf->len == 0) {
return;
}
liftoff_log(verbosity, "%s\n", buf->data);
free(buf->data);
buf->data = NULL;
buf->cap = 0;
buf->len = 0;
}