[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: b18b17b80ffa3718c4e2129fd439b52fab3becb3 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=b18b17b80ffa3718c4e2129fd439b52fab3becb3 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- include/cobalt/kernel/compat.h |4 ++-- include/cobalt/kernel/rtdm/fd.h | 16 include/cobalt/kernel/rtdm/rtdm.h|8 kernel/cobalt/include/asm-generic/xenomai/wrappers.h |4 kernel/cobalt/posix/compat.c |4 ++-- kernel/cobalt/posix/io.c |8 kernel/cobalt/posix/io.h |4 ++-- kernel/cobalt/posix/syscall32.c |4 ++-- kernel/cobalt/rtdm/core.c|8 kernel/cobalt/rtdm/fd.c |4 ++-- kernel/drivers/can/rtcan_raw.c |4 ++-- kernel/drivers/ipc/bufp.c|4 ++-- kernel/drivers/ipc/iddp.c|4 ++-- kernel/drivers/ipc/internal.h|8 kernel/drivers/ipc/rtipc.c |8 kernel/drivers/ipc/xddp.c|4 ++-- kernel/drivers/net/stack/ipv4/tcp/tcp.c |4 ++-- kernel/drivers/net/stack/ipv4/udp/udp.c |4 ++-- kernel/drivers/net/stack/packet/af_packet.c |4 ++-- 19 files changed, 56 insertions(+), 52 deletions(-) diff --git a/include/cobalt/kernel/compat.h b/include/cobalt/kernel/compat.h index b0ef81e..6683438 100644 --- a/include/cobalt/kernel/compat.h +++ b/include/cobalt/kernel/compat.h @@ -135,11 +135,11 @@ int sys32_get_sigval(union sigval *val, const union compat_sigval *u_cval); int sys32_put_siginfo(void __user *u_si, const struct siginfo *si, int overrun); -int sys32_get_msghdr(struct msghdr *msg, +int sys32_get_msghdr(struct user_msghdr *msg, const struct compat_msghdr __user *u_cmsg); int sys32_put_msghdr(struct compat_msghdr __user *u_cmsg, -const struct msghdr *msg); +const struct user_msghdr *msg); int sys32_get_iovec(struct iovec *iov, const struct compat_iovec __user *ciov, diff --git a/include/cobalt/kernel/rtdm/fd.h b/include/cobalt/kernel/rtdm/fd.h index 1c0fe9e..dc653d6 100644 --- a/include/cobalt/kernel/rtdm/fd.h +++ b/include/cobalt/kernel/rtdm/fd.h @@ -143,7 +143,7 @@ ssize_t rtdm_write_handler(struct rtdm_fd *fd, const void __user *buf, size_t si * @see @c recvmsg() in IEEE Std 1003.1, * http://www.opengroup.org/onlinepubs/009695399 */ -ssize_t rtdm_recvmsg_handler(struct rtdm_fd *fd, struct msghdr *msg, int flags); +ssize_t rtdm_recvmsg_handler(struct rtdm_fd *fd, struct user_msghdr *msg, int flags); /** * Transmit message handler @@ -160,7 +160,7 @@ ssize_t rtdm_recvmsg_handler(struct rtdm_fd *fd, struct msghdr *msg, int flags); * @see @c sendmsg() in IEEE Std 1003.1, * http://www.opengroup.org/onlinepubs/009695399 */ -ssize_t rtdm_sendmsg_handler(struct rtdm_fd *fd, const struct msghdr *msg, int flags); +ssize_t rtdm_sendmsg_handler(struct rtdm_fd *fd, const struct user_msghdr *msg, int flags); /** * Select handler @@ -267,16 +267,16 @@ struct rtdm_fd_ops { const void __user *buf, size_t size); /** See rtdm_recvmsg_handler(). */ ssize_t (*recvmsg_rt)(struct rtdm_fd *fd, - struct msghdr *msg, int flags); + struct user_msghdr *msg, int flags); /** See rtdm_recvmsg_handler(). */ ssize_t (*recvmsg_nrt)(struct rtdm_fd *fd, - struct msghdr *msg, int flags); + struct user_msghdr *msg, int flags); /** See rtdm_sendmsg_handler(). */ ssize_t (*sendmsg_rt)(struct rtdm_fd *fd, - const struct msghdr *msg, int flags); + const struct user_msghdr *msg, int flags); /** See rtdm_sendmsg_handler(). */ ssize_t (*sendmsg_nrt)(struct rtdm_fd *fd, - const struct msghdr *msg, int flags); + const struct user_msghdr *msg, int flags); /** See rtdm_select_handler(). */ int (*select)(struct rtdm_fd *fd, struct xnselector *selector, @@ -363,9 +363,9 @@ ssize_t rtdm_fd_write(int ufd, const void __user *buf, size_t size); int rtdm_fd_close(int ufd, unsigned int magic); -ssize_t rtdm_fd_recvmsg(int ufd, struct msghdr *msg, int flags); +ssize_t rtdm_fd_recvmsg(int ufd, struct user_msghdr *msg, int flags); -ssize_t rtdm_fd_sendmsg(int ufd, const struct msghdr *msg, +ssize_t rtdm_fd_sendmsg(int ufd,
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (trace_seq)
Module: xenomai-3 Branch: next Commit: 4687a3f321b88f9c5b39666a5d7dc0efa715ddaf URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=4687a3f321b88f9c5b39666a5d7dc0efa715ddaf Author: Philippe GerumDate: Tue Nov 3 13:11:25 2015 +0100 cobalt/kernel: fixup for v3.19+ (trace_seq) --- kernel/cobalt/trace/cobalt-posix.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/cobalt/trace/cobalt-posix.h b/kernel/cobalt/trace/cobalt-posix.h index 536108d..d87582f 100644 --- a/kernel/cobalt/trace/cobalt-posix.h +++ b/kernel/cobalt/trace/cobalt-posix.h @@ -92,7 +92,7 @@ DECLARE_EVENT_CLASS(syscall_exit, #define cobalt_print_sched_params(__policy, __p_ex)\ ({ \ - const char *__ret = p->buffer + p->len; \ + const unsigned char *__ret = trace_seq_buffer_ptr(p); \ switch (__policy) { \ case SCHED_QUOTA: \ trace_seq_printf(p, "priority=%d, group=%d",\ ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Gilles Chanteperdrix : lib/cobalt: allow getting/ setting affinity in pthread_attr_ex_t
Module: xenomai-gch Branch: for-3.0.x Commit: 41532f7850e7f33a139687b86989fd553bca93d0 URL: http://git.xenomai.org/?p=xenomai-gch.git;a=commit;h=41532f7850e7f33a139687b86989fd553bca93d0 Author: Gilles ChanteperdrixDate: Wed Nov 4 01:34:59 2015 +0100 lib/cobalt: allow getting/setting affinity in pthread_attr_ex_t --- include/cobalt/pthread.h |7 +++ lib/cobalt/attr.c| 12 2 files changed, 19 insertions(+) diff --git a/include/cobalt/pthread.h b/include/cobalt/pthread.h index 386c337..1d229de 100644 --- a/include/cobalt/pthread.h +++ b/include/cobalt/pthread.h @@ -164,6 +164,13 @@ int pthread_attr_getpersonality_ex(const pthread_attr_ex_t *attr_ex, int pthread_attr_setpersonality_ex(pthread_attr_ex_t *attr_ex, int personality); + +int pthread_attr_getaffinity_ex(pthread_attr_ex_t *attr_ex, + size_t size, cpu_set_t *cpuset); + +int pthread_attr_setaffinity_ex(pthread_attr_ex_t *attr_ex, + size_t size, const cpu_set_t *cpuset); + #ifdef __cplusplus } #endif diff --git a/lib/cobalt/attr.c b/lib/cobalt/attr.c index 586de92..657771b 100644 --- a/lib/cobalt/attr.c +++ b/lib/cobalt/attr.c @@ -131,6 +131,18 @@ int pthread_attr_setscope_ex(pthread_attr_ex_t *attr_ex, return pthread_attr_setscope(_ex->std, scope); } +int pthread_attr_getaffinity_ex(pthread_attr_ex_t *attr_ex, + size_t size, cpu_set_t *cpuset) +{ + return pthread_attr_getaffinity_np(_ex->std, size, cpuset); +} + +int pthread_attr_setaffinity_ex(pthread_attr_ex_t *attr_ex, + size_t size, const cpu_set_t *cpuset) +{ + return pthread_attr_setaffinity_np(_ex->std, size, cpuset); +} + int pthread_attr_getpersonality_ex(const pthread_attr_ex_t *attr_ex, int *personality) { ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Gilles Chanteperdrix : testsuite/smokey: add RTnet raw packets test
Module: xenomai-gch Branch: for-3.0.x Commit: a5f62d7c0a51be9b02a31f6ac8a3bb22d10d3213 URL: http://git.xenomai.org/?p=xenomai-gch.git;a=commit;h=a5f62d7c0a51be9b02a31f6ac8a3bb22d10d3213 Author: Gilles ChanteperdrixDate: Sun Nov 1 19:14:40 2015 +0100 testsuite/smokey: add RTnet raw packets test --- configure.ac |1 + testsuite/smokey/Makefile.am |2 + testsuite/smokey/net_common/setup.c |7 +- testsuite/smokey/net_packet_raw/Makefile.am | 10 +++ testsuite/smokey/net_packet_raw/packet_raw.c | 122 ++ 5 files changed, 136 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index a9857b7..7f2635d 100644 --- a/configure.ac +++ b/configure.ac @@ -893,6 +893,7 @@ AC_CONFIG_FILES([ \ testsuite/smokey/leaks/Makefile \ testsuite/smokey/net_udp/Makefile \ testsuite/smokey/net_packet_dgram/Makefile \ + testsuite/smokey/net_packet_raw/Makefile \ testsuite/smokey/net_common/Makefile \ testsuite/switchtest/Makefile \ testsuite/xeno-test/Makefile \ diff --git a/testsuite/smokey/Makefile.am b/testsuite/smokey/Makefile.am index 3ba818a..8504e99 100644 --- a/testsuite/smokey/Makefile.am +++ b/testsuite/smokey/Makefile.am @@ -13,6 +13,7 @@ SUBDIRS = \ iddp\ leaks \ net_packet_dgram\ + net_packet_raw \ net_udp \ net_common \ posix-clock \ @@ -60,6 +61,7 @@ DIST_SUBDIRS =\ iddp\ leaks \ net_packet_dgram\ + net_packet_raw \ net_udp \ net_common \ posix-clock \ diff --git a/testsuite/smokey/net_common/setup.c b/testsuite/smokey/net_common/setup.c index a315d2e..2dd79dc 100644 --- a/testsuite/smokey/net_common/setup.c +++ b/testsuite/smokey/net_common/setup.c @@ -251,16 +251,11 @@ static int find_peer(const char *intf, void *vpeer) for(;;) { err = fscanf(f, "%s\t%s\t%s\t%s\n", hash, dest, mac, dev); - if (err == 0) { + if (err == EOF) { smokey_warning("No peer found\n"); err = -ENOENT; goto err; } - if (err < 0) { - err = -errno; - smokey_warning("fscanf: %s", strerror(-err)); - goto err; - } if (err < 4) { smokey_warning("Error parsing" " /proc/rtnet/ipv4/host_route\n"); diff --git a/testsuite/smokey/net_packet_raw/Makefile.am b/testsuite/smokey/net_packet_raw/Makefile.am new file mode 100644 index 000..6a6372a --- /dev/null +++ b/testsuite/smokey/net_packet_raw/Makefile.am @@ -0,0 +1,10 @@ +noinst_LIBRARIES = libnet_packet_raw.a + +libnet_packet_raw_a_SOURCES = \ + packet_raw.c + +libnet_packet_raw_a_CPPFLAGS = \ + @XENO_USER_CFLAGS@ \ + -I$(srcdir)/../net_common \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/kernel/drivers/net/stack/include diff --git a/testsuite/smokey/net_packet_raw/packet_raw.c b/testsuite/smokey/net_packet_raw/packet_raw.c new file mode 100644 index 000..a7302ca --- /dev/null +++ b/testsuite/smokey/net_packet_raw/packet_raw.c @@ -0,0 +1,122 @@ +/* + * RTnet AF_PACKET test + * + * Copyright (C) 2015 Gilles Chanteperdrix + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include "smokey_net.h" + +smokey_test_plugin(net_packet_raw, + SMOKEY_ARGLIST( + SMOKEY_STRING(rtnet_driver), + SMOKEY_STRING(rtnet_interface), + SMOKEY_INT(rtnet_rate), + SMOKEY_INT(rtnet_duration), + ), + "Check RTnet driver, using raw packets, measuring round trip time\n" + "\tand packet losses,\n" + "\tthe rtnet_driver parameter allows choosing the network driver\n" + "\tthe rtnet_interface parameter allows choosing the network interface\n" + "\tthe rtnet_rate parameter allows choosing the packet rate\n" + "\tthe rtnet_duration parameter allows choosing the test duration\n" + "\tA server on the network must run the smokey_rtnet_server program." +); + +struct raw_packet_client { + struct smokey_net_client base; + struct ethhdr header; +}; + +static int +packet_raw_create_socket(struct smokey_net_client *bclient) +{ + struct raw_packet_client *client = (struct raw_packet_client *)bclient; + struct ifreq ifr; + int err, sock; + + sock = smokey_check_errno( + __RT(socket(PF_PACKET, SOCK_RAW, htons(ETH_P_802_EX1 + 1; + if (sock < 0) + return sock; + +
[Xenomai-git] Philippe Gerum : doc: prebuild
Module: xenomai-3 Branch: stable-3.0.x Commit: ce604a92b249e84d888f58327b34239330b063e5 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=ce604a92b249e84d888f58327b34239330b063e5 Author: Philippe GerumDate: Sun Nov 1 18:42:42 2015 +0100 doc: prebuild --- doc/asciidoc/MIGRATION.adoc| 11 +- doc/asciidoc/TROUBLESHOOTING.COBALT.adoc | 12 + doc/asciidoc/TROUBLESHOOTING.MERCURY.adoc |9 + doc/prebuilt/html/MIGRATION/index.html | 26 +- doc/prebuilt/html/README.APPLICATIONS/index.html |2 +- doc/prebuilt/html/README.INSTALL/index.html|2 +- .../html/TROUBLESHOOTING.COBALT/index.html | 52 +- .../html/TROUBLESHOOTING.MERCURY/index.html| 14 +- .../html/xeno3prm/16550A__io_8h_source.html|2 +- .../html/xeno3prm/16550A__pci_8h_source.html |2 +- .../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 +- ...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 |2 +- doc/prebuilt/html/xeno3prm/async_8c.html |2 +- 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|2 +- .../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 |2 +- .../html/xeno3prm/bufp-readwrite_8c-example.html |2 +- 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 |2 +- 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 |2 +- .../html/xeno3prm/cobalt-core_8h_source.html |2 +- .../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 |2 +- .../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 |2 +- .../cobalt_2kernel_2rtdm_2compat_8h_source.html|2 +- .../cobalt_2kernel_2rtdm_2ipc_8h_source.html |2 +- .../cobalt_2kernel_2rtdm_2rtdm_8h_source.html |2 +- .../cobalt_2kernel_2rtdm_2serial_8h_source.html|2 +- .../cobalt_2kernel_2rtdm_2testing_8h_source.html |2 +- .../xeno3prm/cobalt_2kernel_2rtdm_2udd_8h.html |4 +- .../cobalt_2kernel_2rtdm_2udd_8h__incl.map | 68 +- .../cobalt_2kernel_2rtdm_2udd_8h__incl.md5 |2 +- .../cobalt_2kernel_2rtdm_2udd_8h__incl.png | Bin
[Xenomai-git] Philippe Gerum : bump version code
Module: xenomai-3 Branch: stable-3.0.x Commit: 86b1240875600df8b98950deee3b001c688b42f6 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=86b1240875600df8b98950deee3b001c688b42f6 Author: Philippe GerumDate: Sun Nov 1 18:38:22 2015 +0100 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 4a36342..cb2b00e 100644 --- a/config/version-code +++ b/config/version-code @@ -1 +1 @@ -3.0.0 +3.0.1 diff --git a/config/version-label b/config/version-label index 9f55b2c..cb2b00e 100644 --- a/config/version-label +++ b/config/version-label @@ -1 +1 @@ -3.0 +3.0.1 ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git