2010-07-02 12:48:58

by Arnaldo Carvalho de Melo

Subject: [GIT PULL 0/1] perf/urgent fixes

Hi Ingo,

Please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent

Regards,

- Arnaldo

Gui Jianfeng (1):
perf tools: Fix find tids routine by excluding "." and ".."

tools/perf/util/thread.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)

2010-07-02 12:49:09

by Arnaldo Carvalho de Melo

Subject: [PATCH 1/1] perf tools: Fix find tids routine by excluding "." and ".."

From: Gui Jianfeng <[email protected]>

Introduce a filter function to skip "." and ".." directories when calculating
tid number, otherwise tid 0 will be included in the all_tid result array.

Cc: Ingo Molnar <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Gui Jianfeng <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/thread.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index 1f7ecd4..9a448b4 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -7,6 +7,15 @@
#include "util.h"
#include "debug.h"

+/* Skip "." and ".." directories */
+static int filter(const struct dirent *dir)
+{
+ if (dir->d_name[0] == '.')
+ return 0;
+ else
+ return 1;
+}
+
int find_all_tid(int pid, pid_t ** all_tid)
{
char name[256];
@@ -16,7 +25,7 @@ int find_all_tid(int pid, pid_t ** all_tid)
int i;

sprintf(name, "/proc/%d/task", pid);
- items = scandir(name, &namelist, NULL, NULL);
+ items = scandir(name, &namelist, filter, NULL);
if (items <= 0)
return -ENOENT;
*all_tid = malloc(sizeof(pid_t) * items);
--
1.6.2.5

2010-07-03 13:00:54

by Ingo Molnar

Subject: Re: [GIT PULL 0/1] perf/urgent fixes

* Arnaldo Carvalho de Melo <[email protected]> wrote:

> Hi Ingo,
>
> Please pull from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent
>
> Regards,
>
> - Arnaldo
>
> Gui Jianfeng (1):
> perf tools: Fix find tids routine by excluding "." and ".."
>
> tools/perf/util/thread.c | 11 ++++++++++-
> 1 files changed, 10 insertions(+), 1 deletions(-)

Pulled, thanks Arnaldo!

Ingo