Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf tools: Rename strlist_for_each() macros to for_each_entry()

To match the semantics for list.h in the kernel, that are the
interface we use in them.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Taeung Song <treeze.taeung@gmail.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-0b5i2ki9c3di6706fxpticsb@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+19 -19
+5 -5
tools/perf/builtin-buildid-cache.c
··· 209 209 if (err) 210 210 goto out; 211 211 212 - strlist__for_each(pos, list) { 212 + strlist__for_each_entry(pos, list) { 213 213 err = build_id_cache__remove_s(pos->s); 214 214 pr_debug("Removing %s %s: %s\n", pos->s, pathname, 215 215 err ? "FAIL" : "Ok"); ··· 343 343 if (add_name_list_str) { 344 344 list = strlist__new(add_name_list_str, NULL); 345 345 if (list) { 346 - strlist__for_each(pos, list) 346 + strlist__for_each_entry(pos, list) 347 347 if (build_id_cache__add_file(pos->s)) { 348 348 if (errno == EEXIST) { 349 349 pr_debug("%s already in the cache\n", ··· 361 361 if (remove_name_list_str) { 362 362 list = strlist__new(remove_name_list_str, NULL); 363 363 if (list) { 364 - strlist__for_each(pos, list) 364 + strlist__for_each_entry(pos, list) 365 365 if (build_id_cache__remove_file(pos->s)) { 366 366 if (errno == ENOENT) { 367 367 pr_debug("%s wasn't in the cache\n", ··· 379 379 if (purge_name_list_str) { 380 380 list = strlist__new(purge_name_list_str, NULL); 381 381 if (list) { 382 - strlist__for_each(pos, list) 382 + strlist__for_each_entry(pos, list) 383 383 if (build_id_cache__purge_path(pos->s)) { 384 384 if (errno == ENOENT) { 385 385 pr_debug("%s wasn't in the cache\n", ··· 400 400 if (update_name_list_str) { 401 401 list = strlist__new(update_name_list_str, NULL); 402 402 if (list) { 403 - strlist__for_each(pos, list) 403 + strlist__for_each_entry(pos, list) 404 404 if (build_id_cache__update_file(pos->s)) { 405 405 if (errno == ENOENT) { 406 406 pr_debug("%s wasn't in the cache\n",
+2 -2
tools/perf/builtin-probe.c
··· 389 389 390 390 ret = probe_file__get_events(kfd, filter, klist); 391 391 if (ret == 0) { 392 - strlist__for_each(ent, klist) 392 + strlist__for_each_entry(ent, klist) 393 393 pr_info("Removed event: %s\n", ent->s); 394 394 395 395 ret = probe_file__del_strlist(kfd, klist); ··· 399 399 400 400 ret2 = probe_file__get_events(ufd, filter, ulist); 401 401 if (ret2 == 0) { 402 - strlist__for_each(ent, ulist) 402 + strlist__for_each_entry(ent, ulist) 403 403 pr_info("Removed event: %s\n", ent->s); 404 404 405 405 ret2 = probe_file__del_strlist(ufd, ulist);
+1 -1
tools/perf/builtin-trace.c
··· 1247 1247 1248 1248 i = 0; 1249 1249 1250 - strlist__for_each(pos, trace->ev_qualifier) { 1250 + strlist__for_each_entry(pos, trace->ev_qualifier) { 1251 1251 const char *sc = pos->s; 1252 1252 int id = syscalltbl__id(trace->sctbl, sc); 1253 1253
+2 -2
tools/perf/util/probe-event.c
··· 980 980 zfree(&vl->point.symbol); 981 981 nvars = 0; 982 982 if (vl->vars) { 983 - strlist__for_each(node, vl->vars) { 983 + strlist__for_each_entry(node, vl->vars) { 984 984 var = strchr(node->s, '\t') + 1; 985 985 if (strfilter__compare(_filter, var)) { 986 986 fprintf(stdout, "\t\t%s\n", node->s); ··· 2333 2333 if (!rawlist) 2334 2334 return -ENOMEM; 2335 2335 2336 - strlist__for_each(ent, rawlist) { 2336 + strlist__for_each_entry(ent, rawlist) { 2337 2337 ret = parse_probe_trace_command(ent->s, &tev); 2338 2338 if (ret >= 0) { 2339 2339 if (!filter_probe_trace_event(&tev, filter))
+4 -4
tools/perf/util/probe-file.c
··· 178 178 if (!rawlist) 179 179 return NULL; 180 180 sl = strlist__new(NULL, NULL); 181 - strlist__for_each(ent, rawlist) { 181 + strlist__for_each_entry(ent, rawlist) { 182 182 ret = parse_probe_trace_command(ent->s, &tev); 183 183 if (ret < 0) 184 184 break; ··· 281 281 if (!namelist) 282 282 return -ENOENT; 283 283 284 - strlist__for_each(ent, namelist) { 284 + strlist__for_each_entry(ent, namelist) { 285 285 p = strchr(ent->s, ':'); 286 286 if ((p && strfilter__compare(filter, p + 1)) || 287 287 strfilter__compare(filter, ent->s)) { ··· 299 299 int ret = 0; 300 300 struct str_node *ent; 301 301 302 - strlist__for_each(ent, namelist) { 302 + strlist__for_each_entry(ent, namelist) { 303 303 ret = __del_trace_probe_event(fd, ent); 304 304 if (ret < 0) 305 305 break; ··· 612 612 if (ret < (int)iov[1].iov_len + 2) 613 613 goto rollback; 614 614 615 - strlist__for_each(snode, entry->tevlist) { 615 + strlist__for_each_entry(snode, entry->tevlist) { 616 616 iov[0].iov_base = (void *)snode->s; 617 617 iov[0].iov_len = strlen(snode->s); 618 618 iov[1].iov_base = (void *)"\n"; iov[1].iov_len = 1;
+2 -2
tools/perf/util/strlist.h
··· 73 73 * @pos: the &struct str_node to use as a loop cursor. 74 74 * @slist: the &struct strlist for loop. 75 75 */ 76 - #define strlist__for_each(pos, slist) \ 76 + #define strlist__for_each_entry(pos, slist) \ 77 77 for (pos = strlist__first(slist); pos; pos = strlist__next(pos)) 78 78 79 79 /** ··· 83 83 * @n: another &struct str_node to use as temporary storage. 84 84 * @slist: the &struct strlist for loop. 85 85 */ 86 - #define strlist__for_each_safe(pos, n, slist) \ 86 + #define strlist__for_each_entry_safe(pos, n, slist) \ 87 87 for (pos = strlist__first(slist), n = strlist__next(pos); pos;\ 88 88 pos = n, n = strlist__next(n)) 89 89 #endif /* __PERF_STRLIST_H */
+1 -1
tools/perf/util/symbol.c
··· 1626 1626 if (!dirs) 1627 1627 return -1; 1628 1628 1629 - strlist__for_each(nd, dirs) { 1629 + strlist__for_each_entry(nd, dirs) { 1630 1630 scnprintf(kallsyms_filename, sizeof(kallsyms_filename), 1631 1631 "%s/%s/kallsyms", dir, nd->s); 1632 1632 if (!validate_kcore_addresses(kallsyms_filename, map)) {
+2 -2
tools/perf/util/thread_map.c
··· 202 202 if (!slist) 203 203 return NULL; 204 204 205 - strlist__for_each(pos, slist) { 205 + strlist__for_each_entry(pos, slist) { 206 206 pid = strtol(pos->s, &end_ptr, 10); 207 207 208 208 if (pid == INT_MIN || pid == INT_MAX || ··· 278 278 if (!slist) 279 279 return NULL; 280 280 281 - strlist__for_each(pos, slist) { 281 + strlist__for_each_entry(pos, slist) { 282 282 tid = strtol(pos->s, &end_ptr, 10); 283 283 284 284 if (tid == INT_MIN || tid == INT_MAX ||