kernel/spinlock: Move validation out of header inlines
The validation checking recently added to spinlocks is useful, but
requires kernel-internals like _current and _current_cpu in a header
context that tends to be needed before those are declared (or where we
don't want them declared), and is causing big header dependency
headaches.
Move it to C code, it's just a validation tool, not a performance
thing.
Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
diff --git a/kernel/thread.c b/kernel/thread.c
index 50613de..80c3915 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -16,6 +16,7 @@
#include <toolchain.h>
#include <linker/sections.h>
+#include <spinlock.h>
#include <kernel_structs.h>
#include <misc/printk.h>
#include <sys_clock.h>
@@ -704,3 +705,28 @@
_thread_entry(entry, p1, p2, p3);
#endif
}
+
+/* These spinlock assertion predicates are defined here because having
+ * them in spinlock.h is a giant header ordering headache.
+ */
+#ifdef SPIN_VALIDATE
+int z_spin_lock_valid(struct k_spinlock *l)
+{
+ if (l->thread_cpu) {
+ if ((l->thread_cpu & 3) == _current_cpu->id) {
+ return 0;
+ }
+ }
+ l->thread_cpu = _current_cpu->id | (u32_t)_current;
+ return 1;
+}
+
+int z_spin_unlock_valid(struct k_spinlock *l)
+{
+ if (l->thread_cpu != (_current_cpu->id | (u32_t)_current)) {
+ return 0;
+ }
+ l->thread_cpu = 0;
+ return 1;
+}
+#endif
