1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00

random_seed: Improve behaviour with small timer increments with high precision timers

On a Zen 5, on Ubuntu 24.04 (with CLOCKS_PER_SEC 1000000), the
value of clock() in this loop increments by 0 most of the time,
and when it does increment, it usually increments by 1 compared
to the previous round.

Due to the "last_t + 2*last_td + (CLOCKS_PER_SEC > 1000) >= t"
expression, we only manage to take one step forward in this loop
(incrementing i) if clock() increments by 2, while it incremented
by 0 in the previous iteration (last_td).

This is similar to the change done in
c4152fc42e, to speed it up on
systems with very small CLOCKS_PER_SEC. However in this case,
CLOCKS_PER_SEC is still very large, but the machine is fast enough
to hit every clock increment repeatedly.

For this case, use the number of repetitions of each timer value
as entropy source; require a change in the number of repetitions
in order to proceed to the next buffer index.

This helps the fate-random-seed test to actually terminate within
a reasonable time on such a system (where it previously could hang,
running for many minutes).

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö
2025-01-29 11:40:09 +02:00
parent b053f1173d
commit 19a2d26177

View File

@ -83,6 +83,7 @@ static uint32_t get_generic_seed(void)
static uint32_t buffer[512] = { 0 }; static uint32_t buffer[512] = { 0 };
unsigned char digest[20]; unsigned char digest[20];
uint64_t last_i = i; uint64_t last_i = i;
int repeats[3] = { 0 };
av_assert0(sizeof(tmp) >= av_sha_size); av_assert0(sizeof(tmp) >= av_sha_size);
@ -101,8 +102,23 @@ static uint32_t get_generic_seed(void)
int incremented_i = 0; int incremented_i = 0;
int cur_td = t - last_t; int cur_td = t - last_t;
if (last_t + 2*last_td + (CLOCKS_PER_SEC > 1000) < t) { if (last_t + 2*last_td + (CLOCKS_PER_SEC > 1000) < t) {
// If the timer incremented by more than 2*last_td at once,
// we may e.g. have had a context switch. If the timer resolution
// is high (CLOCKS_PER_SEC > 1000), require that the timer
// incremented by more than 1. If the timer resolution is low,
// it is enough that the timer incremented at all.
buffer[++i & 511] += cur_td % 3294638521U; buffer[++i & 511] += cur_td % 3294638521U;
incremented_i = 1; incremented_i = 1;
} else if (t != last_t && repeats[0] > 0 && repeats[1] > 0 &&
repeats[2] > 0 && repeats[0] != repeats[1] &&
repeats[0] != repeats[2]) {
// If the timer resolution is high, and we get the same timer
// value multiple times, use variances in the number of repeats
// of each timer value as entropy. If we get a different number of
// repeats than the last two unique cases, count that as entropy
// and proceed to the next index.
buffer[++i & 511] += (repeats[0] + repeats[1] + repeats[2]) % 3294638521U;
incremented_i = 1;
} else { } else {
buffer[i & 511] = 1664525*buffer[i & 511] + 1013904223 + (cur_td % 3294638521U); buffer[i & 511] = 1664525*buffer[i & 511] + 1013904223 + (cur_td % 3294638521U);
} }
@ -110,6 +126,16 @@ static uint32_t get_generic_seed(void)
if (last_i && i - last_i > 4 || i - last_i > 64 || TEST && i - last_i > 8) if (last_i && i - last_i > 4 || i - last_i > 64 || TEST && i - last_i > 8)
break; break;
} }
if (t == last_t) {
repeats[0]++;
} else {
// If we got a new unique number of repeats, update the history.
if (repeats[0] != repeats[1]) {
repeats[2] = repeats[1];
repeats[1] = repeats[0];
}
repeats[0] = 0;
}
last_t = t; last_t = t;
last_td = cur_td; last_td = cur_td;
if (!init_t) if (!init_t)