nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 02:48:37 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 58e38a91c3 into 39780fdae1

Browse source
This commit is contained in:
hujun5 2025-01-12 00:18:19 +08:00 committed by GitHub
commit 85eb63dd4e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sched/clock/clock_adjtime.c
View file

@ -49,6 +49,7 @@
static struct wdog_s g_adjtime_wdog; static struct wdog_s g_adjtime_wdog;
static long g_adjtime_ppb; static long g_adjtime_ppb;
static spinlock_t g_adjtime_lock = SP_UNLOCKED;
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
@ -58,8 +59,12 @@ static long g_adjtime_ppb;
static void adjtime_wdog_callback(wdparm_t arg) static void adjtime_wdog_callback(wdparm_t arg)
{ {
irqstate_t flags;
UNUSED(arg); UNUSED(arg);
flags = spin_lock_irqsave(&g_adjtime_lock);
#ifdef CONFIG_ARCH_HAVE_ADJTIME #ifdef CONFIG_ARCH_HAVE_ADJTIME
up_adjtime(0); up_adjtime(0);
#endif #endif
@ -69,6 +74,7 @@ static void adjtime_wdog_callback(wdparm_t arg)
#endif #endif
g_adjtime_ppb = 0; g_adjtime_ppb = 0;
spin_unlock_irqrestore(&g_adjtime_lock, flags);
} }
/* Query remaining adjustment in microseconds */ /* Query remaining adjustment in microseconds */
@ -108,7 +114,7 @@ static int adjtime_start(long long adjust_usec)
ppb = -ppb_limit; ppb = -ppb_limit;
} }
flags = enter_critical_section(); flags = spin_lock_irqsave(&g_adjtime_lock);
/* Set new adjustment */ /* Set new adjustment */
@ -134,7 +140,7 @@ static int adjtime_start(long long adjust_usec)
wd_cancel(&g_adjtime_wdog); wd_cancel(&g_adjtime_wdog);
} }
leave_critical_section(flags); spin_unlock_irqrestore(&g_adjtime_lock, flags);
return ret; return ret;
} }