[Xenomai-git] Philippe Gerum : lib/cobalt: drop weak symbol binding for base options
Module: xenomai-3 Branch: next Commit: 48ca9894bc296d3154f267cc296dc05e6d9d1869 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=48ca9894bc296d3154f267cc296dc05e6d9d1869 Author: Philippe Gerum r...@xenomai.org Date: Sun Jul 26 11:28:04 2015 +0200 lib/cobalt: drop weak symbol binding for base options Overriding base option values declared as weak symbols is no more relevant with the introduction of setup descriptors, which are less error-prone and more flexible. --- lib/cobalt/init.c |2 +- lib/cobalt/printf.c |6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cobalt/init.c b/lib/cobalt/init.c index 2a81814..4fde805 100644 --- a/lib/cobalt/init.c +++ b/lib/cobalt/init.c @@ -48,7 +48,7 @@ __weak int __cobalt_control_bind = 0; -__weak int __cobalt_main_prio = -1; +int __cobalt_main_prio = -1; struct sigaction __cobalt_orig_sigdebug; diff --git a/lib/cobalt/printf.c b/lib/cobalt/printf.c index c016fb2..b91a17c 100644 --- a/lib/cobalt/printf.c +++ b/lib/cobalt/printf.c @@ -68,11 +68,11 @@ struct print_buffer { off_t read_pos; }; -__weak int __cobalt_print_bufsz = RT_PRINT_DEFAULT_BUFFER; +int __cobalt_print_bufsz = RT_PRINT_DEFAULT_BUFFER; -__weak int __cobalt_print_bufcount = RT_PRINT_DEFAULT_BUFFERS_COUNT; +int __cobalt_print_bufcount = RT_PRINT_DEFAULT_BUFFERS_COUNT; -__weak int __cobalt_print_syncdelay = RT_PRINT_DEFAULT_SYNCDELAY; +int __cobalt_print_syncdelay = RT_PRINT_DEFAULT_SYNCDELAY; static struct print_buffer *first_buffer; static int buffers; ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : testsuite/latency: do not inherit the main scheduling parameters
Module: xenomai-3 Branch: next Commit: af70be8df24128e8f32bc64aea243705c82636b3 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=af70be8df24128e8f32bc64aea243705c82636b3 Author: Philippe Gerum r...@xenomai.org Date: Sun Jul 26 12:18:18 2015 +0200 testsuite/latency: do not inherit the main scheduling parameters We don't want the display thread to inherit the scheduling parameters set for the main() thread via --main-prio, particularly if SCHED_FIFO. In addition, fix sloppy error handling so that a non-zero return value is passed back on failure. --- testsuite/latency/latency.c | 201 --- 1 file changed, 72 insertions(+), 129 deletions(-) diff --git a/testsuite/latency/latency.c b/testsuite/latency/latency.c index ff86b09..fa19c56 100644 --- a/testsuite/latency/latency.c +++ b/testsuite/latency/latency.c @@ -26,6 +26,7 @@ #include stdio.h #include string.h #include errno.h +#include error.h #include signal.h #include sched.h #include time.h @@ -117,30 +118,22 @@ static void *latency(void *cookie) snprintf(task_name, sizeof(task_name), sampling-%d, getpid()); err = pthread_setname_np(pthread_self(), task_name); - if (err) { - fprintf(stderr, latency: setting name: error code %d\n, err); - return NULL; - } + if (err) + error(1, err, pthread_setname_np(latency)); tfd = timerfd_create(CLOCK_MONOTONIC, 0); - if (tfd == -1) { - fprintf(stderr, latency: timerfd_create: %m\n); - return NULL; - } + if (tfd == -1) + error(1, errno, timerfd_create()); #ifdef CONFIG_XENO_COBALT err = pthread_setmode_np(0, PTHREAD_WARNSW, NULL); - if (err) { - fprintf(stderr, latency: setting WARNSW: error code %d\n, err); - return NULL; - } + if (err) + error(1, err, pthread_setmode_np()); #endif err = clock_gettime(CLOCK_MONOTONIC, expected); - if (err) { - fprintf(stderr, latency: clock_gettime: %m\n); - return NULL; - } + if (err) + error(1, errno, clock_gettime()); fault_threshold = CONFIG_XENO_DEFAULT_PERIOD; nsamples = (long long)ONE_BILLION / period_ns; @@ -155,11 +148,8 @@ static void *latency(void *cookie) timer_conf.it_interval.tv_nsec = period_ns % ONE_BILLION; err = timerfd_settime(tfd, TFD_TIMER_ABSTIME, timer_conf, NULL); - if (err) { - fprintf(stderr, latency: failed to set periodic, code %d\n, - errno); - return NULL; - } + if (err) + error(1, errno, timerfd_settime()); for (;;) { int32_t minj = TEN_MILLIONS, maxj = -TEN_MILLIONS, dt; @@ -190,13 +180,8 @@ static void *latency(void *cookie) minj = dt; sumj += dt; - if (err 0) { - fprintf(stderr, - latency: wait period failed, code %d\n, - errno); - exit(EXIT_FAILURE); /* Timer -* stopped. */ - } + if (err 0) + error(1, errno, read()); if (ticks 1) overrun += ticks - 1; expected.tv_nsec += (ticks * period_ns) % ONE_BILLION; @@ -253,23 +238,15 @@ static void *display(void *cookie) snprintf(task_name, sizeof(task_name), display-%d, getpid()); err = pthread_setname_np(pthread_self(), task_name); - if (err) { - fprintf(stderr, latency: can not set task name: error %d\n, - err); - return NULL; - } + if (err) + error(1, err, pthread_setname_np(display)); if (test_mode == USER_TASK) { snprintf(sem_name, sizeof(sem_name), /dispsem-%d, getpid()); - sem_unlink(sem_name); /* may fail */ display_sem = sem_open(sem_name, O_CREAT | O_EXCL, 0666, 0); - if (display_sem == SEM_FAILED) { - fprintf(stderr, - latency: cannot create semaphore: %m\n); - return NULL; - } - + if (display_sem == SEM_FAILED) + error(1, errno, sem_open()); } else { struct rttst_tmbench_config config; @@ -286,13 +263,8 @@ static void *display(void *cookie) config.freeze_max = freeze_max; err = ioctl(benchdev, RTTST_RTIOC_TMBENCH_START, config); - - if (err) { - fprintf(stderr, - latency:
[Xenomai-git] Philippe Gerum : demo/can-rtt: remove redundant mlockall()
Module: xenomai-3 Branch: next Commit: 0c0031ad82b1ed3698dc4f07a7c9aa5d3cb69a6f URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=0c0031ad82b1ed3698dc4f07a7c9aa5d3cb69a6f Author: Philippe Gerum r...@xenomai.org Date: Sun Jul 26 12:56:25 2015 +0200 demo/can-rtt: remove redundant mlockall() --- demo/posix/can-rtt.c |2 -- 1 file changed, 2 deletions(-) diff --git a/demo/posix/can-rtt.c b/demo/posix/can-rtt.c index 6c7c54d..0a3dff8 100644 --- a/demo/posix/can-rtt.c +++ b/demo/posix/can-rtt.c @@ -48,7 +48,6 @@ #include netinet/in.h #include net/if.h #include sys/ioctl.h -#include sys/mman.h #ifdef CONFIG_XENO_COBALT #include rtdm/can.h @@ -318,7 +317,6 @@ int main(int argc, char *argv[]) signal(SIGTERM, catch_signal); signal(SIGINT, catch_signal); signal(SIGHUP, catch_signal); -mlockall(MCL_CURRENT|MCL_FUTURE); printf(Round-Trip-Time test %s - %s with CAN ID 0x%x\n, argv[optind], argv[optind + 1], can_id); ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : testsuite/switchtest: remove redundant mlockall()
Module: xenomai-3 Branch: next Commit: 546488b5fe506d4c538c7c358e0b9a9677e295a5 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=546488b5fe506d4c538c7c358e0b9a9677e295a5 Author: Philippe Gerum r...@xenomai.org Date: Sun Jul 26 12:51:42 2015 +0200 testsuite/switchtest: remove redundant mlockall() --- testsuite/switchtest/switchtest.c |6 -- 1 file changed, 6 deletions(-) diff --git a/testsuite/switchtest/switchtest.c b/testsuite/switchtest/switchtest.c index c940b86..cf33c70 100644 --- a/testsuite/switchtest/switchtest.c +++ b/testsuite/switchtest/switchtest.c @@ -30,7 +30,6 @@ #include signal.h #include unistd.h #include pthread.h -#include sys/mman.h #include semaphore.h #include setjmp.h #include getopt.h @@ -1126,11 +1125,6 @@ int main(int argc, const char *argv[]) status = EXIT_SUCCESS; /* Initializations. */ - if (mlockall(MCL_CURRENT|MCL_FUTURE)) { - perror(mlockall); - exit(EXIT_FAILURE); - } - if (__STD(sem_init(sleeper_start, 0, 0))) { perror(sem_init); exit(EXIT_FAILURE); ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : lib/cobalt: output sync delay fit in a regular integer
Module: xenomai-3 Branch: next Commit: 2dd50c880950fc9a93c0f76fbe1f7c202a46092b URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=2dd50c880950fc9a93c0f76fbe1f7c202a46092b Author: Philippe Gerum r...@xenomai.org Date: Sun Jul 26 11:25:24 2015 +0200 lib/cobalt: output sync delay fit in a regular integer --- include/cobalt/tunables.h |8 lib/cobalt/init.c | 29 +++-- lib/cobalt/printf.c |6 +++--- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/include/cobalt/tunables.h b/include/cobalt/tunables.h index 67953c2..67ac77a 100644 --- a/include/cobalt/tunables.h +++ b/include/cobalt/tunables.h @@ -31,7 +31,7 @@ extern int __cobalt_print_bufsz; extern int __cobalt_print_bufcount; -extern unsigned long long __cobalt_print_syncdelay; +extern int __cobalt_print_syncdelay; static inline define_config_tunable(main_prio, int, prio) { @@ -63,12 +63,12 @@ static inline read_config_tunable(print_buffer_count, int) return __cobalt_print_bufcount; } -static inline define_config_tunable(print_sync_delay, unsigned long long, delay) +static inline define_config_tunable(print_sync_delay, int, delay_ms) { - __cobalt_print_syncdelay = delay; + __cobalt_print_syncdelay = delay_ms; } -static inline read_config_tunable(print_sync_delay, unsigned long long) +static inline read_config_tunable(print_sync_delay, int) { return __cobalt_print_syncdelay; } diff --git a/lib/cobalt/init.c b/lib/cobalt/init.c index 85dd590..2a81814 100644 --- a/lib/cobalt/init.c +++ b/lib/cobalt/init.c @@ -26,6 +26,7 @@ #include getopt.h #include limits.h #include unistd.h +#include stdint.h #include semaphore.h #include boilerplate/setup.h #include cobalt/uapi/kernel/heap.h @@ -230,16 +231,17 @@ int cobalt_init(void) } static int get_int_arg(const char *name, const char *arg, - unsigned long long *valp) + int *valp, int min) { - unsigned long long value; + int value, ret; char *p; errno = 0; - value = strtoll(arg, p, 10); - if (errno || *p) { + value = (int)strtol(arg, p, 10); + if (errno || *p || value min) { + ret = -errno ?: -EINVAL; early_warning(invalid value for %s: %s, name, arg); - return -errno; + return ret; } *valp = value; @@ -249,30 +251,29 @@ static int get_int_arg(const char *name, const char *arg, static int cobalt_parse_option(int optnum, const char *optarg) { - unsigned long long value; - int ret; + int value, ret; switch (optnum) { case main_prio_opt: - ret = get_int_arg(--main-prio, optarg, value); + ret = get_int_arg(--main-prio, optarg, value, INT32_MIN); if (ret) return ret; - __cobalt_main_prio = (int)value; + __cobalt_main_prio = value; break; case print_bufsz_opt: - ret = get_int_arg(--print-buffer-size, optarg, value); + ret = get_int_arg(--print-buffer-size, optarg, value, 0); if (ret) return ret; - __cobalt_print_bufsz = (int)value; + __cobalt_print_bufsz = value; break; case print_bufcnt_opt: - ret = get_int_arg(--print-buffer-count, optarg, value); + ret = get_int_arg(--print-buffer-count, optarg, value, 0); if (ret) return ret; - __cobalt_print_bufcount = (int)value; + __cobalt_print_bufcount = value; break; case print_syncdelay_opt: - ret = get_int_arg(--print-sync-delay, optarg, value); + ret = get_int_arg(--print-sync-delay, optarg, value, 0); if (ret) return ret; __cobalt_print_syncdelay = value; diff --git a/lib/cobalt/printf.c b/lib/cobalt/printf.c index e7ff120..c016fb2 100644 --- a/lib/cobalt/printf.c +++ b/lib/cobalt/printf.c @@ -72,7 +72,7 @@ __weak int __cobalt_print_bufsz = RT_PRINT_DEFAULT_BUFFER; __weak int __cobalt_print_bufcount = RT_PRINT_DEFAULT_BUFFERS_COUNT; -__weak unsigned long long __cobalt_print_syncdelay = RT_PRINT_DEFAULT_SYNCDELAY; +__weak int __cobalt_print_syncdelay = RT_PRINT_DEFAULT_SYNCDELAY; static struct print_buffer *first_buffer; static int buffers; @@ -693,8 +693,8 @@ void cobalt_print_init(void) first_buffer = NULL; seq_no = 0; - syncdelay.tv_sec = __cobalt_print_syncdelay / 1000ULL; - syncdelay.tv_nsec = (__cobalt_print_syncdelay % 1000ULL) * 100; + syncdelay.tv_sec = __cobalt_print_syncdelay / 1000; + syncdelay.tv_nsec = (__cobalt_print_syncdelay % 1000) * 100; /* Fill the buffer pool */ pool_bitmap_len =
[Xenomai-git] Philippe Gerum : copperplate/registry: force SCHED_OTHER on helper threads
Module: xenomai-3 Branch: next Commit: 880b3acbd876a65f8fbe8c27b09762b06c06e846 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=880b3acbd876a65f8fbe8c27b09762b06c06e846 Author: Philippe Gerum r...@xenomai.org Date: Sun Jul 26 12:37:15 2015 +0200 copperplate/registry: force SCHED_OTHER on helper threads We might inherit SCHED_FIFO from the parent thread creating the registry threads if --main-prio was given for starting the application program. Make sure to switch to SCHED_OTHER for serving registry requests. --- lib/copperplate/regd/regd.c |7 ++- lib/copperplate/registry.c |7 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/copperplate/regd/regd.c b/lib/copperplate/regd/regd.c index bcf5a9d..4f48273 100644 --- a/lib/copperplate/regd/regd.c +++ b/lib/copperplate/regd/regd.c @@ -471,7 +471,7 @@ bootstrap: ret = bootstrap_core(); if (ret) - error(1, -ret, cannot bootstap core interface); + error(1, -ret, cannot bootstrap core interface); __copperplate_setup_data.session_label = session; __copperplate_setup_data.registry_root = rootdir; @@ -501,6 +501,7 @@ bootstrap: int main(int argc, char *const *argv) { int lindex, opt, ret, flags = 0; + struct sched_param schedp; struct sigaction sa; for (;;) { @@ -533,6 +534,10 @@ int main(int argc, char *const *argv) if (rootdir == NULL) error(1, EINVAL, --root must be given); + /* Force SCHED_OTHER. */ + schedp.sched_priority = 0; + pthread_setschedparam(pthread_self(), SCHED_OTHER, schedp); + memset(sa, 0, sizeof(sa)); sa.sa_handler = SIG_IGN; sigaction(SIGCHLD, sa, NULL); diff --git a/lib/copperplate/registry.c b/lib/copperplate/registry.c index adf0d73..c379f15 100644 --- a/lib/copperplate/registry.c +++ b/lib/copperplate/registry.c @@ -751,6 +751,7 @@ int __registry_pkg_init(const char *arg0, char *mountpt, int flags) { struct regfs_data *p = regfs_get_context(); pthread_mutexattr_t mattr; + struct sched_param schedp; pthread_attr_t thattr; int ret; @@ -768,8 +769,12 @@ int __registry_pkg_init(const char *arg0, char *mountpt, int flags) registry_add_dir(/); /* Create the fs root. */ - /* We want a SCHED_OTHER thread, use defaults. */ + /* We want a SCHED_OTHER thread. */ pthread_attr_init(thattr); + pthread_attr_setinheritsched(thattr, PTHREAD_EXPLICIT_SCHED); + pthread_attr_setschedpolicy(thattr, SCHED_OTHER); + schedp.sched_priority = 0; + pthread_attr_setschedparam(thattr, schedp); /* * Memory is locked as the process data grows, so we set a * smaller stack size for the fs thread than the default 8mb ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : lib/cobalt: drop dandling declaration
Module: xenomai-3 Branch: next Commit: 6c4e0b4c1acd90e8f3ac0c5decdfdec7522772c5 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=6c4e0b4c1acd90e8f3ac0c5decdfdec7522772c5 Author: Philippe Gerum r...@xenomai.org Date: Sun Jul 26 16:19:21 2015 +0200 lib/cobalt: drop dandling declaration --- include/cobalt/pthread.h |2 -- 1 file changed, 2 deletions(-) diff --git a/include/cobalt/pthread.h b/include/cobalt/pthread.h index 7843c84..386c337 100644 --- a/include/cobalt/pthread.h +++ b/include/cobalt/pthread.h @@ -45,8 +45,6 @@ COBALT_DECL(int, pthread_create(pthread_t *ptid_r, void *(*start) (void *), void *arg)); -COBALT_DECL(int, pthread_detach(pthread_t thread)); - COBALT_DECL(int, pthread_getschedparam(pthread_t thread, int *policy, struct sched_param *param)); ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : doc: prebuild
Module: xenomai-3 Branch: next Commit: 41c02ebccc4afadfa1d5c85e8ea4e8ce0ffb17a4 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=41c02ebccc4afadfa1d5c85e8ea4e8ce0ffb17a4 Author: Philippe Gerum r...@xenomai.org Date: Sun Jul 26 18:25:19 2015 +0200 doc: prebuild --- doc/asciidoc/MIGRATION.adoc| 21 +- doc/asciidoc/README.INSTALL.adoc |5 - doc/asciidoc/TROUBLESHOOTING.COBALT.adoc |4 + doc/prebuilt/html/MIGRATION/index.html | 24 +- doc/prebuilt/html/README.APPLICATIONS/index.html |2 +- doc/prebuilt/html/README.INSTALL/index.html|5 +- .../html/TROUBLESHOOTING.COBALT/index.html | 38 +- .../html/TROUBLESHOOTING.MERCURY/index.html|2 +- doc/prebuilt/html/man1/autotune/index.html |2 +- doc/prebuilt/html/man1/xeno-config/index.html |2 +- .../html/xeno3prm/16550A__io_8h_source.html|2 +- .../html/xeno3prm/16550A__pci_8h_source.html |4 +- .../html/xeno3prm/16550A__pnp_8h_source.html |2 +- doc/prebuilt/html/xeno3prm/8255_8h_source.html |2 +- doc/prebuilt/html/xeno3prm/af__inet_8h_source.html |2 +- .../html/xeno3prm/alchemy_2compat_8h_source.html |2 +- doc/prebuilt/html/xeno3prm/analogy_2driver_8h.html |2 +- .../html/xeno3prm/analogy_2driver_8h_source.html |2 +- doc/prebuilt/html/xeno3prm/analogy_8h.html |2 +- doc/prebuilt/html/xeno3prm/analogy_8h_source.html |2 +- doc/prebuilt/html/xeno3prm/annotated.html |2 +- doc/prebuilt/html/xeno3prm/apc_8h_source.html |2 +- doc/prebuilt/html/xeno3prm/api-tags.html |2 +- ..._2include_2asm_2xenomai_2machine_8h_source.html |2 +- ...include_2asm_2xenomai_2syscall32_8h_source.html |2 +- ..._2include_2asm_2xenomai_2machine_8h_source.html |2 +- ...include_2asm_2xenomai_2syscall32_8h_source.html |2 +- ..._2include_2asm_2xenomai_2machine_8h_source.html |2 +- ...include_2asm_2xenomai_2syscall32_8h_source.html |2 +- ..._2include_2asm_2xenomai_2machine_8h_source.html |2 +- ...include_2asm_2xenomai_2syscall32_8h_source.html |2 +- ..._2include_2asm_2xenomai_2machine_8h_source.html |2 +- ...include_2asm_2xenomai_2syscall32_8h_source.html |2 +- ..._2include_2asm_2xenomai_2machine_8h_source.html |2 +- ...include_2asm_2xenomai_2syscall32_8h_source.html | 14 +- ...m_2include_2asm_2xenomai_2fptest_8h_source.html |2 +- ...lude_2asm_2xenomai_2uapi_2fptest_8h_source.html |2 +- doc/prebuilt/html/xeno3prm/arp_8h_source.html |2 +- doc/prebuilt/html/xeno3prm/assert_8h_source.html | 21 +- doc/prebuilt/html/xeno3prm/async_8c.html |4 +- doc/prebuilt/html/xeno3prm/async_8c__incl.map | 42 +- doc/prebuilt/html/xeno3prm/async_8c__incl.md5 |2 +- doc/prebuilt/html/xeno3prm/async_8c__incl.png | Bin 96323 - 117906 bytes doc/prebuilt/html/xeno3prm/atomic_8h_source.html |2 +- doc/prebuilt/html/xeno3prm/bheap_8h_source.html|2 +- ...n_2include_2asm_2xenomai_2fptest_8h_source.html |2 +- ...lude_2asm_2xenomai_2uapi_2fptest_8h_source.html |2 +- .../boilerplate_2ancillaries_8h_source.html| 16 +- .../html/xeno3prm/boilerplate_2list_8h_source.html |2 +- .../html/xeno3prm/boilerplate_2lock_8h_source.html |2 +- .../html/xeno3prm/boilerplate_2time_8h_source.html |2 +- .../xeno3prm/boilerplate_2tunables_8h_source.html |2 +- doc/prebuilt/html/xeno3prm/bufd_8h_source.html |2 +- .../html/xeno3prm/bufp-label_8c-example.html |6 +- .../html/xeno3prm/bufp-readwrite_8c-example.html |6 +- doc/prebuilt/html/xeno3prm/c1e_8h_source.html |2 +- doc/prebuilt/html/xeno3prm/calibration_8c.html |2 +- doc/prebuilt/html/xeno3prm/can-rtt_8c-example.html |4 +- doc/prebuilt/html/xeno3prm/channel__range_8h.html |2 +- .../html/xeno3prm/channel__range_8h_source.html|2 +- doc/prebuilt/html/xeno3prm/classes.html|2 +- doc/prebuilt/html/xeno3prm/clockobj_8h_source.html |2 +- doc/prebuilt/html/xeno3prm/cluster_8h_source.html | 296 +++-- .../html/xeno3prm/cobalt-core_8h_source.html |8 +- .../html/xeno3prm/cobalt-posix_8h_source.html |2 +- .../html/xeno3prm/cobalt-rtdm_8h_source.html |2 +- .../cobalt_2boilerplate_2limits_8h_source.html |2 +- .../cobalt_2boilerplate_2trace_8h_source.html |2 +- .../cobalt_2kernel_2ancillaries_8h_source.html |2 +- .../xeno3prm/cobalt_2kernel_2compat_8h_source.html |6 +- .../xeno3prm/cobalt_2kernel_2init_8h_source.html |2 +- .../xeno3prm/cobalt_2kernel_2list_8h_source.html |2 +- .../xeno3prm/cobalt_2kernel_2lock_8h_source.html |2 +- .../cobalt_2kernel_2registry_8h_source.html|2 +- .../cobalt_2kernel_2rtdm_2autotune_8h_source.html |2 +- .../cobalt_2kernel_2rtdm_2can_8h_source.html
[Xenomai-git] Philippe Gerum : cobalt/arm: upgrade I-pipe support
Module: xenomai-3 Branch: next Commit: 807152f5cd659160a0fb39f17e598a18822b483e URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=807152f5cd659160a0fb39f17e598a18822b483e Author: Philippe Gerum r...@xenomai.org Date: Sun Jul 26 20:50:50 2015 +0200 cobalt/arm: upgrade I-pipe support --- ...arm-9.patch = ipipe-core-3.10.32-arm-10.patch} | 122 +- ...rm-10.patch = ipipe-core-3.14.44-arm-11.patch} | 302 +- .../arch/arm/patches/ipipe-core-3.16.7-arm-8.patch |22371 ...-arm-2.patch = ipipe-core-3.18.12-arm-3.patch} | 202 +- 4 files changed, 362 insertions(+), 22635 deletions(-) Diff: http://git.xenomai.org/?p=xenomai-3.git;a=commitdiff;h=807152f5cd659160a0fb39f17e598a18822b483e ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : config: bump version code
Module: xenomai-3 Branch: next Commit: 75a32904f26d4418690e469c8673c88c405163a2 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=75a32904f26d4418690e469c8673c88c405163a2 Author: Philippe Gerum r...@xenomai.org Date: Sun Jul 26 18:09:30 2015 +0200 config: bump version code --- config/version-code |2 +- config/version-label |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version-code b/config/version-code index e83f86c..ac14d36 100644 --- a/config/version-code +++ b/config/version-code @@ -1 +1 @@ -2.99.14 +2.99.15 diff --git a/config/version-label b/config/version-label index c548b54..14bd94e 100644 --- a/config/version-label +++ b/config/version-label @@ -1 +1 @@ -3.0-rc5 +3.0-rc6 ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/powerpc: upgrade I-pipe support
Module: xenomai-3 Branch: next Commit: 5a66f6d59d901acbeec9b6c45b0467a97019ad39 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=5a66f6d59d901acbeec9b6c45b0467a97019ad39 Author: Philippe Gerum r...@xenomai.org Date: Sun Jul 26 20:51:51 2015 +0200 cobalt/powerpc: upgrade I-pipe support --- ...-8.patch = ipipe-core-3.14.44-powerpc-9.patch} | 93 +--- 1 file changed, 40 insertions(+), 53 deletions(-) diff --git a/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.39-powerpc-8.patch b/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.44-powerpc-9.patch similarity index 99% rename from kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.39-powerpc-8.patch rename to kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.44-powerpc-9.patch index 6da7f8a..44309f0 100644 --- a/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.39-powerpc-8.patch +++ b/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.44-powerpc-9.patch @@ -341,7 +341,7 @@ index 10be1dd..cfad863 100644 * or should we not care like we do now ? --BenH. diff --git a/arch/powerpc/include/asm/ipipe.h b/arch/powerpc/include/asm/ipipe.h new file mode 100644 -index 000..40aca5b +index 000..1533d8b --- /dev/null +++ b/arch/powerpc/include/asm/ipipe.h @@ -0,0 +1,157 @@ @@ -386,7 +386,7 @@ index 000..40aca5b +#include linux/cache.h +#include linux/threads.h + -+#define IPIPE_CORE_RELEASE8 ++#define IPIPE_CORE_RELEASE9 + +struct ipipe_domain; + @@ -2463,10 +2463,10 @@ index 3fdef0f..72c186e 100644 li r0,0 diff --git a/arch/powerpc/kernel/ipipe.c b/arch/powerpc/kernel/ipipe.c new file mode 100644 -index 000..18f4599 +index 000..d47e1b4 --- /dev/null +++ b/arch/powerpc/kernel/ipipe.c -@@ -0,0 +1,396 @@ +@@ -0,0 +1,391 @@ +/* -*- linux-c -*- + * linux/arch/powerpc/kernel/ipipe.c + * @@ -2832,11 +2832,6 @@ index 000..18f4599 + return __ipipe_exit_irq(regs); +} + -+void __ipipe_pin_range_globally(unsigned long start, unsigned long end) -+{ -+ /* We don't support this. */ -+} -+ +#ifndef CONFIG_SMP +EXPORT_SYMBOL_GPL(last_task_used_math); +#endif @@ -3830,7 +3825,7 @@ index 7a8a748..8f13a2f 100644 { long *start, *end; diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c -index 51ab9e7..2234331 100644 +index 010fabf..553a4b4 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -197,9 +197,9 @@ static int mm_fault_error(struct pt_regs *regs, unsigned long addr, int fault) @@ -5661,7 +5656,7 @@ index 612dfc7..ffd8160 100644 .probe = serial8250_probe, .remove = serial8250_remove, diff --git a/fs/exec.c b/fs/exec.c -index ea4449d..aa73a12 100644 +index 05f1942..836253a 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -822,6 +822,7 @@ static int exec_mmap(struct mm_struct *mm) @@ -6439,10 +6434,10 @@ index 000..912f689 +#endif/* !__LINUX_IPIPE_H */ diff --git a/include/linux/ipipe_base.h b/include/linux/ipipe_base.h new file mode 100644 -index 000..ea01dd6 +index 000..a37358c --- /dev/null +++ b/include/linux/ipipe_base.h -@@ -0,0 +1,356 @@ +@@ -0,0 +1,358 @@ +/* -*- linux-c -*- + * include/linux/ipipe_base.h + * @@ -6624,9 +6619,6 @@ index 000..ea01dd6 + +void __ipipe_flush_printk(unsigned int irq, void *cookie); + -+void __ipipe_pin_range_globally(unsigned long start, -+ unsigned long end); -+ +#define __ipipe_get_cpu(flags)({ (flags) = hard_preempt_disable(); ipipe_processor_id(); }) +#define __ipipe_put_cpu(flags)hard_preempt_enable(flags) + @@ -6759,10 +6751,6 @@ index 000..ea01dd6 + +static inline void __ipipe_init_taskinfo(struct task_struct *p) { } + -+static inline void __ipipe_pin_range_globally(unsigned long start, -+unsigned long end) -+{ } -+ +#define hard_preempt_disable()({ preempt_disable(); 0; }) +#define hard_preempt_enable(flags)({ preempt_enable(); (void)(flags); }) + @@ -6789,6 +6777,15 @@ index 000..ea01dd6 + +#endif/* !CONFIG_IPIPE */ + ++#ifdef CONFIG_IPIPE_WANT_PTE_PINNING ++void __ipipe_pin_mapping_globally(unsigned long start, ++unsigned long end); ++#else ++static inline void __ipipe_pin_mapping_globally(unsigned long start, ++ unsigned long end) ++{ } ++#endif ++ +static inline void ipipe_preempt_root_only(void) +{ +#if defined(CONFIG_IPIPE_DEBUG_CONTEXT) \ @@ -8306,7 +8303,7 @@ index 5b9b84b..6c8bb4d 100644 static inline void __raw_read_lock(rwlock_t *lock) { diff --git a/include/linux/sched.h b/include/linux/sched.h -index 218b058..d579687 100644 +index 91fe6a3..d579687 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -24,6 +24,7 @@ struct sched_param { @@ -8372,15 +8369,6 @@ index 218b058..d579687 100644 /* * cache last used pipe for splice -@@ -1695,7