sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix compile error

Browse Source 
/home/hujun5/downloads1/vela_sim/nuttx/include/nuttx/spinlock.h: In function 'bool spin_trylock_wo_note(volatile spinlock_t*)':
/home/hujun5/downloads1/vela_sim/nuttx/include/nuttx/spinlock.h:401:22: error: 'atomic_ushort' was not declared in this scope; did you mean 'std::__1::atomic_ushort'?
  401 |     atomic_load((FAR atomic_ushort *)&lock->tickets.next);
      |                      ^~~~~~~~~~~~~
      |                      std::__1::atomic_ushort
/home/hujun5/downloads1/vela_sim/nuttx/include/libcxx/__atomic/aliases.h:33:7: note: 'std::__1::atomic_ushort' declared here
   33 | using atomic_ushort = atomic<unsigned short>;
      |       ^~~~~~~~~~~~~
/home/hujun5/downloads1/vela_sim/nuttx/include/nuttx/spinlock.h:401:37: error: expected primary-expression before ')' token
  401 |     atomic_load((FAR atomic_ushort *)&lock->tickets.next);
      |                                     ^
/home/hujun5/downloads1/vela_sim/nuttx/include/nuttx/spinlock.h:410:14: error: expected unqualified-id before 'new'
  410 |   spinlock_t new =
      |              ^~~
/home/hujun5/downloads1/vela_sim/nuttx/include/nuttx/spinlock.h:417:44: error: 'atomic_uint' was not declared in this scope; did you mean 'std::__1::atomic_uint'?
  417 |   if (!atomic_compare_exchange_strong((FAR atomic_uint *)&lock->value,
      |                                            ^~~~~~~~~~~
      |                                            std::__1::atomic_uint
/home/hujun5/downloads1/vela_sim/nuttx/include/libcxx/__atomic/aliases.h:35:7: note: 'std::__1::atomic_uint' declared here
   35 | using atomic_uint   = atomic<unsigned int>;
      |       ^~~~~~~~~~~
/home/hujun5/downloads1/vela_sim/nuttx/include/nuttx/spinlock.h:417:57: error: expected primary-expression before ')' token
  417 |   if (!atomic_compare_exchange_strong((FAR atomic_uint *)&lock->value,
      |                                                         ^
/home/hujun5/downloads1/vela_sim/nuttx/include/nuttx/spinlock.h:418:54: error: expected type-specifier before '.' token
  418 |                                       &old.value, new.value))

Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
hujun5 2024-07-19 12:59:58 +08:00 committed by Alin Jerpelea
parent b706891fc7
commit d708edab76
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/nuttx/spinlock.h
View File

@ -42,6 +42,8 @@ extern "C++"
# define CONFIG_HAVE_INLINE_SPINLOCK # define CONFIG_HAVE_INLINE_SPINLOCK
using std::atomic_int; using std::atomic_int;
using std::atomic_load; using std::atomic_load;
using std::atomic_uint;
using std::atomic_ushort;
using std::atomic_fetch_add; using std::atomic_fetch_add;
using std::atomic_fetch_sub; using std::atomic_fetch_sub;
using std::atomic_compare_exchange_strong; using std::atomic_compare_exchange_strong;
@ -343,14 +345,14 @@ static inline_function bool spin_trylock(FAR volatile spinlock_t *lock)
unsigned short ticket = unsigned short ticket =
atomic_load((FAR atomic_ushort *)&lock->tickets.next); atomic_load((FAR atomic_ushort *)&lock->tickets.next);
spinlock_t old = spinlock_t oldval =
{ {
{ {
ticket, ticket ticket, ticket
} }
}; };
spinlock_t new = spinlock_t newval =
{ {
{ {
ticket, ticket + 1 ticket, ticket + 1
@ -358,7 +360,7 @@ static inline_function bool spin_trylock(FAR volatile spinlock_t *lock)
}; };
if (!atomic_compare_exchange_strong((FAR atomic_uint *)&lock->value, if (!atomic_compare_exchange_strong((FAR atomic_uint *)&lock->value,
&old.value, new.value)) &oldval.value, newval.value))
#else /* CONFIG_TICKET_SPINLOCK */ #else /* CONFIG_TICKET_SPINLOCK */
if (up_testset(lock) == SP_LOCKED) if (up_testset(lock) == SP_LOCKED)
#endif /* CONFIG_TICKET_SPINLOCK */ #endif /* CONFIG_TICKET_SPINLOCK */
@ -410,14 +412,14 @@ spin_trylock_wo_note(FAR volatile spinlock_t *lock)
unsigned short ticket = unsigned short ticket =
atomic_load((FAR atomic_ushort *)&lock->tickets.next); atomic_load((FAR atomic_ushort *)&lock->tickets.next);
spinlock_t old = spinlock_t oldval =
{ {
{ {
ticket, ticket ticket, ticket
} }
}; };
spinlock_t new = spinlock_t newval =
{ {
{ {
ticket, ticket + 1 ticket, ticket + 1
@ -425,7 +427,7 @@ spin_trylock_wo_note(FAR volatile spinlock_t *lock)
}; };
if (!atomic_compare_exchange_strong((FAR atomic_uint *)&lock->value, if (!atomic_compare_exchange_strong((FAR atomic_uint *)&lock->value,
&old.value, new.value)) &oldval.value, newval.value))
#else /* CONFIG_TICKET_SPINLOCK */ #else /* CONFIG_TICKET_SPINLOCK */
if (up_testset(lock) == SP_LOCKED) if (up_testset(lock) == SP_LOCKED)
#endif /* CONFIG_TICKET_SPINLOCK */ #endif /* CONFIG_TICKET_SPINLOCK */