[Xenomai-git] Philippe Gerum : wrappers: include linux/sched.h unconditionally
Module: xenomai-2.6 Branch: master Commit: 17e79e1cf94b50a488cc68f633449ec636cb0128 URL: http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=17e79e1cf94b50a488cc68f633449ec636cb0128 Author: Philippe Gerum r...@xenomai.org Date: Sun Jun 23 16:20:31 2013 +0200 wrappers: include linux/sched.h unconditionally --- include/asm-generic/wrappers.h |5 + 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/include/asm-generic/wrappers.h b/include/asm-generic/wrappers.h index f0b6caf..77b82ba 100644 --- a/include/asm-generic/wrappers.h +++ b/include/asm-generic/wrappers.h @@ -29,6 +29,7 @@ #include linux/version.h #include linux/module.h #include linux/slab.h +#include linux/sched.h #if defined(CONFIG_XENO_OPT_HOSTRT) || defined(__IPIPE_FEATURE_REQUEST_TICKDEV) #include linux/ipipe_tickdev.h #endif /* CONFIG_XENO_OPT_HOSTRT || __IPIPE_FEATURE_REQUEST_TICKDEV */ @@ -46,7 +47,6 @@ #include linux/wrapper.h #include linux/wait.h -#include linux/sched.h #include linux/bitops.h #include linux/delay.h #include linux/slab.h @@ -588,8 +588,6 @@ static inline struct task_struct *wrap_find_task_by_pid(pid_t nr) #if LINUX_VERSION_CODE KERNEL_VERSION(2,6,29) -#include linux/sched.h - #ifndef current_cap #define current_cap() ((current)-cap_effective) #endif @@ -709,7 +707,6 @@ static inline void wrap_proc_dir_entry_owner(struct proc_dir_entry *entry) #if LINUX_VERSION_CODE KERNEL_VERSION(3,4,0) -#include linux/sched.h #include linux/mm.h #include linux/smp.h ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : testsuite: enable back build over uClibc
Module: xenomai-2.6 Branch: master Commit: e107a5dac83d5f8fe83a77b5a84657173ca0462f URL: http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=e107a5dac83d5f8fe83a77b5a84657173ca0462f Author: Philippe Gerum r...@xenomai.org Date: Sun Jun 23 17:26:37 2013 +0200 testsuite: enable back build over uClibc --- src/testsuite/regression/posix/test_pip_exit.c |3 ++- src/testsuite/unit/cond-torture.c |2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/testsuite/regression/posix/test_pip_exit.c b/src/testsuite/regression/posix/test_pip_exit.c index 17f3077..47ee5c5 100644 --- a/src/testsuite/regression/posix/test_pip_exit.c +++ b/src/testsuite/regression/posix/test_pip_exit.c @@ -51,9 +51,10 @@ int main(void) check_unix(mlockall(MCL_CURRENT | MCL_FUTURE)); check_pthread(pthread_mutexattr_init(mattr)); +#ifdef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL check_pthread(pthread_mutexattr_setprotocol(mattr, PTHREAD_PRIO_INHERIT)); - +#endif check_pthread(pthread_mutex_init(mutex, mattr)); check_pthread(pthread_mutexattr_destroy(mattr)); diff --git a/src/testsuite/unit/cond-torture.c b/src/testsuite/unit/cond-torture.c index 57d47ab..e08515c 100644 --- a/src/testsuite/unit/cond-torture.c +++ b/src/testsuite/unit/cond-torture.c @@ -76,8 +76,10 @@ int cond_init(cond_t *cond, int absolute) int err; pthread_condattr_init(cattr); +#ifdef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL pthread_condattr_setclock(cattr, absolute ? CLOCK_REALTIME : CLOCK_MONOTONIC); +#endif err = pthread_cond_init(cond, cattr); pthread_condattr_destroy(cattr); ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel/timer: fix assertion family
Module: xenomai-forge
Branch: next
Commit: e6700706414f137202f9832d0cfda8c436f9b209
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=e6700706414f137202f9832d0cfda8c436f9b209
Author: Philippe Gerum r...@xenomai.org
Date: Sat Jun 22 18:29:47 2013 +0200
cobalt/kernel/timer: fix assertion family
---
include/cobalt/kernel/bheap.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/cobalt/kernel/bheap.h b/include/cobalt/kernel/bheap.h
index cd8cd08..42dff9a 100644
--- a/include/cobalt/kernel/bheap.h
+++ b/include/cobalt/kernel/bheap.h
@@ -64,7 +64,7 @@ static inline int bheap_ordered(bheap_t *heap)
}
#define BHEAP_CHECK(heap) \
- XENO_BUGON(QUEUES, ((heap)-sz == 0) || !bheap_ordered(heap))
+ XENO_BUGON(TIMERS, ((heap)-sz == 0) || !bheap_ordered(heap))
#define bheap_gethead(heap)\
({ \
___
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : copperplate/clockobj: disable low resolution clock by default
Module: xenomai-forge
Branch: next
Commit: 695b7224f2eeb0b17c60425db71a8a746b735070
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=695b7224f2eeb0b17c60425db71a8a746b735070
Author: Philippe Gerum r...@xenomai.org
Date: Sat Jun 22 15:21:04 2013 +0200
copperplate/clockobj: disable low resolution clock by default
Switch default setting to the most frequent use case. People running
tick-based RTOS emulators (e.g. psos, vxworks) have to turn it on
explicitly using --enable-lores-clock.
---
configure |2 +-
configure.in |4 ++--
lib/copperplate/clockobj.c |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index a8aa220..67e5646 100755
--- a/configure
+++ b/configure
@@ -12690,7 +12690,7 @@ $as_echo #define CONFIG_XENO_DEBUG_FULL 1 confdefs.h
-lores_clock=y
+unset lores_clock
{ $as_echo $as_me:${as_lineno-$LINENO}: checking whether to enable the low
resolution clock 5
$as_echo_n checking whether to enable the low resolution clock... 6; }
# Check whether --enable-lores-clock was given.
diff --git a/configure.in b/configure.in
index b14fae5..816af87 100644
--- a/configure.in
+++ b/configure.in
@@ -170,9 +170,9 @@ test \! x$debug_mode = x
AC_DEFINE(CONFIG_XENO_DEBUG,1,[config])
AM_CONDITIONAL(XENO_DEBUG_FULL,[test x$debug_mode = xfull])
test x$debug_mode = xfull AC_DEFINE(CONFIG_XENO_DEBUG_FULL,1,[config])
-dnl Low resolution clock (default: on)
+dnl Low resolution clock (default: off)
-lores_clock=y
+unset lores_clock
AC_MSG_CHECKING(whether to enable the low resolution clock)
AC_ARG_ENABLE(lores-clock,
AS_HELP_STRING([--enable-lores-clock], [Enable low resolution clock]),
diff --git a/lib/copperplate/clockobj.c b/lib/copperplate/clockobj.c
index 52ecb6c..a2ed56e 100644
--- a/lib/copperplate/clockobj.c
+++ b/lib/copperplate/clockobj.c
@@ -92,7 +92,7 @@ int __clockobj_set_resolution(struct clockobj *clkobj,
unsigned int resolution_ns)
{
if (resolution_ns 1) {
- warning(support for low resolution clock disabled);
+ warning(low resolution clock disabled [--enable-lores-clock]);
return __bt(-EINVAL);
}
___
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/wrappers: include linux/sched.h unconditionally
Module: xenomai-forge Branch: next Commit: 3f5bda9736012c06711bce01f1962404f98a6f11 URL: http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=3f5bda9736012c06711bce01f1962404f98a6f11 Author: Philippe Gerum r...@xenomai.org Date: Sun Jun 23 22:03:22 2013 +0200 cobalt/wrappers: include linux/sched.h unconditionally --- include/cobalt/asm-generic/wrappers.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/cobalt/asm-generic/wrappers.h b/include/cobalt/asm-generic/wrappers.h index 1e238c8..16bce2a 100644 --- a/include/cobalt/asm-generic/wrappers.h +++ b/include/cobalt/asm-generic/wrappers.h @@ -30,6 +30,7 @@ #include linux/slab.h #include linux/ipipe.h #include linux/ipipe_tickdev.h +#include linux/sched.h #include asm/io.h #include linux/pid.h @@ -44,7 +45,6 @@ #if LINUX_VERSION_CODE KERNEL_VERSION(3,4,0) -#include linux/sched.h #include linux/smp.h #ifndef cpu_online_map ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git
