diff options
| author | Dexuan Cui <dexuan.cui@intel.com> | 2011-04-20 10:29:53 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-24 22:50:26 +0100 |
| commit | b4a88a5e1c0ada5db760e52010e66f13de63adf4 (patch) | |
| tree | ef85af4a2c7b3c3b35d0e17b7f924372ec5fc1ee | |
| parent | 689009459e57e755629792e7f9e5d08ffea4eaf3 (diff) | |
| download | poky-b4a88a5e1c0ada5db760e52010e66f13de63adf4.tar.gz | |
lttng-ust: upgrade from 0.11 to the latest version 0.12
Updated LIC_FILES_CHKSUM as a new Copyright holder was added.
Removed the patch since 0.12 has integrated that.
Added arm into COMPATIBLE_HOST as 0.12 can build on arm now.
(From OE-Core rev: 43e450fcc005e44801c263de038fd5635cd426ab)
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 28 insertions, 117 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-ust-0.11/remove_ppc_specific_time_reading_function.patch b/meta/recipes-kernel/lttng/lttng-ust-0.11/remove_ppc_specific_time_reading_function.patch deleted file mode 100644 index c5487fd916..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust-0.11/remove_ppc_specific_time_reading_function.patch +++ /dev/null | |||
| @@ -1,85 +0,0 @@ | |||
| 1 | Dexuan Cui <dexuan.cui@intel.com>: I got the following patch from lttng dev | ||
| 2 | mailing list: | ||
| 3 | http://lists.casi.polymtl.ca/pipermail/ltt-dev/2011-February/003903.html | ||
| 4 | The patch looks good and I think it would be in next release. At present, | ||
| 5 | let's add it into SRC_URI. | ||
| 6 | |||
| 7 | ----------------------------------------------------------------- | ||
| 8 | The PPC version of the trace_clock_read64 was using the TB register | ||
| 9 | which is not constant accross implementations. The currently | ||
| 10 | measured time base on PPC was not accurate. | ||
| 11 | So, for now, we rely on the CLOCK_MONOTONIC. | ||
| 12 | |||
| 13 | This patch remove a bunch of #ifdef for x86 and PPC, since we now rely on | ||
| 14 | the same base clock. It also fix the build on PPC that was currently broken | ||
| 15 | |||
| 16 | Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com> | ||
| 17 | ----------------------------------------------------------------- | ||
| 18 | |||
| 19 | --- a/include/ust/clock.h | ||
| 20 | +++ b/include/ust/clock.h | ||
| 21 | @@ -39,7 +39,6 @@ | ||
| 22 | precision and monotonicity. | ||
| 23 | */ | ||
| 24 | |||
| 25 | -#if __i386__ || __x86_64__ | ||
| 26 | /* Only available for x86 arch */ | ||
| 27 | #define CLOCK_TRACE_FREQ 14 | ||
| 28 | #define CLOCK_TRACE 15 | ||
| 29 | @@ -47,36 +46,10 @@ | ||
| 30 | struct timespec ts; | ||
| 31 | u64 lttng_ts; | ||
| 32 | }; | ||
| 33 | -#endif /* __i386__ || __x86_64__ */ | ||
| 34 | |||
| 35 | extern int ust_clock_source; | ||
| 36 | |||
| 37 | /* Choosing correct trace clock */ | ||
| 38 | -#if __PPC__ | ||
| 39 | -static __inline__ u64 trace_clock_read64(void) | ||
| 40 | -{ | ||
| 41 | - unsigned long tb_l; | ||
| 42 | - unsigned long tb_h; | ||
| 43 | - unsigned long tb_h2; | ||
| 44 | - u64 tb; | ||
| 45 | - | ||
| 46 | - __asm__ ( | ||
| 47 | - "1:\n\t" | ||
| 48 | - "mftbu %[rhigh]\n\t" | ||
| 49 | - "mftb %[rlow]\n\t" | ||
| 50 | - "mftbu %[rhigh2]\n\t" | ||
| 51 | - "cmpw %[rhigh],%[rhigh2]\n\t" | ||
| 52 | - "bne 1b\n\t" | ||
| 53 | - : [rhigh] "=r" (tb_h), [rhigh2] "=r" (tb_h2), [rlow] "=r" (tb_l)); | ||
| 54 | - | ||
| 55 | - tb = tb_h; | ||
| 56 | - tb <<= 32; | ||
| 57 | - tb |= tb_l; | ||
| 58 | - | ||
| 59 | - return tb; | ||
| 60 | -} | ||
| 61 | - | ||
| 62 | -#else /* !__PPC__ */ | ||
| 63 | |||
| 64 | static __inline__ u64 trace_clock_read64(void) | ||
| 65 | { | ||
| 66 | @@ -101,17 +74,17 @@ | ||
| 67 | return retval; | ||
| 68 | } | ||
| 69 | |||
| 70 | -#endif /* __PPC__ */ | ||
| 71 | - | ||
| 72 | static __inline__ u64 trace_clock_frequency(void) | ||
| 73 | { | ||
| 74 | struct timespec ts; | ||
| 75 | union lttng_timespec *lts = (union lttng_timespec *) &ts; | ||
| 76 | |||
| 77 | +#if __i386__ || __x86_64__ | ||
| 78 | if (likely(ust_clock_source == CLOCK_TRACE)) { | ||
| 79 | clock_gettime(CLOCK_TRACE_FREQ, &ts); | ||
| 80 | return lts->lttng_ts; | ||
| 81 | } | ||
| 82 | +#endif | ||
| 83 | return 1000000000LL; | ||
| 84 | } | ||
| 85 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.11.bb b/meta/recipes-kernel/lttng/lttng-ust_0.11.bb deleted file mode 100644 index 9d2063a170..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust_0.11.bb +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | SUMMARY = "Linux Trace Toolkit Userspace Tracer" | ||
| 2 | DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code" | ||
| 3 | HOMEPAGE = "http://lttng.org/ust" | ||
| 4 | BUGTRACKER = "n/a" | ||
| 5 | |||
| 6 | LICENSE = "LGPLv2.1+ & BSD" | ||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \ | ||
| 8 | file://ustctl/ustctl.c;endline=16;md5=eceeaab8a5574f24d62f7950b9d1adf4 \ | ||
| 9 | file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44" | ||
| 10 | |||
| 11 | DEPENDS = "liburcu" | ||
| 12 | |||
| 13 | PR = "r1" | ||
| 14 | |||
| 15 | SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz \ | ||
| 16 | file://remove_ppc_specific_time_reading_function.patch \ | ||
| 17 | " | ||
| 18 | |||
| 19 | SRC_URI[md5sum] = "0a23fa60df4da3fb5188e314001eb49c" | ||
| 20 | SRC_URI[sha256sum] = "af8f699019ae260103bb401b6738d5e417e79732a509859b42a52e9a0f5edb35" | ||
| 21 | |||
| 22 | S = "${WORKDIR}/ust-${PV}" | ||
| 23 | |||
| 24 | inherit autotools | ||
| 25 | |||
| 26 | # Due to liburcu not building on ARM or MIPS currently this recipe needs to | ||
| 27 | # be limited also. | ||
| 28 | # So here let us first suppport x86/powerpc platforms now. | ||
| 29 | COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*)-linux' | ||
| 30 | |||
| 31 | |||
| 32 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.12.bb b/meta/recipes-kernel/lttng/lttng-ust_0.12.bb new file mode 100644 index 0000000000..7dadc04745 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust_0.12.bb | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | SUMMARY = "Linux Trace Toolkit Userspace Tracer" | ||
| 2 | DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code" | ||
| 3 | HOMEPAGE = "http://lttng.org/ust" | ||
| 4 | BUGTRACKER = "n/a" | ||
| 5 | |||
| 6 | LICENSE = "LGPLv2.1+ & BSD" | ||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \ | ||
| 8 | file://ustctl/ustctl.c;endline=16;md5=b50c6fa0307175bb1ce0db49d752c03b \ | ||
| 9 | file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44" | ||
| 10 | |||
| 11 | DEPENDS = "liburcu" | ||
| 12 | |||
| 13 | PR = "r0" | ||
| 14 | |||
| 15 | SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz" | ||
| 16 | |||
| 17 | SRC_URI[md5sum] = "fae6e324a56016658c5b83ec14ba0043" | ||
| 18 | SRC_URI[sha256sum] = "215b05f47d0c9e3a2934926a7d14fa9c67025db917c3a1f641df40b08314ab0c" | ||
| 19 | |||
| 20 | S = "${WORKDIR}/ust-${PV}" | ||
| 21 | |||
| 22 | inherit autotools | ||
| 23 | |||
| 24 | # Due to liburcu not building on MIPS currently this recipe needs to | ||
| 25 | # be limited also. | ||
| 26 | # So here let us first suppport x86/arm/powerpc platforms now. | ||
| 27 | COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux' | ||
| 28 | |||
