Skip to contentSkip to conversation

perf tools: Fix perf version generation

PATCH In review Robert Richter 5 participants 7 messages May 8, 2013 – Jul 12, 2013 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf tools: Fix perf version generation

From: Robert Richter <[email protected]>

The tag of the perf version is wrongly determined, always the latest tag is taken regardless of the HEAD commit:

 $ perf --version
 perf version 3.9.rc8.gd7f5d3
 $ git describe d7f5d3
 v3.9-rc7-154-gd7f5d33
 $ head -n 4 Makefile
 VERSION = 3
 PATCHLEVEL = 9
 SUBLEVEL = 0
 EXTRAVERSION = -rc7

In other cases no tag might be found.

This patch fixes this.

This new implementation handles also the case if there are no tags at all found in the git repo but there is a commit id.

---
 tools/perf/util/PERF-VERSION-GEN | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
tools/perf/util/PERF-VERSION-GEN +15 -6
index 055fef3..15a77b7 100755
@@ -13,13 +13,22 @@ LF='
 # First check if there is a .git to get the version from git describe
 # otherwise try to get the version from the kernel Makefile
 #
-if test -d ../../.git -o -f ../../.git &&
-	VN=$(git tag 2>/dev/null | tail -1 | grep -E "v[0-9].[0-9]*")
+CID=
+TAG=
+if test -d ../../.git -o -f ../../.git
 then
