Hello community, here is the log from the commit of package numatop for openSUSE:Factory checked in at 2015-03-09 10:10:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/numatop (Old) and /work/SRC/openSUSE:Factory/.numatop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "numatop" Changes: -------- --- /work/SRC/openSUSE:Factory/numatop/numatop.changes 2013-08-19 10:50:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.numatop.new/numatop.changes 2015-03-09 10:10:08.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 6 16:35:30 UTC 2015 - p.drou...@gmail.com + +- Update to version 1.0.3 + * Add Haswell supporting + +------------------------------------------------------------------- Old: ---- numatop_linux_1.0.1.tar.gz New: ---- numatop_linux_1.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ numatop.spec ++++++ --- /var/tmp/diff_new_pack.EZX4zU/_old 2015-03-09 10:10:09.000000000 +0100 +++ /var/tmp/diff_new_pack.EZX4zU/_new 2015-03-09 10:10:09.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package numatop # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: numatop -Version: 1.0.1 +Version: 1.0.3 Release: 0 Summary: A top-like tool for runtime memory locality monitoring on NUMA systems License: BSD-3-Clause Group: System/Monitoring Url: https://01.org/numatop -Source0: https://01.org/sites/default/files/downloads/%{name}_linux_%{version}.tar.gz +Source0: https://01.org/sites/default/files/%{name}_linux_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libnuma-devel BuildRequires: ncurses-devel ++++++ numatop_linux_1.0.1.tar.gz -> numatop_linux_1.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/HEAD new/numatop/.git/HEAD --- old/numatop/.git/HEAD 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/.git/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ref: refs/heads/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/config new/numatop/.git/config --- old/numatop/.git/config 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/.git/config 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - url = g...@github.com:01org/numatop.git - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/description new/numatop/.git/description --- old/numatop/.git/description 2013-05-20 04:52:38.000000000 +0200 +++ new/numatop/.git/description 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/hooks/applypatch-msg.sample new/numatop/.git/hooks/applypatch-msg.sample --- old/numatop/.git/hooks/applypatch-msg.sample 2013-05-20 04:52:38.000000000 +0200 +++ new/numatop/.git/hooks/applypatch-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/hooks/commit-msg.sample new/numatop/.git/hooks/commit-msg.sample --- old/numatop/.git/hooks/commit-msg.sample 2013-05-20 04:52:38.000000000 +0200 +++ new/numatop/.git/hooks/commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/hooks/post-update.sample new/numatop/.git/hooks/post-update.sample --- old/numatop/.git/hooks/post-update.sample 2013-05-20 04:52:38.000000000 +0200 +++ new/numatop/.git/hooks/post-update.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/hooks/pre-applypatch.sample new/numatop/.git/hooks/pre-applypatch.sample --- old/numatop/.git/hooks/pre-applypatch.sample 2013-05-20 04:52:38.000000000 +0200 +++ new/numatop/.git/hooks/pre-applypatch.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/hooks/pre-commit.sample new/numatop/.git/hooks/pre-commit.sample --- old/numatop/.git/hooks/pre-commit.sample 2013-05-20 04:52:38.000000000 +0200 +++ new/numatop/.git/hooks/pre-commit.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -fi - -# If you want to allow non-ascii filenames set this variable to true. -allownonascii=$(git config hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ascii filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - echo "Error: Attempt to add a non-ascii file name." - echo - echo "This can cause problems if you want to work" - echo "with people on other platforms." - echo - echo "To be portable it is advisable to rename the file ..." - echo - echo "If you know what you are doing you can disable this" - echo "check using:" - echo - echo " git config hooks.allownonascii true" - echo - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/hooks/pre-rebase.sample new/numatop/.git/hooks/pre-rebase.sample --- old/numatop/.git/hooks/pre-rebase.sample 2013-05-20 04:52:38.000000000 +0200 +++ new/numatop/.git/hooks/pre-rebase.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up-to-date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -exit 0 - -################################################################ - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/hooks/prepare-commit-msg.sample new/numatop/.git/hooks/prepare-commit-msg.sample --- old/numatop/.git/hooks/prepare-commit-msg.sample 2013-05-20 04:52:38.000000000 +0200 +++ new/numatop/.git/hooks/prepare-commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first comments out the -# "Conflicts:" part of a merge commit. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -case "$2,$3" in - merge,) - /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; - -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$1" ;; - - *) ;; -esac - -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/hooks/update.sample new/numatop/.git/hooks/update.sample --- old/numatop/.git/hooks/update.sample 2013-05-20 04:52:38.000000000 +0200 +++ new/numatop/.git/hooks/update.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to blocks unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 <ref> <oldrev> <newrev>)" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "Usage: $0 <ref> <oldrev> <newrev>" >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 Files old/numatop/.git/index and new/numatop/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/info/exclude new/numatop/.git/info/exclude --- old/numatop/.git/info/exclude 2013-05-20 04:52:38.000000000 +0200 +++ new/numatop/.git/info/exclude 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/logs/HEAD new/numatop/.git/logs/HEAD --- old/numatop/.git/logs/HEAD 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 972a9d009af472fccd9faad675917bcd9ee45742 Jin Yao <yao....@intel.com> 1369018363 +0800 clone: from g...@github.com:01org/numatop.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/logs/refs/heads/master new/numatop/.git/logs/refs/heads/master --- old/numatop/.git/logs/refs/heads/master 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/.git/logs/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 972a9d009af472fccd9faad675917bcd9ee45742 Jin Yao <yao....@intel.com> 1369018363 +0800 clone: from g...@github.com:01org/numatop.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/logs/refs/remotes/origin/HEAD new/numatop/.git/logs/refs/remotes/origin/HEAD --- old/numatop/.git/logs/refs/remotes/origin/HEAD 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/.git/logs/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 972a9d009af472fccd9faad675917bcd9ee45742 Jin Yao <yao....@intel.com> 1369018363 +0800 clone: from g...@github.com:01org/numatop.git Files old/numatop/.git/objects/pack/pack-fb6e8a9d786a292389c79e87334919da0f356fe9.idx and new/numatop/.git/objects/pack/pack-fb6e8a9d786a292389c79e87334919da0f356fe9.idx differ Files old/numatop/.git/objects/pack/pack-fb6e8a9d786a292389c79e87334919da0f356fe9.pack and new/numatop/.git/objects/pack/pack-fb6e8a9d786a292389c79e87334919da0f356fe9.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/packed-refs new/numatop/.git/packed-refs --- old/numatop/.git/packed-refs 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# pack-refs with: peeled -972a9d009af472fccd9faad675917bcd9ee45742 refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/refs/heads/master new/numatop/.git/refs/heads/master --- old/numatop/.git/refs/heads/master 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/.git/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -972a9d009af472fccd9faad675917bcd9ee45742 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/.git/refs/remotes/origin/HEAD new/numatop/.git/refs/remotes/origin/HEAD --- old/numatop/.git/refs/remotes/origin/HEAD 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/.git/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/Makefile new/numatop/Makefile --- old/numatop/Makefile 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/Makefile 2014-07-01 02:40:53.000000000 +0200 @@ -5,6 +5,7 @@ CC = gcc LD = gcc CFLAGS = -g -Wall -O2 +LDFLAGS = -g LDLIBS = -lncurses -lpthread -lnuma COMMON_OBJS = cmd.o disp.o lwp.o numatop.o page.o perf.o \ @@ -18,7 +19,7 @@ all: $(PROG) $(PROG): $(COMMON_OBJS) $(OS_OBJS) $(INTEL_OBJS) - $(LD) -o $@ $(COMMON_OBJS) $(OS_OBJS) $(INTEL_OBJS) $(LDLIBS) + $(LD) $(LDFLAGS) -o $@ $(COMMON_OBJS) $(OS_OBJS) $(INTEL_OBJS) $(LDLIBS) %.o: ./common/%.c ./common/include/*.h ./common/include/os/*.h $(CC) $(CFLAGS) -o $@ -c $< diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/README new/numatop/README --- old/numatop/README 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/README 2014-08-07 07:27:36.000000000 +0200 @@ -21,15 +21,10 @@ Kernel Requirement: ------------------ -NumaTOP requires a special patch which supports PEBS Load Latency functionality. -The patch has not been integrated in 3.8 (probably it will be integrated -in 3.9). The following steps instruct how to get and apply the patch. - -1. git clone git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git -2. cd tip -3. git checkout perf/x86 -4. build kernel as usual +Kernel: 3.13+ +For Haswell supporting, please also apply the following perf patch in kernel. +http://www.gossamer-threads.com/lists/linux/kernel/1964864 Directories ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/include/types.h new/numatop/common/include/types.h --- old/numatop/common/include/types.h 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/common/include/types.h 2014-08-05 08:00:32.000000000 +0200 @@ -49,10 +49,12 @@ CPU_SNB_EP, CPU_NHM_EX, CPU_NHM_EP, - CPU_WSM_EP + CPU_WSM_EP, + CPU_IVB_EX, + CPU_HSX } cpu_type_t; -#define CPU_TYPE_NUM 6 +#define CPU_TYPE_NUM 8 typedef enum { SORT_KEY_INVALID = -1, @@ -120,7 +122,7 @@ #define NCPUS_MAX (NNODES_MAX * NCPUS_NODE_MAX) #define NPROCS_NAX 4096 #define LL_THRESH 128 -#define LL_PERIOD 10000 +#define LL_PERIOD 1000 typedef struct _count_value { uint64_t counts[COUNT_NUM]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/numatop.c new/numatop/common/numatop.c --- old/numatop/common/numatop.c 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/common/numatop.c 2014-07-01 02:40:53.000000000 +0200 @@ -72,7 +72,7 @@ { int ret = 1, debug_level = 0; FILE *log = NULL, *dump = NULL; - boolean_t locked; + boolean_t locked = B_FALSE; char c; if (!os_authorized()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/os/os_win.c new/numatop/common/os/os_win.c --- old/numatop/common/os/os_win.c 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/common/os/os_win.c 2014-07-01 02:40:53.000000000 +0200 @@ -889,11 +889,11 @@ win_size2str(dyn->size, size_str, sizeof (size_str)); if (lwp != NULL) { (void) snprintf(content, sizeof (content), - "Memory area(%lX, %s), thread(%d)", + "Memory area(%"PRIX64", %s), thread(%d)", dyn->addr, size_str, lwp->id); } else { (void) snprintf(content, sizeof (content), - "Memory area(%lX, %s), process(%d)", + "Memory area(%"PRIX64", %s), process(%d)", dyn->addr, size_str, proc->pid); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/os/plat.c new/numatop/common/os/plat.c --- old/numatop/common/os/plat.c 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/common/os/plat.c 2014-08-05 08:00:56.000000000 +0200 @@ -49,7 +49,9 @@ snbep_profiling_config, nhmex_profiling_config, nhmep_profiling_config, - wsmep_profiling_config + wsmep_profiling_config, + snbep_profiling_config, + snbep_profiling_config }; static pfn_plat_ll_config_t @@ -59,7 +61,9 @@ snbep_ll_config, nhmex_ll_config, nhmep_ll_config, - wsmep_ll_config + wsmep_ll_config, + snbep_ll_config, + snbep_ll_config }; static pfn_plat_offcore_num_t @@ -69,7 +73,9 @@ snb_offcore_num, nhm_offcore_num, nhm_offcore_num, - wsm_offcore_num + wsm_offcore_num, + snb_offcore_num, + snb_offcore_num }; static cpu_type_t s_cpu_type; @@ -95,6 +101,10 @@ case CPU_NHM_EP: /* fall through */ case CPU_WSM_EP: + /* fall through */ + case CPU_IVB_EX: + /* fall through */ + case CPU_HSX: return (0); default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/util.c new/numatop/common/util.c --- old/numatop/common/util.c 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/common/util.c 2014-08-05 08:46:31.000000000 +0200 @@ -126,7 +126,7 @@ if (s_logfile != NULL) { (void) pthread_mutex_lock(&s_debug_ctl.mutex); (void) fprintf(s_logfile, - "%lu: ", current_ms() / 1000); + "%"PRIu64": ", current_ms() / 1000); va_start(ap, fmt); (void) vfprintf(s_logfile, fmt, ap); va_end(ap); @@ -137,7 +137,7 @@ } else { (void) pthread_mutex_lock(&s_debug_ctl.mutex); (void) fprintf(out, - "%lu: ", current_ms() / 1000); + "%"PRIu64": ", current_ms() / 1000); va_start(ap, fmt); (void) vfprintf(out, fmt, ap); va_end(ap); @@ -319,6 +319,7 @@ cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx) { +#if __x86_64 __asm volatile( "cpuid\n\t" :"=a" (*eax), @@ -326,6 +327,19 @@ "=c" (*ecx), "=d" (*edx) :"a" (*eax)); +#else + __asm volatile( + "push %%ebx\n\t" + "cpuid\n\t" + "mov %%ebx, (%4)\n\t" + "pop %%ebx" + :"=a" (*eax), + "=c" (*ecx), + "=d" (*edx) + :"0" (*eax), + "S" (ebx) + :"memory"); +#endif } /* @@ -364,22 +378,24 @@ case 26: type = CPU_NHM_EP; break; - case 44: type = CPU_WSM_EP; break; - case 45: type = CPU_SNB_EP; break; - case 46: type = CPU_NHM_EX; break; - case 47: type = CPU_WSM_EX; break; + case 62: + type = CPU_IVB_EX; + break; + case 63: + type = CPU_HSX; + break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/common/win.c new/numatop/common/win.c --- old/numatop/common/win.c 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/common/win.c 2014-07-01 02:40:53.000000000 +0200 @@ -1979,17 +1979,17 @@ * "buf" points to a big enough buffer. */ if ((i = (size / KB_BYTES)) < KB_BYTES) { - (void) snprintf(buf, bufsize, "%luK", i); + (void) snprintf(buf, bufsize, "%"PRIu64"K", i); } else if ((j = i / KB_BYTES) < KB_BYTES) { if ((i % KB_BYTES) == 0) { - (void) snprintf(buf, bufsize, "%luM", j); + (void) snprintf(buf, bufsize, "%"PRIu64"M", j); } else { (void) snprintf(buf, bufsize, "%.1fM", (double)i / (double)KB_BYTES); } } else { if ((j % KB_BYTES) == 0) { - (void) snprintf(buf, bufsize, "%luG", j / KB_BYTES); + (void) snprintf(buf, bufsize, "%"PRIu64"G", j / KB_BYTES); } else { (void) snprintf(buf, bufsize, "%.1fG", (double)j / (double)KB_BYTES); @@ -2021,16 +2021,16 @@ win_size2str(line->bufaddr.size, size_str, sizeof (size_str)); if (!line->nid_show) { - (void) snprintf(buf, size, "%16lX%8s%10.1f%11lu%34s", + (void) snprintf(buf, size, "%16"PRIX64"%8s%10.1f%11"PRIu64"%34s", line->bufaddr.addr, size_str, hit * 100.0, cyc2ns(lat), line->desc); } else { if (line->nid < 0) { - (void) snprintf(buf, size, "%16lX%8s%8s%10.1f%11lu", + (void) snprintf(buf, size, "%16"PRIX64"%8s%8s%10.1f%11"PRIu64, line->bufaddr.addr, size_str, "-", hit * 100.0, cyc2ns(lat)); } else { - (void) snprintf(buf, size, "%16lX%8s%8d%10.1f%11lu", + (void) snprintf(buf, size, "%16"PRIX64"%8s%8d%10.1f%11"PRIu64, line->bufaddr.addr, size_str, line->nid, hit * 100.0, cyc2ns(lat)); } @@ -2314,12 +2314,12 @@ if (lwp == NULL) { (void) snprintf(content, sizeof (content), "Monitoring memory areas (pid: %d, " - "AVG.LAT: %luns, interval: %s)", + "AVG.LAT: %"PRIu64"ns, interval: %s)", proc->pid, cyc2ns(lat), intval_buf); } else { (void) snprintf(content, sizeof (content), "Monitoring memory areas (lwpid: %d, " - "AVG.LAT: %luns, interval: %s)", + "AVG.LAT: %"PRIu64"ns, interval: %s)", lwp->id, cyc2ns(lat), intval_buf); } @@ -2462,7 +2462,7 @@ accdst_line_t *lines = (accdst_line_t *)pv; accdst_line_t *line = &lines[idx]; - (void) snprintf(buf, size, "%5d%14.1f%15lu", + (void) snprintf(buf, size, "%5d%14.1f%15"PRIu64, line->nid, line->access_ratio * 100.0, cyc2ns(line->latency)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/intel/nhm.c new/numatop/intel/nhm.c --- old/numatop/intel/nhm.c 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/intel/nhm.c 2014-07-01 02:40:53.000000000 +0200 @@ -43,7 +43,7 @@ static plat_event_config_t s_nhm_profiling[COUNT_NUM] = { { PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES, 0x53, 0, "cpu_clk_unhalted.core" }, - { PERF_TYPE_RAW, 0x01B7, 0x53, 0x3011, "off_core_response_0" }, + { PERF_TYPE_RAW, 0x01B7, 0x53, 0x2011, "off_core_response_0" }, { PERF_TYPE_HARDWARE, PERF_COUNT_HW_REF_CPU_CYCLES, 0x53, 0, "cpu_clk_unhalted.ref" }, { PERF_TYPE_HARDWARE, PERF_COUNT_HW_INSTRUCTIONS, 0x53, 0, "instr_retired.any" }, { PERF_TYPE_RAW, INVALID_CODE_UMASK, 0, 0, "off_core_response_1" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numatop/intel/wsm.c new/numatop/intel/wsm.c --- old/numatop/intel/wsm.c 2013-05-20 04:52:43.000000000 +0200 +++ new/numatop/intel/wsm.c 2014-07-01 02:40:53.000000000 +0200 @@ -43,15 +43,15 @@ static plat_event_config_t s_wsmex_profiling[COUNT_NUM] = { { PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES, 0x53, 0, "cpu_clk_unhalted.core" }, - { PERF_TYPE_RAW, 0x01B7, 0x53, 0x3011, "off_core_response_0" }, + { PERF_TYPE_RAW, 0x01B7, 0x53, 0x2011, "off_core_response_0" }, { PERF_TYPE_HARDWARE, PERF_COUNT_HW_REF_CPU_CYCLES, 0x53, 0, "cpu_clk_unhalted.ref" }, { PERF_TYPE_HARDWARE, PERF_COUNT_HW_INSTRUCTIONS, 0x53, 0, "instr_retired.any" }, - { PERF_TYPE_RAW, 0x01BB, 0x53, 0x4011, "off_core_response_1" } + { PERF_TYPE_RAW, 0x01BB, 0x53, 0x5011, "off_core_response_1" } }; static plat_event_config_t s_wsmep_profiling[COUNT_NUM] = { { PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES, 0x53, 0, "cpu_clk_unhalted.core" }, - { PERF_TYPE_RAW, 0x01B7, 0x53, 0x3011, "off_core_response_0" }, + { PERF_TYPE_RAW, 0x01B7, 0x53, 0x2011, "off_core_response_0" }, { PERF_TYPE_HARDWARE, PERF_COUNT_HW_REF_CPU_CYCLES, 0x53, 0, "cpu_clk_unhalted.ref" }, { PERF_TYPE_HARDWARE, PERF_COUNT_HW_INSTRUCTIONS, 0x53, 0, "instr_retired.any" }, { PERF_TYPE_RAW, INVALID_CODE_UMASK, 0, 0, "off_core_response_1" } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
