morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

journal-rate-limit: introduce cleanup function for JournalRateLimitGroup

Browse Source 
This also makes journal_ratelimit_group_new() use structured initializer.
This commit is contained in:
Yu Watanabe
2024-05-11 20:44:53 +09:00
parent 88c434f75c
commit bab044b94b
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/journal/journald-rate-limit.c
View File

@@ -92,6 +92,8 @@ static JournalRateLimitGroup* journal_ratelimit_group_free(JournalRateLimitGroup
return mfree(g);
}
DEFINE_TRIVIAL_CLEANUP_FUNC(JournalRateLimitGroup*, journal_ratelimit_group_free);
void journal_ratelimit_free(JournalRateLimit *r) {
assert(r);
@@ -121,28 +123,30 @@ static void journal_ratelimit_vacuum(JournalRateLimit *r, usec_t ts) {
journal_ratelimit_group_free(r->lru_tail);
}
static JournalRateLimitGroup* journal_ratelimit_group_new(
static int journal_ratelimit_group_new(
JournalRateLimit *rl,
const char *id,
usec_t interval,
usec_t ts) {
usec_t ts,
JournalRateLimitGroup **ret) {
JournalRateLimitGroup *g;
_cleanup_(journal_ratelimit_group_freep) JournalRateLimitGroup *g = NULL;
assert(rl);
assert(id);
assert(ret);
g = new0(JournalRateLimitGroup, 1);
g = new(JournalRateLimitGroup, 1);
if (!g)
return NULL;
return -ENOMEM;
g->id = strdup(id);
*g = (JournalRateLimitGroup) {
.id = strdup(id),
.hash = siphash24_string(id, rl->hash_key),
.interval = interval,
};
if (!g->id)
goto fail;
g->hash = siphash24_string(g->id, rl->hash_key);
g->interval = interval;
return -ENOMEM;
journal_ratelimit_vacuum(rl, ts);
@@ -153,11 +157,9 @@ static JournalRateLimitGroup* journal_ratelimit_group_new(
rl->n_groups++;
g->parent = rl;
return g;
fail:
journal_ratelimit_group_free(g);
return NULL;
*ret = TAKE_PTR(g);
return 0;
}
static unsigned burst_modulate(unsigned burst, uint64_t available) {
@@ -201,6 +203,7 @@ int journal_ratelimit_test(
unsigned burst;
uint64_t h;
usec_t ts;
int r;
assert(id);
@@ -226,9 +229,9 @@ int journal_ratelimit_test(
}
if (!found) {
found = journal_ratelimit_group_new(rl, id, rl_interval, ts);
if (!found)
return -ENOMEM;
r = journal_ratelimit_group_new(rl, id, rl_interval, ts, &found);
if (r < 0)
return r;
} else
found->interval = rl_interval;