* [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1
@ 2012-04-15 19:17 Samuel Martin
2012-04-15 19:17 ` [Buildroot] [PATCH 2/3] lttng-modules: " Samuel Martin
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Samuel Martin @ 2012-04-15 19:17 UTC (permalink / raw)
To: buildroot
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
.../lttng-libust-fix-overflow-32-bits.patch | 26 --------------------
package/lttng-libust/lttng-libust.mk | 11 ++++++---
2 files changed, 8 insertions(+), 29 deletions(-)
delete mode 100644 package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch
diff --git a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch b/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch
deleted file mode 100644
index c2a4dd2..0000000
--- a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dc190cc1f8ddccfa7b0b8323ed157afb29a0ebb7 Mon Sep 17 00:00:00 2001
-From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Date: Wed, 21 Dec 2011 16:24:48 -0500
-Subject: [PATCH] Fix clock source overflow on 32-bit archs
-
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
----
- liblttng-ust/clock.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h
-index b5d3e77..23294d2 100644
---- a/liblttng-ust/clock.h
-+++ b/liblttng-ust/clock.h
-@@ -39,7 +39,7 @@ static __inline__ uint64_t trace_clock_read64(void)
- struct timespec ts;
-
- clock_gettime(CLOCK_MONOTONIC, &ts);
-- return (ts.tv_sec * 1000000000) + ts.tv_nsec;
-+ return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
- }
-
- static __inline__ uint32_t trace_clock_freq_scale(void)
---
-1.7.2.5
-
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index f54999e..de1b145 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -1,6 +1,11 @@
-LTTNG_LIBUST_SITE = http://lttng.org/files/bundles/20111214/
-LTTNG_LIBUST_VERSION = 1.9.2
-LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.gz
+#############################################################
+#
+# LTTng-UST: the userspace tracing library
+#
+#############################################################
+LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust/
+LTTNG_LIBUST_VERSION = 2.0.1
+LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
LTTNG_LIBUST_INSTALL_STAGING = YES
LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
--
1.7.10
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 2/3] lttng-modules: bump to version 2.0.1 2012-04-15 19:17 [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Samuel Martin @ 2012-04-15 19:17 ` Samuel Martin 2012-04-15 19:17 ` [Buildroot] [PATCH 3/3] lttng-tools: bump version to 2.0.0 Samuel Martin 2012-04-26 7:27 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Peter Korsgaard 2 siblings, 0 replies; 14+ messages in thread From: Samuel Martin @ 2012-04-15 19:17 UTC (permalink / raw) To: buildroot Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- package/lttng-modules/lttng-modules.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index 1820c8f..df5fecc 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -1,5 +1,10 @@ -LTTNG_MODULES_VERSION = 2.0-pre11 -LTTNG_MODULES_SITE = http://lttng.org/files/bundles/20111214/ +############################################################# +# +# LTTng-modules: the kernel modules (requires at least Linux 2.6.38) +# +############################################################# +LTTNG_MODULES_VERSION = 2.0.1 +LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules/ LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_DEPENDENCIES = linux -- 1.7.10 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 3/3] lttng-tools: bump version to 2.0.0 2012-04-15 19:17 [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Samuel Martin 2012-04-15 19:17 ` [Buildroot] [PATCH 2/3] lttng-modules: " Samuel Martin @ 2012-04-15 19:17 ` Samuel Martin 2012-04-26 7:27 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Peter Korsgaard 2 siblings, 0 replies; 14+ messages in thread From: Samuel Martin @ 2012-04-15 19:17 UTC (permalink / raw) To: buildroot Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- ...ls-2.0-pre15-no-sync-file-range-in-uclibc.patch | 87 -------------------- .../lttng-tools-no-sync-file-range-in-uclibc.patch | 50 +++++++++++ package/lttng-tools/lttng-tools.mk | 9 +- 3 files changed, 57 insertions(+), 89 deletions(-) delete mode 100644 package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch create mode 100644 package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch diff --git a/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch deleted file mode 100644 index 861686b..0000000 --- a/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch +++ /dev/null @@ -1,87 +0,0 @@ -Make sync_file_range() usage optional - -Under uClibc, sync_file_range() is not available under all -architectures, so we fall back to fdatasync() in this case. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - -Index: lttng-tools-2.0-pre15/configure.ac -=================================================================== ---- lttng-tools-2.0-pre15.orig/configure.ac 2012-02-01 16:31:31.140978817 +0100 -+++ lttng-tools-2.0-pre15/configure.ac 2012-02-01 16:31:42.110783708 +0100 -@@ -96,7 +96,7 @@ - - AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ]) - --AC_CHECK_FUNCS([sched_getcpu sysconf]) -+AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range]) - - # Option to only build the consumer daemon and its libraries - AC_ARG_WITH([consumerd-only], -Index: lttng-tools-2.0-pre15/liblttng-consumer/lttng-consumer.c -=================================================================== ---- lttng-tools-2.0-pre15.orig/liblttng-consumer/lttng-consumer.c 2012-02-01 16:36:00.876292596 +0100 -+++ lttng-tools-2.0-pre15/liblttng-consumer/lttng-consumer.c 2012-02-01 16:36:23.435901163 +0100 -@@ -527,11 +527,15 @@ - if (orig_offset < stream->chan->max_sb_size) { - return; - } -+#ifdef HAVE_SYNC_FILE_RANGE - sync_file_range(outfd, orig_offset - stream->chan->max_sb_size, - stream->chan->max_sb_size, - SYNC_FILE_RANGE_WAIT_BEFORE - | SYNC_FILE_RANGE_WRITE - | SYNC_FILE_RANGE_WAIT_AFTER); -+#else -+ fdatasync(outfd); -+#endif - /* - * Give hints to the kernel about how we access the file: - * POSIX_FADV_DONTNEED : we won't re-access data in a near future after -Index: lttng-tools-2.0-pre15/liblttng-kconsumer/lttng-kconsumer.c -=================================================================== ---- lttng-tools-2.0-pre15.orig/liblttng-kconsumer/lttng-kconsumer.c 2012-02-01 16:36:36.215679416 +0100 -+++ lttng-tools-2.0-pre15/liblttng-kconsumer/lttng-kconsumer.c 2012-02-01 16:59:08.622203348 +0100 -@@ -71,8 +71,12 @@ - goto end; - } - /* This won't block, but will start writeout asynchronously */ -+#ifdef HAVE_SYNC_FILE_RANGE - sync_file_range(outfd, stream->out_fd_offset, ret, - SYNC_FILE_RANGE_WRITE); -+#else -+ fdatasync(outfd); -+#endif - stream->out_fd_offset += ret; - } - -@@ -121,8 +125,12 @@ - } - len -= ret; - /* This won't block, but will start writeout asynchronously */ -+#ifdef HAVE_SYNC_FILE_RANGE - sync_file_range(outfd, stream->out_fd_offset, ret, - SYNC_FILE_RANGE_WRITE); -+#else -+ fdatasync(outfd); -+#endif - stream->out_fd_offset += ret; - } - lttng_consumer_sync_trace_file(stream, orig_offset); -Index: lttng-tools-2.0-pre15/liblttng-ustconsumer/lttng-ustconsumer.c -=================================================================== ---- lttng-tools-2.0-pre15.orig/liblttng-ustconsumer/lttng-ustconsumer.c 2012-02-01 16:37:11.495067263 +0100 -+++ lttng-tools-2.0-pre15/liblttng-ustconsumer/lttng-ustconsumer.c 2012-02-01 16:37:31.224724916 +0100 -@@ -70,8 +70,12 @@ - goto end; - } - /* This won't block, but will start writeout asynchronously */ -+#ifdef HAVE_SYNC_FILE_RANGE - sync_file_range(outfd, stream->out_fd_offset, ret, - SYNC_FILE_RANGE_WRITE); -+#else -+ fdatasync(outfd); -+#endif - stream->out_fd_offset += ret; - } - diff --git a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch new file mode 100644 index 0000000..cca083b --- /dev/null +++ b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch @@ -0,0 +1,50 @@ +Make sync_file_range() usage optional + +Under uClibc, sync_file_range() is not available under all +architectures, so we fall back to fdatasync() in this case. + +Inspired by the patch done by Thomas Petazzoni for the +2.0-pre25 version. + +Signed-off-by: Samuel Martin <s.martin49@gmail.com> +--- + configure.ac | 2 +- + src/common/compat/fcntl.h | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5808c79..065b9cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -120,7 +120,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [ + + AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ]) + +-AC_CHECK_FUNCS([sched_getcpu sysconf]) ++AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range]) + + # check for dlopen + AC_CHECK_LIB([dl], [dlopen], +diff --git a/src/common/compat/fcntl.h b/src/common/compat/fcntl.h +index 58c1579..dafb33e 100644 +--- a/src/common/compat/fcntl.h ++++ b/src/common/compat/fcntl.h +@@ -23,10 +23,15 @@ + + #ifdef __linux__ + ++#if defined(HAVE_SYNC_FILE_RANGE) + extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes, + unsigned int flags); + #define lttng_sync_file_range(fd, offset, nbytes, flags) \ + compat_sync_file_range(fd, offset, nbytes, flags) ++#else ++#define lttng_sync_file_range(fd, offset, nbytes, flags) \ ++ fdatasync(fd); ++#endif + + #elif defined(__FreeBSD__) + +-- +1.7.10 + diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index 8e6fc1a..856d840 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -1,5 +1,10 @@ -LTTNG_TOOLS_VERSION = 2.0-pre15 -LTTNG_TOOLS_SITE = http://lttng.org/files/bundles/20111214/ +############################################################# +# +# LTTng-Tools: the trace control client +# +############################################################# +LTTNG_TOOLS_VERSION = 2.0.0 +LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools/ LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 # The host-lttng-babeltrace technically isn't a required build -- 1.7.10 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 2012-04-15 19:17 [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Samuel Martin 2012-04-15 19:17 ` [Buildroot] [PATCH 2/3] lttng-modules: " Samuel Martin 2012-04-15 19:17 ` [Buildroot] [PATCH 3/3] lttng-tools: bump version to 2.0.0 Samuel Martin @ 2012-04-26 7:27 ` Peter Korsgaard 2012-04-26 7:52 ` Samuel Martin 2012-04-26 7:59 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Thomas Petazzoni 2 siblings, 2 replies; 14+ messages in thread From: Peter Korsgaard @ 2012-04-26 7:27 UTC (permalink / raw) To: buildroot >>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes: Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Thanks. On what toolchain as this been tested? I gave it a try with our internal toolchain as the older version has been failing on the autobuilders, but I cannot build the new version either: CCLD test_urcu_dynamic_link test_urcu.o: In function `thr_writer': /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/test_urcu.c:282: undefined reference to `__sync_lock_test_and_set_4' urcu.o: In function `_uatomic_add_return': /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:180: undefined reference to `__sync_add_and_fetch_4' /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:180: undefined reference to `__sync_add_and_fetch_4' urcu.o: In function `_uatomic_or': /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:145: undefined reference to `__sync_or_and_fetch_4' urcu.o: In function `call_rcu_data_free': -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 2012-04-26 7:27 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Peter Korsgaard @ 2012-04-26 7:52 ` Samuel Martin 2012-04-26 9:06 ` Peter Korsgaard 2012-04-26 7:59 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Thomas Petazzoni 1 sibling, 1 reply; 14+ messages in thread From: Samuel Martin @ 2012-04-26 7:52 UTC (permalink / raw) To: buildroot Hi Peter, all, 2012/4/26 Peter Korsgaard <jacmet@uclibc.org>: >>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes: > > ?Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com> > > Thanks. On what toolchain as this been tested? I tested it using an "Armdeus-like" toolchain or a qemu_arm_versatile + WCHAR + gettext toolchain, based on the head of master at the time of the submission. > > I gave it a try with our internal toolchain as the older version has > been failing on the autobuilders, but I cannot build the new version > either: > > ?CCLD ? test_urcu_dynamic_link > test_urcu.o: In function `thr_writer': > /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/test_urcu.c:282: undefined reference to `__sync_lock_test_and_set_4' > urcu.o: In function `_uatomic_add_return': > /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:180: undefined reference to `__sync_add_and_fetch_4' > /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:180: undefined reference to `__sync_add_and_fetch_4' > urcu.o: In function `_uatomic_or': > /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:145: undefined reference to `__sync_or_and_fetch_4' > urcu.o: In function `call_rcu_data_free': > I don't remember having such troubles. However, I was not able to build gettext without the patch from Maxime Ripard (converting gettext to autotarget). Whatever, this is another topic... on which I have some patches in the queue I have to rework before posting them... Regards, Sam ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 2012-04-26 7:52 ` Samuel Martin @ 2012-04-26 9:06 ` Peter Korsgaard 2012-05-08 13:41 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.2 Samuel Martin 0 siblings, 1 reply; 14+ messages in thread From: Peter Korsgaard @ 2012-04-26 9:06 UTC (permalink / raw) To: buildroot >>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes: Samuel> Hi Peter, all, Samuel> 2012/4/26 Peter Korsgaard <jacmet@uclibc.org>: >>>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes: >> >> ?Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com> >> >> Thanks. On what toolchain as this been tested? Samuel> I tested it using an "Armdeus-like" toolchain or a qemu_arm_versatile Samuel> + WCHAR + gettext toolchain, Samuel> based on the head of master at the time of the submission. Seems you forgot to update the cxx patch: >>> lttng-libust 2.0.1 Patching package//lttng-libust Applying lttng-libust-dont-build-cxx-tests-when-not-available.patch using patch: patching file configure.ac Hunk #1 succeeded at 45 (offset 7 lines). patching file tests/Makefile.am Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file tests/Makefile.am.rej Patch failed! Please fix lttng-libust-dont-build-cxx-tests-when-not-available.patch! I also added a new patch fixing build with uClibc > 0.9.32 a few minutes ago. Care to fix and resubmit? -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.2 2012-04-26 9:06 ` Peter Korsgaard @ 2012-05-08 13:41 ` Samuel Martin 2012-05-08 13:41 ` [Buildroot] [PATCH 2/3] lttng-modules: " Samuel Martin ` (2 more replies) 0 siblings, 3 replies; 14+ messages in thread From: Samuel Martin @ 2012-05-08 13:41 UTC (permalink / raw) To: buildroot Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- ...t-dont-build-cxx-tests-when-not-available.patch | 45 ++++++++++++-------- .../lttng-libust-fix-overflow-32-bits.patch | 26 ----------- package/lttng-libust/lttng-libust.mk | 11 +++-- 3 files changed, 36 insertions(+), 46 deletions(-) delete mode 100644 package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch diff --git a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch index d7be22d..437ccca 100644 --- a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch +++ b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch @@ -1,19 +1,27 @@ -Do not build C++ example if a C++ compiler isn't available +From 01dfa6e944d083db994f0a1165d3124bb6875437 Mon Sep 17 00:00:00 2001 +From: Samuel Martin <s.martin49@gmail.com> +Date: Tue, 8 May 2012 15:13:21 +0200 +Subject: [PATCH 1/1] don't build C++ example if a C++ compiler isn't + available By default lttng-ust builds a hello.cxx C++ example that demonstrates -the usage of the userspace tracing library in a C++ -program. Unfortunately, when no C++ support is available, the build -of lttng-ust fails just because of this example code. So we make the -compilation of this code conditional on whether a working C++ compiler -was found. +the usage of the userspace tracing library in a C++ program. +Unfortunately, when no C++ support is available, the build of lttng-ust +fails just because of this example code. So we make the compilation of +this code conditional on whether a working C++ compiler was found. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Samuel Martin <s.martin49@gmail.com> +--- + configure.ac | 12 ++++++++++++ + tests/Makefile.am | 6 +++++- + 2 files changed, 17 insertions(+), 1 deletion(-) -Index: lttng-ust-1.9.2/configure.ac -=================================================================== ---- lttng-ust-1.9.2.orig/configure.ac 2012-02-04 14:49:45.387325814 +0100 -+++ lttng-ust-1.9.2/configure.ac 2012-02-04 14:50:08.156920117 +0100 -@@ -38,6 +38,18 @@ +diff --git a/configure.ac b/configure.ac +index 26227cb..56d84db 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -45,6 +45,18 @@ AC_PROG_CXX AC_PROG_MAKE_SET LT_INIT @@ -32,13 +40,13 @@ Index: lttng-ust-1.9.2/configure.ac ## Checks for libraries. AC_CHECK_LIB([dl], [dlopen]) AC_CHECK_LIB([pthread], [pthread_create]) -Index: lttng-ust-1.9.2/tests/Makefile.am -=================================================================== ---- lttng-ust-1.9.2.orig/tests/Makefile.am 2012-02-04 14:49:49.157258640 +0100 -+++ lttng-ust-1.9.2/tests/Makefile.am 2012-02-04 14:50:15.096796474 +0100 +diff --git a/tests/Makefile.am b/tests/Makefile.am +index e79ab7c..1a8b795 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am @@ -1,6 +1,10 @@ --SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo hello.cxx -+SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo +-SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo hello.cxx ++SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo #SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast +if CXX_WORKS @@ -48,3 +56,6 @@ Index: lttng-ust-1.9.2/tests/Makefile.am dist_noinst_SCRIPTS = test_loop runtests trace_matches noinst_LIBRARIES = libtap.a +-- +1.7.10.1 + diff --git a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch b/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch deleted file mode 100644 index c2a4dd2..0000000 --- a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dc190cc1f8ddccfa7b0b8323ed157afb29a0ebb7 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Wed, 21 Dec 2011 16:24:48 -0500 -Subject: [PATCH] Fix clock source overflow on 32-bit archs - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - liblttng-ust/clock.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h -index b5d3e77..23294d2 100644 ---- a/liblttng-ust/clock.h -+++ b/liblttng-ust/clock.h -@@ -39,7 +39,7 @@ static __inline__ uint64_t trace_clock_read64(void) - struct timespec ts; - - clock_gettime(CLOCK_MONOTONIC, &ts); -- return (ts.tv_sec * 1000000000) + ts.tv_nsec; -+ return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec; - } - - static __inline__ uint32_t trace_clock_freq_scale(void) --- -1.7.2.5 - diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index f54999e..81bffe9 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -1,6 +1,11 @@ -LTTNG_LIBUST_SITE = http://lttng.org/files/bundles/20111214/ -LTTNG_LIBUST_VERSION = 1.9.2 -LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.gz +############################################################# +# +# LTTng-UST: the userspace tracing library +# +############################################################# +LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust/ +LTTNG_LIBUST_VERSION = 2.0.2 +LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux -- 1.7.10.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 2/3] lttng-modules: bump to version 2.0.2 2012-05-08 13:41 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.2 Samuel Martin @ 2012-05-08 13:41 ` Samuel Martin 2012-05-22 4:24 ` Samuel Martin 2012-05-08 13:41 ` [Buildroot] [PATCH 3/3] lttng-tools: bump version to 2.0.1 Samuel Martin 2012-05-22 4:23 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.2 Samuel Martin 2 siblings, 1 reply; 14+ messages in thread From: Samuel Martin @ 2012-05-08 13:41 UTC (permalink / raw) To: buildroot Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- package/lttng-modules/lttng-modules.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index 1820c8f..77cb7cc 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -1,5 +1,10 @@ -LTTNG_MODULES_VERSION = 2.0-pre11 -LTTNG_MODULES_SITE = http://lttng.org/files/bundles/20111214/ +############################################################# +# +# LTTng-modules: the kernel modules (requires at least Linux 2.6.38) +# +############################################################# +LTTNG_MODULES_VERSION = 2.0.2 +LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules/ LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_DEPENDENCIES = linux -- 1.7.10.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 2/3] lttng-modules: bump to version 2.0.2 2012-05-08 13:41 ` [Buildroot] [PATCH 2/3] lttng-modules: " Samuel Martin @ 2012-05-22 4:24 ` Samuel Martin 0 siblings, 0 replies; 14+ messages in thread From: Samuel Martin @ 2012-05-22 4:24 UTC (permalink / raw) To: buildroot ping? 2012/5/8 Samuel Martin <s.martin49@gmail.com>: > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> > --- > ?package/lttng-modules/lttng-modules.mk | ? ?9 +++++++-- > ?1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk > index 1820c8f..77cb7cc 100644 > --- a/package/lttng-modules/lttng-modules.mk > +++ b/package/lttng-modules/lttng-modules.mk > @@ -1,5 +1,10 @@ > -LTTNG_MODULES_VERSION = 2.0-pre11 > -LTTNG_MODULES_SITE ? ?= http://lttng.org/files/bundles/20111214/ > +############################################################# > +# > +# LTTng-modules: the kernel modules (requires at least Linux 2.6.38) > +# > +############################################################# > +LTTNG_MODULES_VERSION = 2.0.2 > +LTTNG_MODULES_SITE ? ?= http://lttng.org/files/lttng-modules/ > ?LTTNG_MODULES_SOURCE ?= lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 > > ?LTTNG_MODULES_DEPENDENCIES = linux > -- > 1.7.10.1 > ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 3/3] lttng-tools: bump version to 2.0.1 2012-05-08 13:41 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.2 Samuel Martin 2012-05-08 13:41 ` [Buildroot] [PATCH 2/3] lttng-modules: " Samuel Martin @ 2012-05-08 13:41 ` Samuel Martin 2012-05-22 4:24 ` Samuel Martin 2012-05-22 4:23 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.2 Samuel Martin 2 siblings, 1 reply; 14+ messages in thread From: Samuel Martin @ 2012-05-08 13:41 UTC (permalink / raw) To: buildroot Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- ...ls-2.0-pre15-no-sync-file-range-in-uclibc.patch | 87 -------------------- .../lttng-tools-no-sync-file-range-in-uclibc.patch | 50 +++++++++++ package/lttng-tools/lttng-tools.mk | 9 +- 3 files changed, 57 insertions(+), 89 deletions(-) delete mode 100644 package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch create mode 100644 package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch diff --git a/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch deleted file mode 100644 index 861686b..0000000 --- a/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch +++ /dev/null @@ -1,87 +0,0 @@ -Make sync_file_range() usage optional - -Under uClibc, sync_file_range() is not available under all -architectures, so we fall back to fdatasync() in this case. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - -Index: lttng-tools-2.0-pre15/configure.ac -=================================================================== ---- lttng-tools-2.0-pre15.orig/configure.ac 2012-02-01 16:31:31.140978817 +0100 -+++ lttng-tools-2.0-pre15/configure.ac 2012-02-01 16:31:42.110783708 +0100 -@@ -96,7 +96,7 @@ - - AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ]) - --AC_CHECK_FUNCS([sched_getcpu sysconf]) -+AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range]) - - # Option to only build the consumer daemon and its libraries - AC_ARG_WITH([consumerd-only], -Index: lttng-tools-2.0-pre15/liblttng-consumer/lttng-consumer.c -=================================================================== ---- lttng-tools-2.0-pre15.orig/liblttng-consumer/lttng-consumer.c 2012-02-01 16:36:00.876292596 +0100 -+++ lttng-tools-2.0-pre15/liblttng-consumer/lttng-consumer.c 2012-02-01 16:36:23.435901163 +0100 -@@ -527,11 +527,15 @@ - if (orig_offset < stream->chan->max_sb_size) { - return; - } -+#ifdef HAVE_SYNC_FILE_RANGE - sync_file_range(outfd, orig_offset - stream->chan->max_sb_size, - stream->chan->max_sb_size, - SYNC_FILE_RANGE_WAIT_BEFORE - | SYNC_FILE_RANGE_WRITE - | SYNC_FILE_RANGE_WAIT_AFTER); -+#else -+ fdatasync(outfd); -+#endif - /* - * Give hints to the kernel about how we access the file: - * POSIX_FADV_DONTNEED : we won't re-access data in a near future after -Index: lttng-tools-2.0-pre15/liblttng-kconsumer/lttng-kconsumer.c -=================================================================== ---- lttng-tools-2.0-pre15.orig/liblttng-kconsumer/lttng-kconsumer.c 2012-02-01 16:36:36.215679416 +0100 -+++ lttng-tools-2.0-pre15/liblttng-kconsumer/lttng-kconsumer.c 2012-02-01 16:59:08.622203348 +0100 -@@ -71,8 +71,12 @@ - goto end; - } - /* This won't block, but will start writeout asynchronously */ -+#ifdef HAVE_SYNC_FILE_RANGE - sync_file_range(outfd, stream->out_fd_offset, ret, - SYNC_FILE_RANGE_WRITE); -+#else -+ fdatasync(outfd); -+#endif - stream->out_fd_offset += ret; - } - -@@ -121,8 +125,12 @@ - } - len -= ret; - /* This won't block, but will start writeout asynchronously */ -+#ifdef HAVE_SYNC_FILE_RANGE - sync_file_range(outfd, stream->out_fd_offset, ret, - SYNC_FILE_RANGE_WRITE); -+#else -+ fdatasync(outfd); -+#endif - stream->out_fd_offset += ret; - } - lttng_consumer_sync_trace_file(stream, orig_offset); -Index: lttng-tools-2.0-pre15/liblttng-ustconsumer/lttng-ustconsumer.c -=================================================================== ---- lttng-tools-2.0-pre15.orig/liblttng-ustconsumer/lttng-ustconsumer.c 2012-02-01 16:37:11.495067263 +0100 -+++ lttng-tools-2.0-pre15/liblttng-ustconsumer/lttng-ustconsumer.c 2012-02-01 16:37:31.224724916 +0100 -@@ -70,8 +70,12 @@ - goto end; - } - /* This won't block, but will start writeout asynchronously */ -+#ifdef HAVE_SYNC_FILE_RANGE - sync_file_range(outfd, stream->out_fd_offset, ret, - SYNC_FILE_RANGE_WRITE); -+#else -+ fdatasync(outfd); -+#endif - stream->out_fd_offset += ret; - } - diff --git a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch new file mode 100644 index 0000000..cca083b --- /dev/null +++ b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch @@ -0,0 +1,50 @@ +Make sync_file_range() usage optional + +Under uClibc, sync_file_range() is not available under all +architectures, so we fall back to fdatasync() in this case. + +Inspired by the patch done by Thomas Petazzoni for the +2.0-pre25 version. + +Signed-off-by: Samuel Martin <s.martin49@gmail.com> +--- + configure.ac | 2 +- + src/common/compat/fcntl.h | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5808c79..065b9cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -120,7 +120,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [ + + AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ]) + +-AC_CHECK_FUNCS([sched_getcpu sysconf]) ++AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range]) + + # check for dlopen + AC_CHECK_LIB([dl], [dlopen], +diff --git a/src/common/compat/fcntl.h b/src/common/compat/fcntl.h +index 58c1579..dafb33e 100644 +--- a/src/common/compat/fcntl.h ++++ b/src/common/compat/fcntl.h +@@ -23,10 +23,15 @@ + + #ifdef __linux__ + ++#if defined(HAVE_SYNC_FILE_RANGE) + extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes, + unsigned int flags); + #define lttng_sync_file_range(fd, offset, nbytes, flags) \ + compat_sync_file_range(fd, offset, nbytes, flags) ++#else ++#define lttng_sync_file_range(fd, offset, nbytes, flags) \ ++ fdatasync(fd); ++#endif + + #elif defined(__FreeBSD__) + +-- +1.7.10 + diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index 8e6fc1a..cd9a0be 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -1,5 +1,10 @@ -LTTNG_TOOLS_VERSION = 2.0-pre15 -LTTNG_TOOLS_SITE = http://lttng.org/files/bundles/20111214/ +############################################################# +# +# LTTng-Tools: the trace control client +# +############################################################# +LTTNG_TOOLS_VERSION = 2.0.1 +LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools/ LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 # The host-lttng-babeltrace technically isn't a required build -- 1.7.10.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 3/3] lttng-tools: bump version to 2.0.1 2012-05-08 13:41 ` [Buildroot] [PATCH 3/3] lttng-tools: bump version to 2.0.1 Samuel Martin @ 2012-05-22 4:24 ` Samuel Martin 0 siblings, 0 replies; 14+ messages in thread From: Samuel Martin @ 2012-05-22 4:24 UTC (permalink / raw) To: buildroot ping? 2012/5/8 Samuel Martin <s.martin49@gmail.com>: > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> > --- > ?...ls-2.0-pre15-no-sync-file-range-in-uclibc.patch | ? 87 -------------------- > ?.../lttng-tools-no-sync-file-range-in-uclibc.patch | ? 50 +++++++++++ > ?package/lttng-tools/lttng-tools.mk ? ? ? ? ? ? ? ? | ? ?9 +- > ?3 files changed, 57 insertions(+), 89 deletions(-) > ?delete mode 100644 package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch > ?create mode 100644 package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch > > diff --git a/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch > deleted file mode 100644 > index 861686b..0000000 > --- a/package/lttng-tools/lttng-tools-2.0-pre15-no-sync-file-range-in-uclibc.patch > +++ /dev/null > @@ -1,87 +0,0 @@ > -Make sync_file_range() usage optional > - > -Under uClibc, sync_file_range() is not available under all > -architectures, so we fall back to fdatasync() in this case. > - > -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > - > -Index: lttng-tools-2.0-pre15/configure.ac > -=================================================================== > ---- lttng-tools-2.0-pre15.orig/configure.ac ? ?2012-02-01 16:31:31.140978817 +0100 > -+++ lttng-tools-2.0-pre15/configure.ac 2012-02-01 16:31:42.110783708 +0100 > -@@ -96,7 +96,7 @@ > - > - AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ]) > - > --AC_CHECK_FUNCS([sched_getcpu sysconf]) > -+AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range]) > - > - # Option to only build the consumer daemon and its libraries > - AC_ARG_WITH([consumerd-only], > -Index: lttng-tools-2.0-pre15/liblttng-consumer/lttng-consumer.c > -=================================================================== > ---- lttng-tools-2.0-pre15.orig/liblttng-consumer/lttng-consumer.c ? ? ?2012-02-01 16:36:00.876292596 +0100 > -+++ lttng-tools-2.0-pre15/liblttng-consumer/lttng-consumer.c ? 2012-02-01 16:36:23.435901163 +0100 > -@@ -527,11 +527,15 @@ > - ? ? ? if (orig_offset < stream->chan->max_sb_size) { > - ? ? ? ? ? ? ? return; > - ? ? ? } > -+#ifdef HAVE_SYNC_FILE_RANGE > - ? ? ? sync_file_range(outfd, orig_offset - stream->chan->max_sb_size, > - ? ? ? ? ? ? ? ? ? ? ? stream->chan->max_sb_size, > - ? ? ? ? ? ? ? ? ? ? ? SYNC_FILE_RANGE_WAIT_BEFORE > - ? ? ? ? ? ? ? ? ? ? ? | SYNC_FILE_RANGE_WRITE > - ? ? ? ? ? ? ? ? ? ? ? | SYNC_FILE_RANGE_WAIT_AFTER); > -+#else > -+ ? ? ?fdatasync(outfd); > -+#endif > - ? ? ? /* > - ? ? ? ?* Give hints to the kernel about how we access the file: > - ? ? ? ?* POSIX_FADV_DONTNEED : we won't re-access data in a near future after > -Index: lttng-tools-2.0-pre15/liblttng-kconsumer/lttng-kconsumer.c > -=================================================================== > ---- lttng-tools-2.0-pre15.orig/liblttng-kconsumer/lttng-kconsumer.c ? ?2012-02-01 16:36:36.215679416 +0100 > -+++ lttng-tools-2.0-pre15/liblttng-kconsumer/lttng-kconsumer.c 2012-02-01 16:59:08.622203348 +0100 > -@@ -71,8 +71,12 @@ > - ? ? ? ? ? ? ? ? ? ? ? goto end; > - ? ? ? ? ? ? ? } > - ? ? ? ? ? ? ? /* This won't block, but will start writeout asynchronously */ > -+#ifdef HAVE_SYNC_FILE_RANGE > - ? ? ? ? ? ? ? sync_file_range(outfd, stream->out_fd_offset, ret, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? SYNC_FILE_RANGE_WRITE); > -+#else > -+ ? ? ? ? ? ? ?fdatasync(outfd); > -+#endif > - ? ? ? ? ? ? ? stream->out_fd_offset += ret; > - ? ? ? } > - > -@@ -121,8 +125,12 @@ > - ? ? ? ? ? ? ? } > - ? ? ? ? ? ? ? len -= ret; > - ? ? ? ? ? ? ? /* This won't block, but will start writeout asynchronously */ > -+#ifdef HAVE_SYNC_FILE_RANGE > - ? ? ? ? ? ? ? sync_file_range(outfd, stream->out_fd_offset, ret, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? SYNC_FILE_RANGE_WRITE); > -+#else > -+ ? ? ? ? ? ? ?fdatasync(outfd); > -+#endif > - ? ? ? ? ? ? ? stream->out_fd_offset += ret; > - ? ? ? } > - ? ? ? lttng_consumer_sync_trace_file(stream, orig_offset); > -Index: lttng-tools-2.0-pre15/liblttng-ustconsumer/lttng-ustconsumer.c > -=================================================================== > ---- lttng-tools-2.0-pre15.orig/liblttng-ustconsumer/lttng-ustconsumer.c ? ? ? ?2012-02-01 16:37:11.495067263 +0100 > -+++ lttng-tools-2.0-pre15/liblttng-ustconsumer/lttng-ustconsumer.c ? ? 2012-02-01 16:37:31.224724916 +0100 > -@@ -70,8 +70,12 @@ > - ? ? ? ? ? ? ? ? ? ? ? goto end; > - ? ? ? ? ? ? ? } > - ? ? ? ? ? ? ? /* This won't block, but will start writeout asynchronously */ > -+#ifdef HAVE_SYNC_FILE_RANGE > - ? ? ? ? ? ? ? sync_file_range(outfd, stream->out_fd_offset, ret, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? SYNC_FILE_RANGE_WRITE); > -+#else > -+ ? ? ? ? ? ? ?fdatasync(outfd); > -+#endif > - ? ? ? ? ? ? ? stream->out_fd_offset += ret; > - ? ? ? } > - > diff --git a/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch > new file mode 100644 > index 0000000..cca083b > --- /dev/null > +++ b/package/lttng-tools/lttng-tools-no-sync-file-range-in-uclibc.patch > @@ -0,0 +1,50 @@ > +Make sync_file_range() usage optional > + > +Under uClibc, sync_file_range() is not available under all > +architectures, so we fall back to fdatasync() in this case. > + > +Inspired by the patch done by Thomas Petazzoni for the > +2.0-pre25 version. > + > +Signed-off-by: Samuel Martin <s.martin49@gmail.com> > +--- > + configure.ac ? ? ? ? ? ? ?| ? ?2 +- > + src/common/compat/fcntl.h | ? ?5 +++++ > + 2 files changed, 6 insertions(+), 1 deletion(-) > + > +diff --git a/configure.ac b/configure.ac > +index 5808c79..065b9cf 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -120,7 +120,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [ > + > + AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ]) > + > +-AC_CHECK_FUNCS([sched_getcpu sysconf]) > ++AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range]) > + > + # check for dlopen > + AC_CHECK_LIB([dl], [dlopen], > +diff --git a/src/common/compat/fcntl.h b/src/common/compat/fcntl.h > +index 58c1579..dafb33e 100644 > +--- a/src/common/compat/fcntl.h > ++++ b/src/common/compat/fcntl.h > +@@ -23,10 +23,15 @@ > + > + #ifdef __linux__ > + > ++#if defined(HAVE_SYNC_FILE_RANGE) > + extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes, > + ? ? ? ? ? ? ? unsigned int flags); > + #define lttng_sync_file_range(fd, offset, nbytes, flags) \ > + ? ? ? compat_sync_file_range(fd, offset, nbytes, flags) > ++#else > ++#define lttng_sync_file_range(fd, offset, nbytes, flags) \ > ++ ? ? ?fdatasync(fd); > ++#endif > + > + #elif defined(__FreeBSD__) > + > +-- > +1.7.10 > + > diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk > index 8e6fc1a..cd9a0be 100644 > --- a/package/lttng-tools/lttng-tools.mk > +++ b/package/lttng-tools/lttng-tools.mk > @@ -1,5 +1,10 @@ > -LTTNG_TOOLS_VERSION = 2.0-pre15 > -LTTNG_TOOLS_SITE ? ?= http://lttng.org/files/bundles/20111214/ > +############################################################# > +# > +# LTTng-Tools: the trace control client > +# > +############################################################# > +LTTNG_TOOLS_VERSION = 2.0.1 > +LTTNG_TOOLS_SITE ? ?= http://lttng.org/files/lttng-tools/ > ?LTTNG_TOOLS_SOURCE ?= lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 > > ?# The host-lttng-babeltrace technically isn't a required build > -- > 1.7.10.1 > ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.2 2012-05-08 13:41 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.2 Samuel Martin 2012-05-08 13:41 ` [Buildroot] [PATCH 2/3] lttng-modules: " Samuel Martin 2012-05-08 13:41 ` [Buildroot] [PATCH 3/3] lttng-tools: bump version to 2.0.1 Samuel Martin @ 2012-05-22 4:23 ` Samuel Martin 2 siblings, 0 replies; 14+ messages in thread From: Samuel Martin @ 2012-05-22 4:23 UTC (permalink / raw) To: buildroot ping? 2012/5/8 Samuel Martin <s.martin49@gmail.com>: > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> > --- > ?...t-dont-build-cxx-tests-when-not-available.patch | ? 45 ++++++++++++-------- > ?.../lttng-libust-fix-overflow-32-bits.patch ? ? ? ?| ? 26 ----------- > ?package/lttng-libust/lttng-libust.mk ? ? ? ? ? ? ? | ? 11 +++-- > ?3 files changed, 36 insertions(+), 46 deletions(-) > ?delete mode 100644 package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch > > diff --git a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch > index d7be22d..437ccca 100644 > --- a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch > +++ b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch > @@ -1,19 +1,27 @@ > -Do not build C++ example if a C++ compiler isn't available > +From 01dfa6e944d083db994f0a1165d3124bb6875437 Mon Sep 17 00:00:00 2001 > +From: Samuel Martin <s.martin49@gmail.com> > +Date: Tue, 8 May 2012 15:13:21 +0200 > +Subject: [PATCH 1/1] don't build C++ example if a C++ compiler isn't > + available > > ?By default lttng-ust builds a hello.cxx C++ example that demonstrates > -the usage of the userspace tracing library in a C++ > -program. Unfortunately, when no C++ support is available, the build > -of lttng-ust fails just because of this example code. So we make the > -compilation of this code conditional on whether a working C++ compiler > -was found. > +the usage of the userspace tracing library in a C++ program. > +Unfortunately, when no C++ support is available, the build of lttng-ust > +fails just because of this example code. So we make the compilation of > +this code conditional on whether a working C++ compiler was found. > > ?Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > +Signed-off-by: Samuel Martin <s.martin49@gmail.com> > +--- > + configure.ac ? ? ?| ? 12 ++++++++++++ > + tests/Makefile.am | ? ?6 +++++- > + 2 files changed, 17 insertions(+), 1 deletion(-) > > -Index: lttng-ust-1.9.2/configure.ac > -=================================================================== > ---- lttng-ust-1.9.2.orig/configure.ac ?2012-02-04 14:49:45.387325814 +0100 > -+++ lttng-ust-1.9.2/configure.ac ? ? ? 2012-02-04 14:50:08.156920117 +0100 > -@@ -38,6 +38,18 @@ > +diff --git a/configure.ac b/configure.ac > +index 26227cb..56d84db 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -45,6 +45,18 @@ AC_PROG_CXX > ?AC_PROG_MAKE_SET > ?LT_INIT > > @@ -32,13 +40,13 @@ Index: lttng-ust-1.9.2/configure.ac > ?## Checks for libraries. > ?AC_CHECK_LIB([dl], [dlopen]) > ?AC_CHECK_LIB([pthread], [pthread_create]) > -Index: lttng-ust-1.9.2/tests/Makefile.am > -=================================================================== > ---- lttng-ust-1.9.2.orig/tests/Makefile.am ? ? 2012-02-04 14:49:49.157258640 +0100 > -+++ lttng-ust-1.9.2/tests/Makefile.am ?2012-02-04 14:50:15.096796474 +0100 > +diff --git a/tests/Makefile.am b/tests/Makefile.am > +index e79ab7c..1a8b795 100644 > +--- a/tests/Makefile.am > ++++ b/tests/Makefile.am > ?@@ -1,6 +1,10 @@ > --SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo hello.cxx > -+SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo > +-SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo hello.cxx > ++SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo > ?#SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast > > ?+if CXX_WORKS > @@ -48,3 +56,6 @@ Index: lttng-ust-1.9.2/tests/Makefile.am > ?dist_noinst_SCRIPTS = test_loop runtests trace_matches > > ?noinst_LIBRARIES = libtap.a > +-- > +1.7.10.1 > + > diff --git a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch b/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch > deleted file mode 100644 > index c2a4dd2..0000000 > --- a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From dc190cc1f8ddccfa7b0b8323ed157afb29a0ebb7 Mon Sep 17 00:00:00 2001 > -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> > -Date: Wed, 21 Dec 2011 16:24:48 -0500 > -Subject: [PATCH] Fix clock source overflow on 32-bit archs > - > -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> > ---- > - liblttng-ust/clock.h | ? ?2 +- > - 1 files changed, 1 insertions(+), 1 deletions(-) > - > -diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h > -index b5d3e77..23294d2 100644 > ---- a/liblttng-ust/clock.h > -+++ b/liblttng-ust/clock.h > -@@ -39,7 +39,7 @@ static __inline__ uint64_t trace_clock_read64(void) > - ? ? ? struct timespec ts; > - > - ? ? ? clock_gettime(CLOCK_MONOTONIC, &ts); > -- ? ? ?return (ts.tv_sec * 1000000000) + ts.tv_nsec; > -+ ? ? ?return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec; > - } > - > - static __inline__ uint32_t trace_clock_freq_scale(void) > --- > -1.7.2.5 > - > diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk > index f54999e..81bffe9 100644 > --- a/package/lttng-libust/lttng-libust.mk > +++ b/package/lttng-libust/lttng-libust.mk > @@ -1,6 +1,11 @@ > -LTTNG_LIBUST_SITE ? ?= http://lttng.org/files/bundles/20111214/ > -LTTNG_LIBUST_VERSION = 1.9.2 > -LTTNG_LIBUST_SOURCE ?= lttng-ust-$(LTTNG_LIBUST_VERSION).tar.gz > +############################################################# > +# > +# LTTng-UST: the userspace tracing library > +# > +############################################################# > +LTTNG_LIBUST_SITE ? ?= http://lttng.org/files/lttng-ust/ > +LTTNG_LIBUST_VERSION = 2.0.2 > +LTTNG_LIBUST_SOURCE ?= lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 > > ?LTTNG_LIBUST_INSTALL_STAGING = YES > ?LTTNG_LIBUST_DEPENDENCIES ? ?= liburcu util-linux > -- > 1.7.10.1 > ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 2012-04-26 7:27 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Peter Korsgaard 2012-04-26 7:52 ` Samuel Martin @ 2012-04-26 7:59 ` Thomas Petazzoni 2012-04-26 8:01 ` Peter Korsgaard 1 sibling, 1 reply; 14+ messages in thread From: Thomas Petazzoni @ 2012-04-26 7:59 UTC (permalink / raw) To: buildroot Le Thu, 26 Apr 2012 09:27:04 +0200, Peter Korsgaard <jacmet@uclibc.org> a ?crit : > Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com> > > Thanks. On what toolchain as this been tested? > > I gave it a try with our internal toolchain as the older version has > been failing on the autobuilders, but I cannot build the new version > either: > > CCLD test_urcu_dynamic_link > test_urcu.o: In function `thr_writer': > /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/test_urcu.c:282: undefined reference to `__sync_lock_test_and_set_4' > urcu.o: In function `_uatomic_add_return': > /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:180: undefined reference to `__sync_add_and_fetch_4' > /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:180: undefined reference to `__sync_add_and_fetch_4' > urcu.o: In function `_uatomic_or': > /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:145: undefined reference to `__sync_or_and_fetch_4' > urcu.o: In function `call_rcu_data_free': You need gcc >= 4.4 to build lttng components. I guess you're using gcc 4.3 here, no? Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 2012-04-26 7:59 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Thomas Petazzoni @ 2012-04-26 8:01 ` Peter Korsgaard 0 siblings, 0 replies; 14+ messages in thread From: Peter Korsgaard @ 2012-04-26 8:01 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Hi, Thomas> You need gcc >= 4.4 to build lttng components. I guess you're Thomas> using gcc 4.3 here, no? Ahh yes, this was indeed a prebuilt 4.3 buildroot toolchain - I'll give our default toolchain a try as well. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-05-22 4:24 UTC | newest] Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-04-15 19:17 [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Samuel Martin 2012-04-15 19:17 ` [Buildroot] [PATCH 2/3] lttng-modules: " Samuel Martin 2012-04-15 19:17 ` [Buildroot] [PATCH 3/3] lttng-tools: bump version to 2.0.0 Samuel Martin 2012-04-26 7:27 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Peter Korsgaard 2012-04-26 7:52 ` Samuel Martin 2012-04-26 9:06 ` Peter Korsgaard 2012-05-08 13:41 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.2 Samuel Martin 2012-05-08 13:41 ` [Buildroot] [PATCH 2/3] lttng-modules: " Samuel Martin 2012-05-22 4:24 ` Samuel Martin 2012-05-08 13:41 ` [Buildroot] [PATCH 3/3] lttng-tools: bump version to 2.0.1 Samuel Martin 2012-05-22 4:24 ` Samuel Martin 2012-05-22 4:23 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.2 Samuel Martin 2012-04-26 7:59 ` [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.1 Thomas Petazzoni 2012-04-26 8:01 ` Peter Korsgaard
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.