proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-17 19:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10697 from donaldsharp/free_bsd_clock_gettime

Browse Source 
lib: Fix FreeBSD clock_gettime(CLOCK_THREAD_CPUTIME_ID,..) going back…
This commit is contained in:
Jafar Al-Gharaibeh 2022-03-01 12:48:47 -06:00 committed by GitHub
commit ec616c97ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/thread.c
View File

@ -1884,6 +1884,27 @@ unsigned long thread_consumed_time(RUSAGE_T *now, RUSAGE_T *start,
unsigned long *cputime) unsigned long *cputime)
{ {
#ifdef HAVE_CLOCK_THREAD_CPUTIME_ID #ifdef HAVE_CLOCK_THREAD_CPUTIME_ID
#ifdef __FreeBSD__
/*
* FreeBSD appears to have an issue when calling clock_gettime
* with CLOCK_THREAD_CPUTIME_ID really close to each other
* occassionally the now time will be before the start time.
* This is not good and FRR is ending up with CPU HOG's
* when the subtraction wraps to very large numbers
*
* What we are going to do here is cheat a little bit
* and notice that this is a problem and just correct
* it so that it is impossible to happen
*/
if (start->cpu.tv_sec == now->cpu.tv_sec &&
start->cpu.tv_nsec > now->cpu.tv_nsec)
now->cpu.tv_nsec = start->cpu.tv_nsec + 1;
else if (start->cpu.tv_sec > now->cpu.tv_sec) {
now->cpu.tv_sec = start->cpu.tv_sec;
now->cpu.tv_nsec = start->cpu.tv_nsec + 1;
}
#endif
*cputime = (now->cpu.tv_sec - start->cpu.tv_sec) * TIMER_SECOND_MICRO *cputime = (now->cpu.tv_sec - start->cpu.tv_sec) * TIMER_SECOND_MICRO
+ (now->cpu.tv_nsec - start->cpu.tv_nsec) / 1000; + (now->cpu.tv_nsec - start->cpu.tv_nsec) / 1000;
#else #else