Em Mon, Dec 12, 2016 at 05:08:26PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Mon, Dec 12, 2016 at 11:35:41AM +0100, Jiri Olsa escreveu: > > Adding thread_map__remove function to remove thread > > from thread map. Adding automated test also. > > I'm fixing this, caught on debian:experimental-x-mips64 > > CC /tmp/build/perf/tests/thread-map.o > CC /tmp/build/perf/tests/llvm.o > tests/thread-map.c: In function 'test__thread_map_remove': > tests/thread-map.c:134:3: error: implicit declaration of function 'free' > [-Werror=implicit-function-declaration] > free(threads->map[i].comm); > ^~~~ > tests/thread-map.c:134:3: error: incompatible implicit declaration of > built-in function 'free' [-Werror] > tests/thread-map.c:134:3: note: include '<stdlib.h>' or provide a declaration > of 'free' > tests/thread-map.c:136:2: error: incompatible implicit declaration of > built-in function 'free' [-Werror] > free(threads); > ^~~~ > tests/thread-map.c:136:2: note: include '<stdlib.h>' or provide a declaration > of 'free' > CC /tmp/build/perf/tests/bpf.o >
Also it looks strange using free() directly on a thread_map object, don't we have to use thread_map__put()? Humm, this thread_map__new_event() doesn't follow the refcounting lifetimes, humpf, adding stdlib.h there and then will try and mae it use the refcount in this constructor as well... - Arnaldo > > Signed-off-by: Jiri Olsa <jo...@kernel.org> > > Cc: David Ahern <dsah...@gmail.com> > > Cc: Namhyung Kim <namhy...@kernel.org> > > Cc: Peter Zijlstra <a.p.zijls...@chello.nl> > > Link: http://lkml.kernel.org/n/tip-qcfxoqfyfyps9hvm234mx...@git.kernel.org > > --- > > tools/perf/tests/builtin-test.c | 4 ++++ > > tools/perf/tests/tests.h | 1 + > > tools/perf/tests/thread-map.c | 43 > > +++++++++++++++++++++++++++++++++++++++++ > > tools/perf/util/thread_map.c | 22 +++++++++++++++++++++ > > tools/perf/util/thread_map.h | 1 + > > 5 files changed, 71 insertions(+) > > > > diff --git a/tools/perf/tests/builtin-test.c > > b/tools/perf/tests/builtin-test.c > > index 23605202d4a1..a77dcc0d24e3 100644 > > --- a/tools/perf/tests/builtin-test.c > > +++ b/tools/perf/tests/builtin-test.c > > @@ -186,6 +186,10 @@ static struct test generic_tests[] = { > > .func = test__thread_map_synthesize, > > }, > > { > > + .desc = "Remove thread map", > > + .func = test__thread_map_remove, > > + }, > > + { > > .desc = "Synthesize cpu map", > > .func = test__cpu_map_synthesize, > > }, > > diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h > > index 0d7b251305af..a512f0c8ff5b 100644 > > --- a/tools/perf/tests/tests.h > > +++ b/tools/perf/tests/tests.h > > @@ -80,6 +80,7 @@ const char *test__bpf_subtest_get_desc(int subtest); > > int test__bpf_subtest_get_nr(void); > > int test_session_topology(int subtest); > > int test__thread_map_synthesize(int subtest); > > +int test__thread_map_remove(int subtest); > > int test__cpu_map_synthesize(int subtest); > > int test__synthesize_stat_config(int subtest); > > int test__synthesize_stat(int subtest); > > diff --git a/tools/perf/tests/thread-map.c b/tools/perf/tests/thread-map.c > > index cee2a2cdc933..e227e06ed7be 100644 > > --- a/tools/perf/tests/thread-map.c > > +++ b/tools/perf/tests/thread-map.c > > @@ -93,3 +93,46 @@ int test__thread_map_synthesize(int subtest > > __maybe_unused) > > > > return 0; > > } > > + > > +int test__thread_map_remove(int subtest __maybe_unused) > > +{ > > + struct thread_map *threads; > > + char *str; > > + int i; > > + > > + TEST_ASSERT_VAL("failed to allocate map string", > > + asprintf(&str, "%d,%d", getpid(), getppid()) >= 0); > > + > > + threads = thread_map__new_str(str, NULL, 0); > > + > > + TEST_ASSERT_VAL("failed to allocate thread_map", > > + threads); > > + > > + if (verbose) > > + thread_map__fprintf(threads, stderr); > > + > > + TEST_ASSERT_VAL("failed to remove thread", > > + !thread_map__remove(threads, 0)); > > + > > + TEST_ASSERT_VAL("thread_map count != 1", threads->nr == 1); > > + > > + if (verbose) > > + thread_map__fprintf(threads, stderr); > > + > > + TEST_ASSERT_VAL("failed to remove thread", > > + !thread_map__remove(threads, 0)); > > + > > + TEST_ASSERT_VAL("thread_map count != 0", threads->nr == 0); > > + > > + if (verbose) > > + thread_map__fprintf(threads, stderr); > > + > > + TEST_ASSERT_VAL("failed to not remove thread", > > + thread_map__remove(threads, 0)); > > + > > + for (i = 0; i < threads->nr; i++) > > + free(threads->map[i].comm); > > + > > + free(threads); > > + return 0; > > +} > > diff --git a/tools/perf/util/thread_map.c b/tools/perf/util/thread_map.c > > index 40585f5b7027..f9eab200fd75 100644 > > --- a/tools/perf/util/thread_map.c > > +++ b/tools/perf/util/thread_map.c > > @@ -448,3 +448,25 @@ bool thread_map__has(struct thread_map *threads, pid_t > > pid) > > > > return false; > > } > > + > > +int thread_map__remove(struct thread_map *threads, int idx) > > +{ > > + int i; > > + > > + if (threads->nr < 1) > > + return -EINVAL; > > + > > + if (idx >= threads->nr) > > + return -EINVAL; > > + > > + /* > > + * Free the 'idx' item and shift the rest up. > > + */ > > + free(threads->map[idx].comm); > > + > > + for (i = idx; i < threads->nr - 1; i++) > > + threads->map[i] = threads->map[i + 1]; > > + > > + threads->nr--; > > + return 0; > > +} > > diff --git a/tools/perf/util/thread_map.h b/tools/perf/util/thread_map.h > > index bd3b971588da..ea0ef08c6303 100644 > > --- a/tools/perf/util/thread_map.h > > +++ b/tools/perf/util/thread_map.h > > @@ -58,4 +58,5 @@ static inline char *thread_map__comm(struct thread_map > > *map, int thread) > > > > void thread_map__read_comms(struct thread_map *threads); > > bool thread_map__has(struct thread_map *threads, pid_t pid); > > +int thread_map__remove(struct thread_map *threads, int idx); > > #endif /* __PERF_THREAD_MAP_H */ > > -- > > 2.7.4
