Module: xenomai-2.6
Branch: master
Commit: 9a774c8ed832a9ab1260455b54aec4ef55321a17
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=9a774c8ed832a9ab1260455b54aec4ef55321a17
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Sat Apr 27 22:52:46 2013 +0200
skins: move xntrace API out-of-line in libxenomai library
---
include/nucleus/trace.h | 57 +++++++++++-------------------------------
src/skins/common/Makefile.am | 1 +
src/skins/common/Makefile.in | 11 +++++++-
src/skins/common/trace.c | 45 +++++++++++++++++++++++++++++++++
4 files changed, 71 insertions(+), 43 deletions(-)
diff --git a/include/nucleus/trace.h b/include/nucleus/trace.h
index f1eb0b6..fd0f02b 100644
--- a/include/nucleus/trace.h
+++ b/include/nucleus/trace.h
@@ -51,48 +51,21 @@
#include <asm/xenomai/syscall.h>
-static inline int xntrace_max_begin(unsigned long v)
-{
- return XENOMAI_SYSCALL2(__xn_sys_trace, __xntrace_op_max_begin, v);
-}
-
-static inline int xntrace_max_end(unsigned long v)
-{
- return XENOMAI_SYSCALL2(__xn_sys_trace, __xntrace_op_max_end, v);
-}
-
-static inline int xntrace_max_reset(void)
-{
- return XENOMAI_SYSCALL1(__xn_sys_trace, __xntrace_op_max_reset);
-}
-
-static inline int xntrace_user_start(void)
-{
- return XENOMAI_SYSCALL1(__xn_sys_trace, __xntrace_op_user_start);
-}
-
-static inline int xntrace_user_stop(unsigned long v)
-{
- return XENOMAI_SYSCALL2(__xn_sys_trace, __xntrace_op_user_stop, v);
-}
-
-static inline int xntrace_user_freeze(unsigned long v, int once)
-{
- return XENOMAI_SYSCALL3(__xn_sys_trace, __xntrace_op_user_freeze,
- v, once);
-}
-
-static inline int xntrace_special(unsigned char id, unsigned long v)
-{
- return XENOMAI_SYSCALL3(__xn_sys_trace, __xntrace_op_special, id, v);
-}
-
-static inline int xntrace_special_u64(unsigned char id, unsigned long long v)
-{
- return XENOMAI_SYSCALL4(__xn_sys_trace, __xntrace_op_special_u64, id,
- (unsigned long)(v >> 32),
- (unsigned long)(v & 0xFFFFFFFF));
-}
+int xntrace_max_begin(unsigned long v);
+
+int xntrace_max_end(unsigned long v);
+
+int xntrace_max_reset(void);
+
+int xntrace_user_start(void);
+
+int xntrace_user_stop(unsigned long v);
+
+int xntrace_user_freeze(unsigned long v, int once);
+
+int xntrace_special(unsigned char id, unsigned long v);
+
+int xntrace_special_u64(unsigned char id, unsigned long long v);
#endif /* defined(__KERNEL__) || defined(__XENO_SIM__) */
diff --git a/src/skins/common/Makefile.am b/src/skins/common/Makefile.am
index db6078a..022e8c5 100644
--- a/src/skins/common/Makefile.am
+++ b/src/skins/common/Makefile.am
@@ -11,6 +11,7 @@ libxenomai_la_SOURCES = \
sem_heap.c \
sigshadow.c \
timeconv.c \
+ trace.c \
wrappers.c
libxenomai_la_LDFLAGS = @XENO_DLOPEN_CONSTRAINT@ -version-info 0:0:0 \
diff --git a/src/skins/common/Makefile.in b/src/skins/common/Makefile.in
index b522817..8ee839e 100644
--- a/src/skins/common/Makefile.in
+++ b/src/skins/common/Makefile.in
@@ -82,7 +82,7 @@ am_libxenomai_la_OBJECTS = libxenomai_la-assert_context.lo \
libxenomai_la-bind.lo libxenomai_la-current.lo \
libxenomai_la-rt_print.lo libxenomai_la-sem_heap.lo \
libxenomai_la-sigshadow.lo libxenomai_la-timeconv.lo \
- libxenomai_la-wrappers.lo
+ libxenomai_la-trace.lo libxenomai_la-wrappers.lo
libxenomai_la_OBJECTS = $(am_libxenomai_la_OBJECTS)
libxenomai_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -281,6 +281,7 @@ libxenomai_la_SOURCES = \
sem_heap.c \
sigshadow.c \
timeconv.c \
+ trace.c \
wrappers.c
libxenomai_la_LDFLAGS = @XENO_DLOPEN_CONSTRAINT@ -version-info 0:0:0 \
@@ -371,6 +372,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libxenomai_la-sem_heap.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libxenomai_la-sigshadow.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libxenomai_la-timeconv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libxenomai_la-trace.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libxenomai_la-wrappers.Plo@am__quote@
.c.o:
@@ -443,6 +445,13 @@ libxenomai_la-timeconv.lo: timeconv.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libxenomai_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
libxenomai_la-timeconv.lo `test -f 'timeconv.c' || echo '$(srcdir)/'`timeconv.c
+libxenomai_la-trace.lo: trace.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libxenomai_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libxenomai_la-trace.lo -MD -MP -MF $(DEPDIR)/libxenomai_la-trace.Tpo -c -o
libxenomai_la-trace.lo `test -f 'trace.c' || echo '$(srcdir)/'`trace.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxenomai_la-trace.Tpo
$(DEPDIR)/libxenomai_la-trace.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trace.c'
object='libxenomai_la-trace.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libxenomai_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
libxenomai_la-trace.lo `test -f 'trace.c' || echo '$(srcdir)/'`trace.c
+
libxenomai_la-wrappers.lo: wrappers.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libxenomai_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libxenomai_la-wrappers.lo -MD -MP -MF $(DEPDIR)/libxenomai_la-wrappers.Tpo -c
-o libxenomai_la-wrappers.lo `test -f 'wrappers.c' || echo
'$(srcdir)/'`wrappers.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxenomai_la-wrappers.Tpo
$(DEPDIR)/libxenomai_la-wrappers.Plo
diff --git a/src/skins/common/trace.c b/src/skins/common/trace.c
new file mode 100644
index 0000000..5d3d66d
--- /dev/null
+++ b/src/skins/common/trace.c
@@ -0,0 +1,45 @@
+#include <nucleus/trace.h>
+
+int xntrace_max_begin(unsigned long v)
+{
+ return XENOMAI_SYSCALL2(__xn_sys_trace, __xntrace_op_max_begin, v);
+}
+
+int xntrace_max_end(unsigned long v)
+{
+ return XENOMAI_SYSCALL2(__xn_sys_trace, __xntrace_op_max_end, v);
+}
+
+int xntrace_max_reset(void)
+{
+ return XENOMAI_SYSCALL1(__xn_sys_trace, __xntrace_op_max_reset);
+}
+
+int xntrace_user_start(void)
+{
+ return XENOMAI_SYSCALL1(__xn_sys_trace, __xntrace_op_user_start);
+}
+
+int xntrace_user_stop(unsigned long v)
+{
+ return XENOMAI_SYSCALL2(__xn_sys_trace, __xntrace_op_user_stop, v);
+}
+
+int xntrace_user_freeze(unsigned long v, int once)
+{
+ return XENOMAI_SYSCALL3(__xn_sys_trace, __xntrace_op_user_freeze,
+ v, once);
+}
+
+int xntrace_special(unsigned char id, unsigned long v)
+{
+ return XENOMAI_SYSCALL3(__xn_sys_trace, __xntrace_op_special, id, v);
+}
+
+int xntrace_special_u64(unsigned char id, unsigned long long v)
+{
+ return XENOMAI_SYSCALL4(__xn_sys_trace, __xntrace_op_special_u64, id,
+ (unsigned long)(v >> 32),
+ (unsigned long)(v & 0xFFFFFFFF));
+}
+
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
