rpms/eclipse-valgrind/devel eclipse-valgrind-massif-unknown-symbols.patch, NONE, 1.1 eclipse-valgrind.spec, 1.12, 1.13

[Elliott Baron]

Author: ebaron

Update of /cvs/pkgs/rpms/eclipse-valgrind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17026

Modified Files:
	eclipse-valgrind.spec 
Added Files:
	eclipse-valgrind-massif-unknown-symbols.patch 
Log Message:
* Thu Jul 2 2009 Elliott Baron <ebaron at redhat.com> 0.2.1-2
- Fix Massif parsing for unknown symbols (Eclipse#281417).


eclipse-valgrind-massif-unknown-symbols.patch:

--- NEW FILE eclipse-valgrind-massif-unknown-symbols.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.linuxtools.valgrind.massif
Index: src/org/eclipse/linuxtools/valgrind/massif/MassifParser.java
===================================================================
--- src/org/eclipse/linuxtools/valgrind/massif/MassifParser.java	(revision 22424)
+++ src/org/eclipse/linuxtools/valgrind/massif/MassifParser.java	(working copy)
@@ -188,14 +188,14 @@
 		int ix = line.lastIndexOf("("); //$NON-NLS-1$
 		if (ix >= 0) {
 			function = line.substring(line.indexOf(start), ix);
-			if (function != null) {
-				function = function.trim();
-			}
-			else {
-				fail(line);
-			}
 		}
 		else {
+			function = line.substring(line.indexOf(start));
+		}
+		if (function != null) {
+			function = function.trim();
+		}
+		else {
 			fail(line);
 		}
 		
Index: src/org/eclipse/linuxtools/valgrind/massif/MassifHeapTreeNode.java
===================================================================
--- src/org/eclipse/linuxtools/valgrind/massif/MassifHeapTreeNode.java	(revision 22424)
+++ src/org/eclipse/linuxtools/valgrind/massif/MassifHeapTreeNode.java	(working copy)
@@ -30,13 +30,18 @@
 		
 		StringBuffer nodeText = new StringBuffer();
 		formatBytes(percent, bytes, nodeText);
-		nodeText.append(address).append(": "); //$NON-NLS-1$
-		nodeText.append(function).append(" "); //$NON-NLS-1$
-		nodeText.append("(").append(filename); //$NON-NLS-1$
-		if (line > 0) {
-			nodeText.append(":").append(line);//$NON-NLS-1$
+		nodeText.append(address).append(":"); //$NON-NLS-1$
+		if (function.length() > 0) {
+			nodeText.append(" "); //$NON-NLS-1$
+			nodeText.append(function);
 		}
-		nodeText.append(")"); //$NON-NLS-1$
+		if (filename != null) {
+			nodeText.append(" (").append(filename); //$NON-NLS-1$
+			if (line > 0) {
+				nodeText.append(":").append(line);//$NON-NLS-1$
+			}
+			nodeText.append(")"); //$NON-NLS-1$
+		}
 		this.percent = percent;
 		this.bytes = bytes;
 		this.address = address;


Index: eclipse-valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-valgrind/devel/eclipse-valgrind.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- eclipse-valgrind.spec	8 Jun 2009 14:51:41 -0000	1.12
+++ eclipse-valgrind.spec	2 Jul 2009 20:34:50 -0000	1.13
@@ -8,7 +8,7 @@
 
 Name:           eclipse-valgrind
 Version:        0.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Valgrind Tools Integration for Eclipse
 
 Group:          Development/Tools
@@ -16,6 +16,7 @@ License:        EPL
 URL:            http://www.eclipse.org/linuxtools/projectPages/valgrind
 Source0:        %{name}-fetched-src-%{src_repo_tag}.tar.bz2
 Source1:        %{name}-fetch-src.sh
+Patch0:         %{name}-massif-unknown-symbols.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #No CDT on ppc64
@@ -39,6 +40,10 @@ projects using the Valgrind tool suite a
 %prep
 %setup -q -n %{name}-fetched-src-%{src_repo_tag}
 
+pushd org.eclipse.linuxtools.valgrind.massif
+%patch0
+popd
+
 %build
 %{eclipse_base}/buildscripts/pdebuild \
     -f org.eclipse.linuxtools.valgrind.feature \
@@ -61,6 +66,9 @@ install -d -m 755 %{buildroot}%{install_
 %doc org.eclipse.linuxtools.valgrind-feature/epl-v10.html
 
 %changelog
+* Thu Jul 2 2009 Elliott Baron <ebaron at redhat.com> 0.2.1-2
+- Fix Massif parsing for unknown symbols (Eclipse#281417).
+
 * Mon Jun 8 2009 Elliott Baron <ebaron at redhat.com> 0.2.1-1
 - Upstream 0.2.1 release.