Module: xenomai-jki
Branch: for-forge
Commit: dfb1d31ee3346f415b2ece4301d8a5f9d7dec4c1
URL:
http://git.xenomai.org/?p=xenomai-jki.git;a=commit;h=dfb1d31ee3346f415b2ece4301d8a5f9d7dec4c1
Author: Jan Kiszka <jan.kis...@siemens.com>
Date: Wed Jul 26 18:50:43 2017 +0200
cobalt: Fix conditional build by avoiding #if XENO_DEBUG()
In contrast to #ifdef CONFIG_x, #if IS_ENABLED(x) (or our wrapper of
the latter) does not update the dependency information for kbuild. So,
switching any config easily left inconsistent build artifacts behind.
This conversion also fixes de66d324a93d: there is and there was never a
CONFIG_XENO_DEBUG_LOCKING.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
include/cobalt/kernel/assert.h | 2 +-
include/cobalt/kernel/lock.h | 14 +++++++-------
include/cobalt/kernel/sched-sporadic.h | 2 +-
include/cobalt/kernel/synch.h | 6 +++---
include/cobalt/kernel/tree.h | 2 +-
kernel/cobalt/bufd.c | 10 +++++-----
kernel/cobalt/debug.c | 4 ++--
kernel/cobalt/posix/process.c | 2 +-
kernel/cobalt/procfs.c | 10 +++++-----
kernel/cobalt/sched-sporadic.c | 8 ++++----
kernel/cobalt/synch.c | 4 ++--
11 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/include/cobalt/kernel/assert.h b/include/cobalt/kernel/assert.h
index 2d2d653..86d0a48 100644
--- a/include/cobalt/kernel/assert.h
+++ b/include/cobalt/kernel/assert.h
@@ -63,7 +63,7 @@
#define realtime_cpu_only() XENO_BUG_ON(CONTEXT,
!xnsched_supported_cpu(ipipe_processor_id()))
#define thread_only() XENO_BUG_ON(CONTEXT, xnsched_interrupt_p())
#define irqoff_only() XENO_BUG_ON(CONTEXT, hard_irqs_disabled() == 0)
-#if XENO_DEBUG(LOCKING)
+#ifdef CONFIG_XENO_OPT_DEBUG_LOCKING
#define atomic_only() XENO_BUG_ON(CONTEXT, (xnlock_is_owner(&nklock)
&& hard_irqs_disabled()) == 0)
#define preemptible_only() XENO_BUG_ON(CONTEXT, xnlock_is_owner(&nklock)
|| hard_irqs_disabled())
#else
diff --git a/include/cobalt/kernel/lock.h b/include/cobalt/kernel/lock.h
index 36f8168..4b1909f 100644
--- a/include/cobalt/kernel/lock.h
+++ b/include/cobalt/kernel/lock.h
@@ -63,7 +63,7 @@ typedef unsigned long spl_t;
*/
#define spltest() ipipe_test_head()
-#if XENO_DEBUG(LOCKING)
+#ifdef CONFIG_XENO_OPT_DEBUG_LOCKING
struct xnlock {
unsigned owner;
@@ -112,7 +112,7 @@ int xnlock_dbg_release(struct xnlock *lock,
DECLARE_PER_CPU(struct xnlockinfo, xnlock_stats);
-#else /* !XENO_DEBUG(LOCKING) */
+#else /* !CONFIG_XENO_OPT_DEBUG_LOCKING */
struct xnlock {
unsigned owner;
@@ -150,9 +150,9 @@ static inline int xnlock_dbg_release(struct xnlock *lock)
return 0;
}
-#endif /* !XENO_DEBUG(LOCKING) */
+#endif /* !CONFIG_XENO_OPT_DEBUG_LOCKING */
-#if defined(CONFIG_SMP) || XENO_DEBUG(LOCKING)
+#if defined(CONFIG_SMP) || defined(CONFIG_XENO_OPT_DEBUG_LOCKING)
#define xnlock_get(lock) __xnlock_get(lock XNLOCK_DBG_CONTEXT)
#define xnlock_put(lock) __xnlock_put(lock XNLOCK_DBG_CONTEXT)
@@ -209,7 +209,7 @@ int ___xnlock_get(struct xnlock *lock /*, */
XNLOCK_DBG_CONTEXT_ARGS);
void ___xnlock_put(struct xnlock *lock /*, */ XNLOCK_DBG_CONTEXT_ARGS);
#endif /* out of line xnlock */
-#if XENO_DEBUG(LOCKING)
+#ifdef CONFIG_XENO_OPT_DEBUG_LOCKING
/* Disable UP-over-SMP kernel optimization in debug mode. */
#define __locking_active__ 1
#else
@@ -263,7 +263,7 @@ static inline void __xnlock_put(struct xnlock *lock /*, */
XNLOCK_DBG_CONTEXT_AR
#undef __locking_active__
-#else /* !(CONFIG_SMP || XENO_DEBUG(LOCKING) */
+#else /* !(CONFIG_SMP || CONFIG_XENO_OPT_DEBUG_LOCKING) */
#define xnlock_init(lock) do { } while(0)
#define xnlock_get(lock) do { } while(0)
@@ -279,7 +279,7 @@ static inline void __xnlock_put(struct xnlock *lock /*, */
XNLOCK_DBG_CONTEXT_AR
#define DEFINE_XNLOCK(lock)
#define DEFINE_PRIVATE_XNLOCK(lock)
-#endif /* !(CONFIG_SMP || XENO_DEBUG(LOCKING)) */
+#endif /* !(CONFIG_SMP || CONFIG_XENO_OPT_DEBUG_LOCKING) */
DECLARE_EXTERN_XNLOCK(nklock);
diff --git a/include/cobalt/kernel/sched-sporadic.h
b/include/cobalt/kernel/sched-sporadic.h
index 0eade47..50ca406 100644
--- a/include/cobalt/kernel/sched-sporadic.h
+++ b/include/cobalt/kernel/sched-sporadic.h
@@ -56,7 +56,7 @@ struct xnsched_sporadic_data {
};
struct xnsched_sporadic {
-#if XENO_DEBUG(COBALT)
+#ifdef CONFIG_XENO_OPT_DEBUG_COBALT
unsigned long drop_retries;
#endif
};
diff --git a/include/cobalt/kernel/synch.h b/include/cobalt/kernel/synch.h
index b3a8004..a2bf80d 100644
--- a/include/cobalt/kernel/synch.h
+++ b/include/cobalt/kernel/synch.h
@@ -115,21 +115,21 @@ static inline struct xnthread *xnsynch_owner(struct
xnsynch *synch)
#define xnsynch_owner_check(synch, thread) \
xnsynch_fast_owner_check((synch)->fastlock, thread->handle)
-#if XENO_DEBUG(MUTEX_RELAXED)
+#ifdef CONFIG_XENO_OPT_DEBUG_MUTEX_RELAXED
void xnsynch_detect_relaxed_owner(struct xnsynch *synch,
struct xnthread *sleeper);
void xnsynch_detect_boosted_relax(struct xnthread *owner);
-#else /* !XENO_DEBUG(MUTEX_RELAXED) */
+#else /* !CONFIG_XENO_OPT_DEBUG_MUTEX_RELAXED */
static inline void xnsynch_detect_relaxed_owner(struct xnsynch *synch,
struct xnthread *sleeper) { }
static inline void xnsynch_detect_boosted_relax(struct xnthread *owner) { }
-#endif /* !XENO_DEBUG(MUTEX_RELAXED) */
+#endif /* !CONFIG_XENO_OPT_DEBUG_MUTEX_RELAXED */
void xnsynch_init(struct xnsynch *synch, int flags,
atomic_t *fastlock);
diff --git a/include/cobalt/kernel/tree.h b/include/cobalt/kernel/tree.h
index 9c751cc..c52ee32 100644
--- a/include/cobalt/kernel/tree.h
+++ b/include/cobalt/kernel/tree.h
@@ -83,7 +83,7 @@ struct xnid *xnid_fetch(struct rb_root *t, xnkey_t key)
static inline int xnid_remove(struct rb_root *t, struct xnid *xnid)
{
-#if XENO_DEBUG(COBALT)
+#ifdef CONFIG_XENO_OPT_DEBUG_COBALT
if (xnid_fetch(t, xnid->key) != xnid)
return -ENOENT;
#endif
diff --git a/kernel/cobalt/bufd.c b/kernel/cobalt/bufd.c
index 9b41b6a..3b79505 100644
--- a/kernel/cobalt/bufd.c
+++ b/kernel/cobalt/bufd.c
@@ -493,7 +493,7 @@ ssize_t xnbufd_unmap_uread(struct xnbufd *bufd)
{
preemptible_only();
-#if XENO_DEBUG(COBALT)
+#ifdef CONFIG_XENO_OPT_DEBUG_COBALT
bufd->b_ptr = (caddr_t)-1;
#endif
return bufd->b_off;
@@ -551,7 +551,7 @@ ssize_t xnbufd_unmap_uwrite(struct xnbufd *bufd)
if (bufd->b_len > sizeof(bufd->b_buf))
xnfree(bufd->b_carry);
done:
-#if XENO_DEBUG(COBALT)
+#ifdef CONFIG_XENO_OPT_DEBUG_COBALT
bufd->b_ptr = (caddr_t)-1;
#endif
return ret ?: (ssize_t)len;
@@ -592,7 +592,7 @@ EXPORT_SYMBOL_GPL(xnbufd_unmap_uwrite);
*/
void xnbufd_invalidate(struct xnbufd *bufd)
{
-#if XENO_DEBUG(COBALT)
+#ifdef CONFIG_XENO_OPT_DEBUG_COBALT
bufd->b_ptr = (caddr_t)-1;
#endif
if (bufd->b_carry) {
@@ -620,7 +620,7 @@ EXPORT_SYMBOL_GPL(xnbufd_invalidate);
*/
ssize_t xnbufd_unmap_kread(struct xnbufd *bufd)
{
-#if XENO_DEBUG(COBALT)
+#ifdef CONFIG_XENO_OPT_DEBUG_COBALT
bufd->b_ptr = (caddr_t)-1;
#endif
return bufd->b_off;
@@ -643,7 +643,7 @@ EXPORT_SYMBOL_GPL(xnbufd_unmap_kread);
*/
ssize_t xnbufd_unmap_kwrite(struct xnbufd *bufd)
{
-#if XENO_DEBUG(COBALT)
+#ifdef CONFIG_XENO_OPT_DEBUG_COBALT
bufd->b_ptr = (caddr_t)-1;
#endif
return bufd->b_off;
diff --git a/kernel/cobalt/debug.c b/kernel/cobalt/debug.c
index 312f43a..159b3c7 100644
--- a/kernel/cobalt/debug.c
+++ b/kernel/cobalt/debug.c
@@ -535,7 +535,7 @@ static inline void init_thread_relax_trace(struct xnthread
*thread)
#endif /* !XENO_OPT_DEBUG_TRACE_RELAX */
-#if XENO_DEBUG(LOCKING)
+#ifdef CONFIG_XENO_OPT_DEBUG_LOCKING
void xnlock_dbg_prepare_acquire(unsigned long long *start)
{
@@ -600,7 +600,7 @@ int xnlock_dbg_release(struct xnlock *lock,
}
EXPORT_SYMBOL_GPL(xnlock_dbg_release);
-#endif /* !XENO_DEBUG(LOCKING) */
+#endif /* CONFIG_XENO_OPT_DEBUG_LOCKING */
void xndebug_shadow_init(struct xnthread *thread)
{
diff --git a/kernel/cobalt/posix/process.c b/kernel/cobalt/posix/process.c
index 2e2ad75..9e67c32 100644
--- a/kernel/cobalt/posix/process.c
+++ b/kernel/cobalt/posix/process.c
@@ -758,7 +758,7 @@ static inline int handle_exception(struct ipipe_trap_data
*d)
* running in primary mode, move it to the Linux domain,
* leaving the kernel process the exception.
*/
-#if XENO_DEBUG(COBALT) || XENO_DEBUG(USER)
+#if defined(CONFIG_XENO_OPT_DEBUG_COBALT) ||
defined(CONFIG_XENO_OPT_DEBUG_USER)
if (!user_mode(d->regs)) {
xntrace_panic_freeze();
printk(XENO_WARNING
diff --git a/kernel/cobalt/procfs.c b/kernel/cobalt/procfs.c
index 9d193af..c453ee3 100644
--- a/kernel/cobalt/procfs.c
+++ b/kernel/cobalt/procfs.c
@@ -27,7 +27,7 @@
#include <xenomai/version.h>
#include "debug.h"
-#if XENO_DEBUG(LOCKING)
+#ifdef CONFIG_XENO_OPT_DEBUG_LOCKING
static int lock_vfile_show(struct xnvfile_regular_iterator *it, void *data)
{
@@ -90,7 +90,7 @@ static struct xnvfile_regular lock_vfile = {
.ops = &lock_vfile_ops,
};
-#endif /* XENO_DEBUG(LOCKING) */
+#endif /* CONFIG_XENO_OPT_DEBUG_LOCKING */
static int latency_vfile_show(struct xnvfile_regular_iterator *it, void *data)
{
@@ -216,11 +216,11 @@ static struct xnvfile_regular apc_vfile = {
void xnprocfs_cleanup_tree(void)
{
#ifdef CONFIG_XENO_OPT_DEBUG
-#ifdef CONFIG_XENO_DEBUG_LOCKING
+#ifdef CONFIG_XENO_OPT_DEBUG_LOCKING
xnvfile_destroy_regular(&lock_vfile);
#endif
xnvfile_destroy_dir(&cobalt_debug_vfroot);
-#endif /* XENO_DEBUG(COBALT) */
+#endif /* XENO_OPT_DEBUG */
xnvfile_destroy_regular(&apc_vfile);
xnvfile_destroy_regular(&faults_vfile);
xnvfile_destroy_regular(&version_vfile);
@@ -253,7 +253,7 @@ int __init xnprocfs_init_tree(void)
xnvfile_init_regular("apc", &apc_vfile, &cobalt_vfroot);
#ifdef CONFIG_XENO_OPT_DEBUG
xnvfile_init_dir("debug", &cobalt_debug_vfroot, &cobalt_vfroot);
-#ifdef CONFIG_XENO_DEBUG_LOCKING
+#ifdef CONFIG_XENO_OPT_DEBUG_LOCKING
xnvfile_init_regular("lock", &lock_vfile, &cobalt_debug_vfroot);
#endif
#endif
diff --git a/kernel/cobalt/sched-sporadic.c b/kernel/cobalt/sched-sporadic.c
index 4b732ca..8a74ee4 100644
--- a/kernel/cobalt/sched-sporadic.c
+++ b/kernel/cobalt/sched-sporadic.c
@@ -24,7 +24,7 @@
static void sporadic_post_recharge(struct xnthread *thread, xnticks_t budget);
-#if XENO_DEBUG(COBALT)
+#ifdef CONFIG_XENO_OPT_DEBUG_COBALT
static inline void sporadic_note_late_drop(struct xnsched *sched)
{
@@ -42,7 +42,7 @@ static inline void sporadic_note_valid_drop(struct xnsched
*sched)
sched->pss.drop_retries = 0;
}
-#else /* !XENO_DEBUG(COBALT) */
+#else /* !CONFIG_XENO_OPT_DEBUG_COBALT */
static inline void sporadic_note_late_drop(struct xnsched *sched)
{
@@ -52,7 +52,7 @@ static inline void sporadic_note_valid_drop(struct xnsched
*sched)
{
}
-#endif /* !XENO_DEBUG(COBALT) */
+#endif /* !CONFIG_XENO_OPT_DEBUG_COBALT */
static inline xnticks_t sporadic_diff_time(xnticks_t start, xnticks_t end)
{
@@ -228,7 +228,7 @@ static void xnsched_sporadic_init(struct xnsched *sched)
* share the same priority scale, with the addition of budget
* management for the sporadic ones.
*/
-#if XENO_DEBUG(COBALT)
+#ifdef CONFIG_XENO_OPT_DEBUG_COBALT
sched->pss.drop_retries = 0;
#endif
}
diff --git a/kernel/cobalt/synch.c b/kernel/cobalt/synch.c
index f3b70a2..257aff6 100644
--- a/kernel/cobalt/synch.c
+++ b/kernel/cobalt/synch.c
@@ -1134,7 +1134,7 @@ void xnsynch_forget_sleeper(struct xnthread *thread)
}
EXPORT_SYMBOL_GPL(xnsynch_forget_sleeper);
-#if XENO_DEBUG(MUTEX_RELAXED)
+#ifdef CONFIG_XENO_OPT_DEBUG_MUTEX_RELAXED
/*
* Detect when a thread is about to sleep on a synchronization
@@ -1180,6 +1180,6 @@ void xnsynch_detect_boosted_relax(struct xnthread *owner)
xnlock_put_irqrestore(&nklock, s);
}
-#endif /* XENO_DEBUG(MUTEX_RELAXED) */
+#endif /* CONFIG_XENO_OPT_DEBUG_MUTEX_RELAXED */
/** @} */
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git