-	VN=$(echo $VN"-g"$(git log -1 --abbrev=4 --pretty=format:"%h" HEAD))
-	VN=$(echo "$VN" | sed -e 's/-/./g');
-else
-	VN=$(MAKEFLAGS= make -sC ../.. kernelversion)
+	TAG=$(git describe --abbrev=0 --match "v[0-9].[0-9]*" 2>/dev/null )
+	CID=$(git log -1 --abbrev=4 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID"
+fi
+if test -z "$TAG"
+then
+	TAG=$(MAKEFLAGS= make -sC ../.. kernelversion)
+fi
+VN="$TAG$CID"
+if test -n "$CID"
+then
+	# format version string, strip trailing zero of sublevel:
+	VN=$(echo "$VN" | sed -e 's/-/./g;s/\([0-9]*[.][0-9]*\)[.]0/\1/')
 fi
 
 VN=$(expr "$VN" : v*'\(.*\)')
Signature · 1 line
1.8.1.1
#1 lore raw
Quoted 15 lines · Robert Richter

From: Robert Richter <[email protected]>

The tag of the perf version is wrongly determined, always the latest tag is taken regardless of the HEAD commit:

 $ perf --version
 perf version 3.9.rc8.gd7f5d3
 $ git describe d7f5d3
 v3.9-rc7-154-gd7f5d33
 $ head -n 4 Makefile
 VERSION = 3
 PATCHLEVEL = 9
 SUBLEVEL = 0
 EXTRAVERSION = -rc7
Quoted 6 lines

In other cases no tag might be found.

This patch fixes this.

This new implementation handles also the case if there are no tags at all found in the git repo but there is a commit id.

I remember that Wang has posted a similar patch to fix this bug several weeks ago:

	http://lkml.org/lkml/2013/4/24/70

But have no response yet.

#2 lore raw
Quoted 5 lines · Xiao Guangrong

I remember that Wang has posted a similar patch to fix this bug several weeks ago:

	http://lkml.org/lkml/2013/4/24/70

But have no response yet.

Yes, this patch would fix the version tag too.

The patch I wrote also reports a commit id even in the case when no tag is found. This was the original reason why I stumbled over this. Assume a repository for testing there you just push the commit id to. This does not contain any tags but a valid commit id. Now, it determines the version tag from the makefile but does not drop the commit id.

-Robert

#3 lore raw
Quoted 1 line · Robert Richter

On 08.05.13 18:39:07, Xiao Guangrong wrote:

I remember that Wang has posted a similar patch to fix this bug several

Quoted 1 line
Quoted 1 line

weeks ago:

http://lkml.org/lkml/2013/4/24/70

Quoted 5 lines
Quoted 2 lines

But have no response yet.

Yes, this patch would fix the version tag too.

Quoted 9 lines

The patch I wrote also reports a commit id even in the case when no tag is found. This was the original reason why I stumbled over this. Assume a repository for testing there you just push the commit id to. This does not contain any tags but a valid commit id. Now, it determines the version tag from the makefile but does not drop the commit id.

-Robert

Hi, Robert,

for http://lkml.org/lkml/2013/4/24/70
I download linux-3.9.1.tar.xz(no git repo) and apply my patch, it works:

# ./perf --version
perf version 3.9.1

your patch works when the repo only has commit info but no tags info, but I confuse that whether this situation is Real?

Maybe you prepare for a RARE case but increase the code's **Complexity** ?

thanks

#4 lore raw
Quoted 7 lines · Runzhen Wang
# ./perf --version
perf version 3.9.1

your patch works when the repo only has commit info but no tags info, but I confuse that whether this situation is Real?

Maybe you prepare for a RARE case but increase the code's **Complexity** ?

It works in both cases. And the complexity is also handled for kernel versioning, see scripts/setlocalversion:

# If we don't have a tag at all we print -g{commitish}.

I also considered to reuse scripts/setlocalversion, but it turned out to require too much changes for perf version generation.

-Robert

#5 lore raw
In reply to Robert Richter

Hey acme,

is this one in some queue already?

I just saw the same problem on 3.10 because git-tag sorts the output alphanumerically so that all tags starting with "v3.10" do not appear last and thus the "tail -1" doesn't work anymore.

So on 3.10 you end up with perf version 3.9.rc8.g8bb495.

Quoted 69 lines · Robert Richter

From: Robert Richter <[email protected]>

The tag of the perf version is wrongly determined, always the latest tag is taken regardless of the HEAD commit:

 $ perf --version
 perf version 3.9.rc8.gd7f5d3
 $ git describe d7f5d3
 v3.9-rc7-154-gd7f5d33
 $ head -n 4 Makefile
 VERSION = 3
 PATCHLEVEL = 9
 SUBLEVEL = 0
 EXTRAVERSION = -rc7

In other cases no tag might be found.

This patch fixes this.

This new implementation handles also the case if there are no tags at all found in the git repo but there is a commit id.

---
 tools/perf/util/PERF-VERSION-GEN | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
tools/perf/util/PERF-VERSION-GEN +15 -6
index 055fef3..15a77b7 100755
@@ -13,13 +13,22 @@ LF='
 # First check if there is a .git to get the version from git describe
 # otherwise try to get the version from the kernel Makefile
 #
-if test -d ../../.git -o -f ../../.git &&
-	VN=$(git tag 2>/dev/null | tail -1 | grep -E "v[0-9].[0-9]*")
+CID=
+TAG=
+if test -d ../../.git -o -f ../../.git
 then
-	VN=$(echo $VN"-g"$(git log -1 --abbrev=4 --pretty=format:"%h" HEAD))
-	VN=$(echo "$VN" | sed -e 's/-/./g');
-else
-	VN=$(MAKEFLAGS= make -sC ../.. kernelversion)
+	TAG=$(git describe --abbrev=0 --match "v[0-9].[0-9]*" 2>/dev/null )
+	CID=$(git log -1 --abbrev=4 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID"
+fi
+if test -z "$TAG"
+then
+	TAG=$(MAKEFLAGS= make -sC ../.. kernelversion)
+fi
+VN="$TAG$CID"
+if test -n "$CID"
+then
+	# format version string, strip trailing zero of sublevel:
+	VN=$(echo "$VN" | sed -e 's/-/./g;s/\([0-9]*[.][0-9]*\)[.]0/\1/')
 fi
 
 VN=$(expr "$VN" : v*'\(.*\)')
Signature · 7 lines
1.8.1.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Signature · 5 lines
Regards/Gruss,
    Boris.

Sent from a fat crate under my desk. Formatting is fine.
--
#6 lore raw
In reply to Robert Richter
perf tools: Fix perf version generation
Commit-ID:  a4147f0f91386540316e468f3a3674a498dada5f
Gitweb:     http://git.kernel.org/tip/a4147f0f91386540316e468f3a3674a498dada5f
Author:     Robert Richter <[email protected]>
AuthorDate: Wed, 8 May 2013 11:43:34 +0200
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 8 Jul 2013 18:09:52 -0300

perf tools: Fix perf version generation

The tag of the perf version is wrongly determined, always the latest tag is taken regardless of the HEAD commit:

 $ perf --version
 perf version 3.9.rc8.gd7f5d3
 $ git describe d7f5d3
 v3.9-rc7-154-gd7f5d33
 $ head -n 4 Makefile
 VERSION = 3
 PATCHLEVEL = 9
 SUBLEVEL = 0
 EXTRAVERSION = -rc7

In other cases no tag might be found.

This patch fixes this.

This new implementation handles also the case if there are no tags at all found in the git repo but there is a commit id.

---
 tools/perf/util/PERF-VERSION-GEN | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
tools/perf/util/PERF-VERSION-GEN +15 -6
index 055fef3..15a77b7 100755
@@ -13,13 +13,22 @@ LF='
 # First check if there is a .git to get the version from git describe
 # otherwise try to get the version from the kernel Makefile
 #
-if test -d ../../.git -o -f ../../.git &&
-	VN=$(git tag 2>/dev/null | tail -1 | grep -E "v[0-9].[0-9]*")
+CID=
+TAG=
+if test -d ../../.git -o -f ../../.git
 then
-	VN=$(echo $VN"-g"$(git log -1 --abbrev=4 --pretty=format:"%h" HEAD))
-	VN=$(echo "$VN" | sed -e 's/-/./g');
-else
-	VN=$(MAKEFLAGS= make -sC ../.. kernelversion)
+	TAG=$(git describe --abbrev=0 --match "v[0-9].[0-9]*" 2>/dev/null )
+	CID=$(git log -1 --abbrev=4 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID"
+fi
+if test -z "$TAG"
+then
+	TAG=$(MAKEFLAGS= make -sC ../.. kernelversion)
+fi
+VN="$TAG$CID"
+if test -n "$CID"
+then
+	# format version string, strip trailing zero of sublevel:
+	VN=$(echo "$VN" | sed -e 's/-/./g;s/\([0-9]*[.][0-9]*\)[.]0/\1/')
 fi
 
 VN=$(expr "$VN" : v*'\(.*\)')