sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

oprofile: Update SRCDATE, remove merged patches 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1818 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2007-05-30 10:27:06 +00:00
parent acb45ff67a
commit 351a196c49
6 changed files with 3 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/conf/distro/poky.conf
View File

@ -97,8 +97,8 @@ SRCDATE_libfakekey ?= "20051101"
SRCDATE_xcalibrate ?= "20060312"
SRCDATE_qemu ?= "20060723"
SRCDATE_qemu-native ?= "20060723"
SRCDATE_oprofile ?= "20070524"
SRCDATE_oprofileui ?= "20070522"
SRCDATE_oprofile ?= "20070529"
SRCDATE_oprofileui ?= "20070529"
SRCDATE_zaurusd ?= "20070417"
SRCDATE_owl-video-widget ?= "20070417"
SRCDATE_psplash ?= "20070417"

102
meta/packages/oprofile/oprofile/armv6_events.patch
View File

@ -1,102 +0,0 @@
---
events/arm/armv6/events | 9 ++++++---
events/arm/armv6/unit_masks | 2 +-
libop/op_cpu_type.c | 2 +-
libop/op_cpu_type.h | 2 +-
libop/op_events.c | 5 +----
utils/ophelp.c | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
Index: oprofile/events/arm/armv6/events
===================================================================
--- oprofile.orig/events/arm/armv6/events 2007-05-23 15:02:33.000000000 +0100
+++ oprofile/events/arm/armv6/events 2007-05-24 00:33:41.000000000 +0100
@@ -1,4 +1,4 @@
-# ARM11 events
+# ARM V6 events
#
event:0x00 counters:1,2 um:zero minimum:500 name:IFU_IFETCH_MISS : number of instruction fetch misses
event:0x01 counters:1,2 um:zero minimum:500 name:CYCLES_IFU_MEM_STALL : cycles instruction fetch pipe is stalled
@@ -17,5 +17,8 @@ event:0x0f counters:1,2 um:zero minimum:
event:0x10 counters:1,2 um:zero minimum:500 name:EXP_EXTERNAL : Explict external data access
event:0x11 counters:1,2 um:zero minimum:500 name:LSU_STALL : cycles stalled because Load Store request queque is full
event:0x12 counters:1,2 um:zero minimum:500 name:WRITE_DRAIN : Times write buffer was drained
-event:0xff counters:0 um:zero minimum:500 name:CPU_CYCLES : clock cycles counter
-#
+event:0x20 counters:1,2 um:zero minimum:500 name:ETMEXTOUT0 : nuber of cycles ETMEXTOUT[0] signal was asserted
+event:0x21 counters:1,2 um:zero minimum:500 name:ETMEXTOUT1 : nuber of cycles ETMEXTOUT[1] signal was asserted
+event:0x22 counters:1,2 um:zero minimum:500 name:ETMEXTOUT_BOTH : nuber of cycles both ETMEXTOUT [0] and [1] were asserted * 2
+event:0xff counters:1,2 um:zero minimum:500 name:CPU_CYCLES2 : clock cycles counter
+event:0xfe counters:0 um:zero minimum:500 name:CPU_CYCLES : clock cycles counter
Index: oprofile/events/arm/armv6/unit_masks
===================================================================
--- oprofile.orig/events/arm/armv6/unit_masks 2007-05-23 15:02:33.000000000 +0100
+++ oprofile/events/arm/armv6/unit_masks 2007-05-23 15:28:24.000000000 +0100
@@ -1,4 +1,4 @@
-# Arm11 possible unit masks
+# ARM V6 PMU possible unit masks
#
name:zero type:mandatory default:0x00
0x00 No unit mask
Index: oprofile/libop/op_cpu_type.c
===================================================================
--- oprofile.orig/libop/op_cpu_type.c 2007-05-24 00:17:01.000000000 +0100
+++ oprofile/libop/op_cpu_type.c 2007-05-24 00:26:34.000000000 +0100
@@ -70,7 +70,7 @@ static struct cpu_descr const cpu_descrs
{ "AMD64 family10", "x86-64/family10", CPU_FAMILY10, 4 },
{ "ppc64 PA6T", "ppc64/pa6t", CPU_PPC64_PA6T, 6 },
{ "ARM MPCore", "arm/mpcore", CPU_ARM_MPCORE, 2 },
- { "ARM11 PMU", "arm/armv6", CPU_ARM_ARM11, 3 },
+ { "ARM V6 PMU", "arm/armv6", CPU_ARM_V6, 3 },
};
static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);
Index: oprofile/libop/op_cpu_type.h
===================================================================
--- oprofile.orig/libop/op_cpu_type.h 2007-05-24 00:17:01.000000000 +0100
+++ oprofile/libop/op_cpu_type.h 2007-05-24 00:26:50.000000000 +0100
@@ -68,7 +68,7 @@ typedef enum {
CPU_FAMILY10, /**< AMD family 10 */
CPU_PPC64_PA6T, /**< ppc64 PA6T */
CPU_ARM_MPCORE, /**< ARM MPCore */
- CPU_ARM_ARM11, /**< ARM11 */
+ CPU_ARM_V6, /**< ARM V6 */
MAX_CPU_TYPE
} op_cpu;
Index: oprofile/libop/op_events.c
===================================================================
--- oprofile.orig/libop/op_events.c 2007-05-24 00:17:01.000000000 +0100
+++ oprofile/libop/op_events.c 2007-05-24 00:27:49.000000000 +0100
@@ -786,6 +786,7 @@ void op_default_event(op_cpu cpu_type, s
case CPU_ARM_XSCALE1:
case CPU_ARM_XSCALE2:
case CPU_ARM_MPCORE:
+ case CPU_ARM_V6:
descr->name = "CPU_CYCLES";
break;
@@ -842,10 +843,6 @@ void op_default_event(op_cpu cpu_type, s
descr->name = "CPU_CLK";
break;
- case CPU_ARM_ARM11:
- descr->name = "CPU_CYCLES";
- break;
-
// don't use default, if someone add a cpu he wants a compiler
// warning if he forgets to handle it here.
case CPU_TIMER_INT:
Index: oprofile/utils/ophelp.c
===================================================================
--- oprofile.orig/utils/ophelp.c 2007-05-24 00:17:12.000000000 +0100
+++ oprofile/utils/ophelp.c 2007-05-24 00:26:08.000000000 +0100
@@ -429,7 +429,7 @@ int main(int argc, char const * argv[])
"Page 3-70, performance counters\n");
break;
- case CPU_ARM_ARM11:
+ case CPU_ARM_V6:
printf("See ARM11 Technical Reference Manual\n");
break;

52
meta/packages/oprofile/oprofile/oparchive-debug-dir.patch
View File

@ -1,52 +0,0 @@
Index: oprofile/pp/oparchive.cpp
===================================================================
--- oprofile.orig/pp/oparchive.cpp
+++ oprofile/pp/oparchive.cpp
@@ -84,9 +84,10 @@ int oparchive(options::spec const & spec
exe_archive_file);
/* If there are any debuginfo files, copy them over.
- * Need to copy the debug info file in the same
- * directory as the executable. The /usr/lib/debug
- * search path is not going to work.
+ * Need to copy the debug info file to somewhere we'll
+ * find it - executable location + "/.debug"
+ * to avoid overwriting files with the same name. The
+ * /usr/lib/debug search path is not going to work.
*/
bfd * ibfd = open_bfd(exe_name);
if (ibfd) {
@@ -97,8 +98,15 @@ int oparchive(options::spec const & spec
if (find_separate_debug_file(ibfd, dirname, global,
debug_filename)) {
/* found something copy it over */
- string dest_debug = options::outdirectory +
- dirname + "/" +
+ string dest_debug_dir = options::outdirectory +
+ dirname + "/.debug/";
+ if (create_dir(dest_debug_dir.c_str())) {
+ cerr << "Unable to create directory: "
+ << dest_debug_dir << "." << endl;
+ exit (EXIT_FAILURE);
+ }
+
+ string dest_debug = dest_debug_dir +
op_basename(debug_filename);
copy_one_file(image_ok, debug_filename, dest_debug);
}
Index: oprofile/ChangeLog
===================================================================
--- oprofile.orig/ChangeLog
+++ oprofile/ChangeLog
@@ -1,5 +1,11 @@
2007-05-09 Richard Purdie <rpurdie@openedhand.com>
+ * oprofile/pp/oparchive.cpp: If the debug files have the same name
+ as the original binary, the binary gets overwritten. Add in a .debug
+ directory to avoid this.
+
+2007-05-09 Richard Purdie <rpurdie@openedhand.com>
+
* oprofile/daemon/opd_cookie.c: Fix syscall for ARM EABI
2007-04-25 Manoj Ekbote <manoj.ekbote@broadcom.com>

131
meta/packages/oprofile/oprofile/oparchive-list-files.patch
View File

@ -1,131 +0,0 @@
Index: oprofile/pp/oparchive.cpp
===================================================================
--- oprofile.orig/pp/oparchive.cpp
+++ oprofile/pp/oparchive.cpp
@@ -35,6 +35,11 @@ namespace {
void copy_one_file(image_error err, string const & source, string const & dest)
{
+ if (options::list_files) {
+ cout << source << endl;
+ return;
+ }
+
if (!copy_file(source, dest) && err == image_ok) {
cerr << "can't copy from " << source << " to " << dest
<< " cause: " << strerror(errno) << endl;
@@ -46,7 +51,7 @@ int oparchive(options::spec const & spec
handle_options(spec);
/* Check to see if directory can be created */
- if (create_path(options::outdirectory.c_str())) {
+ if (!options::list_files && create_path(options::outdirectory.c_str())) {
cerr << "Unable to create directory for "
<< options::outdirectory << "." << endl;
exit (EXIT_FAILURE);
@@ -73,7 +78,8 @@ int oparchive(options::spec const & spec
cverb << vdebug << exe_name << endl;
/* Create directory for executable file. */
- if (create_path(exe_archive_file.c_str())) {
+ if (!options::list_files
+ && create_path(exe_archive_file.c_str())) {
cerr << "Unable to create directory for "
<< exe_archive_file << "." << endl;
exit (EXIT_FAILURE);
@@ -100,7 +106,8 @@ int oparchive(options::spec const & spec
/* found something copy it over */
string dest_debug_dir = options::outdirectory +
dirname + "/.debug/";
- if (create_dir(dest_debug_dir.c_str())) {
+ if (!options::list_files
+ && create_dir(dest_debug_dir.c_str())) {
cerr << "Unable to create directory: "
<< dest_debug_dir << "." << endl;
exit (EXIT_FAILURE);
@@ -130,7 +137,8 @@ int oparchive(options::spec const & spec
cverb << vdebug << (sample_name) << endl;
cverb << vdebug << " destp " << sample_archive_file << endl;
- if (create_path(sample_archive_file.c_str())) {
+ if (!options::list_files
+ && create_path(sample_archive_file.c_str())) {
cerr << "Unable to create directory for "
<< sample_archive_file << "." << endl;
exit (EXIT_FAILURE);
Index: oprofile/pp/oparchive_options.cpp
===================================================================
--- oprofile.orig/pp/oparchive_options.cpp
+++ oprofile/pp/oparchive_options.cpp
@@ -36,6 +36,7 @@ namespace options {
bool exclude_dependent;
merge_option merge_by;
string outdirectory;
+ bool list_files;
}
@@ -47,7 +48,9 @@ popt::option options_array[] = {
popt::option(options::outdirectory, "output-directory", 'o',
"output to the given directory", "directory"),
popt::option(options::exclude_dependent, "exclude-dependent", 'x',
- "exclude libs, kernel, and module samples for applications")
+ "exclude libs, kernel, and module samples for applications"),
+ popt::option(options::list_files, "list-files", 'l',
+ "just list the files necessary, don't produce the archive")
};
@@ -60,7 +63,7 @@ void check_options()
using namespace options;
/* output directory is required */
- if (outdirectory.size() == 0) {
+ if (outdirectory.size() == 0 && !list_files) {
cerr << "Requires --output-directory option." << endl;
exit(EXIT_FAILURE);
}
Index: oprofile/pp/oparchive_options.h
===================================================================
--- oprofile.orig/pp/oparchive_options.h
+++ oprofile/pp/oparchive_options.h
@@ -22,6 +22,7 @@ namespace options {
extern bool exclude_dependent;
extern merge_option merge_by;
extern std::string outdirectory;
+ extern bool list_files;
}
/// All the chosen sample files.
Index: oprofile/ChangeLog
===================================================================
--- oprofile.orig/ChangeLog
+++ oprofile/ChangeLog
@@ -1,5 +1,12 @@
2007-05-09 Richard Purdie <rpurdie@openedhand.com>
+ * oparchive.cpp:
+ * oparchive_options.cpp:
+ * oparchive_options.h: Add --list-files option to list all files that
+ would be handled by oparchive.
+
+2007-05-09 Richard Purdie <rpurdie@openedhand.com>
+
* oprofile/pp/oparchive.cpp: If the debug files have the same name
as the original binary, the binary gets overwritten. Add in a .debug
directory to avoid this.
Index: oprofile/doc/oparchive.1.in
===================================================================
--- oprofile.orig/doc/oparchive.1.in
+++ oprofile/doc/oparchive.1.in
@@ -50,6 +50,10 @@ Output to the given directory. There is
Do not include application-specific images for libraries, kernel modules
and the kernel. This option only makes sense if the profile session
used --separate.
+.br
+.TP
+.BI "--list-files / -l"
+Only list the files that would be archived, don't copy them.
.SH ENVIRONMENT
No special environment variables are recognised by oparchive.

39
meta/packages/oprofile/oprofile/xscale_events.patch
View File

@ -1,39 +0,0 @@
---
events/arm/xscale1/events | 8 ++++++--
events/arm/xscale2/events | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
Index: oprofile/events/arm/xscale1/events
===================================================================
--- oprofile.orig/events/arm/xscale1/events 2004-04-06 05:32:22.000000000 +0100
+++ oprofile/events/arm/xscale1/events 2007-05-23 13:37:04.000000000 +0100
@@ -14,6 +14,10 @@ event:0x0a counters:1,2 um:zero minimum:
event:0x0b counters:1,2 um:zero minimum:500 name:DCACHE_MISS : data cache miss
event:0x0c counters:1,2 um:zero minimum:500 name:DCACHE_WB : data cache writeback, 1 event for every half cacheline
event:0x0d counters:1,2 um:zero minimum:500 name:PC_CHANGE : number of times the program counter was changed without a mode switch
+event:0x10 counters:1,2 um:zero minimum:500 name:BCU_REQUEST : number of time the BCU received a new memory request from the core
+event:0x11 counters:1,2 um:zero minimum:500 name:BCU_FULL : number of cycles the BCUs request queue is full
+event:0x12 counters:1,2 um:zero minimum:500 name:BCU_DRAIN : number of times the BCU queues were drained due to a Drain Write Buffer command or an I/O transaction on a non-cacheable and non-bufferable page
+event:0x14 counters:1,2 um:zero minimum:500 name:BCU_ECC_NO_ELOG : number of times the BCU detected an ECC error, but no ELOG register was available in which to log the error
+event:0x15 counters:1,2 um:zero minimum:500 name:BCU_1_BIT_ERR : number of times the BCU detected a 1-bit error while reading data from the bus
+event:0x16 counters:1,2 um:zero minimum:500 name:RMW : number of times an RMW cycle occurred due to narrow write on ECC-protected memory
event:0xfe counters:0 um:zero minimum:500 name:CPU_CYCLES : clock cycles counter
-#0x10 through 0x17 Defined by ASSP. See the Intel® XScale" core implementation option section of the ASSP
-#architecture specification for more details.
Index: oprofile/events/arm/xscale2/events
===================================================================
--- oprofile.orig/events/arm/xscale2/events 2004-04-06 05:32:23.000000000 +0100
+++ oprofile/events/arm/xscale2/events 2007-05-23 13:37:34.000000000 +0100
@@ -14,6 +14,10 @@ event:0x0a counters:1,2,3,4 um:zero mini
event:0x0b counters:1,2,3,4 um:zero minimum:500 name:DCACHE_MISS : data cache miss
event:0x0c counters:1,2,3,4 um:zero minimum:500 name:DCACHE_WB : data cache writeback, 1 event for every half cacheline
event:0x0d counters:1,2,3,4 um:zero minimum:500 name:PC_CHANGE : number of times the program counter was changed without a mode switch
+event:0x10 counters:1,2,3,4 um:zero minimum:500 name:BCU_REQUEST : number of time the BCU received a new memory request from the core
+event:0x11 counters:1,2,3,4 um:zero minimum:500 name:BCU_FULL : number of cycles the BCUs request queue is full
+event:0x12 counters:1,2,3,4 um:zero minimum:500 name:BCU_DRAIN : number of times the BCU queues were drained due to a Drain Write Buffer command or an I/O transaction on a non-cacheable and non-bufferable page
+event:0x14 counters:1,2,3,4 um:zero minimum:500 name:BCU_ECC_NO_ELOG : number of times the BCU detected an ECC error, but no ELOG register was available in which to log the error
+event:0x15 counters:1,2,3,4 um:zero minimum:500 name:BCU_1_BIT_ERR : number of times the BCU detected a 1-bit error while reading data from the bus
+event:0x16 counters:1,2,3,4 um:zero minimum:500 name:RMW : number of times an RMW cycle occurred due to narrow write on ECC-protected memory
event:0xfe counters:0 um:zero minimum:500 name:CPU_CYCLES : clock cycles counter
-#0x10 through 0x17 Defined by ASSP. See the Intel® XScale" core implementation option section of the ASSP
-#architecture specification for more details.

5
meta/packages/oprofile/oprofile_cvs.bb
View File

@ -1,5 +1,5 @@
PV = "0.9.2+cvs${SRCDATE}"
PR = "r6"
PR = "r0"
SECTION = "devel"
DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
of profiling all running code at low overhead."
@ -7,9 +7,6 @@ LICENSE = "GPL"
DEPENDS = "popt binutils"
SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
file://oparchive-debug-dir.patch;patch=1 \
file://armv6_events.patch;patch=1 \
file://xscale_events.patch;patch=1 \
file://acinclude.m4"
S = "${WORKDIR}/oprofile"