Commit 7a9418cf authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf dsos: Switch hand crafted code to bsearch() 



Switch to using the bsearch library function rather than having a hand
written binary search. Const-ify some static functions to avoid compiler
warnings.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ben Gainey <ben.gainey@arm.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Chengen Du <chengen.du@canonical.com>
Cc: Colin Ian King <colin.i.king@gmail.com>
Cc: Dima Kogan <dima@secretsauce.net>
Cc: Ilkka Koskinen <ilkka@os.amperecomputing.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Li Dong <lidong@vivo.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paran Lee <p4ranlee@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <song@kernel.org>
Cc: Sun Haiyong <sunhaiyong@loongson.cn>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Tiezhu Yang <yangtiezhu@loongson.cn>
Cc: Yanteng Si <siyanteng@loongson.cn>
Cc: zhaimingbing <zhaimingbing@cmss.chinamobile.com>
Link: https://lore.kernel.org/r/20240504213803.218974-5-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7410d600

tools/perf/util/dsos.c

+27 −19
Original line number Diff line number Diff line
@@ -107,13 +107,15 @@ bool dsos__read_build_ids(struct dsos *dsos, bool with_hits) 
	return args.have_build_id;

}



static int __dso__cmp_long_name(const char *long_name, struct dso_id *id, struct dso *b)

static int __dso__cmp_long_name(const char *long_name, const struct dso_id *id,

				const struct dso *b)

{

	int rc = strcmp(long_name, b->long_name);

	return rc ?: dso_id__cmp(id, &b->id);

}



static int __dso__cmp_short_name(const char *short_name, struct dso_id *id, struct dso *b)

static int __dso__cmp_short_name(const char *short_name, const struct dso_id *id,

				 const struct dso *b)

{

	int rc = strcmp(short_name, b->short_name);

	return rc ?: dso_id__cmp(id, &b->id);
@@ -133,6 +135,19 @@ static int dsos__cmp_long_name_id_short_name(const void *va, const void *vb) 
	return rc;

}



struct dsos__key {

	const char *long_name;

	const struct dso_id *id;

};



static int dsos__cmp_key_long_name_id(const void *vkey, const void *vdso)

{

	const struct dsos__key *key = vkey;

	const struct dso *dso = *((const struct dso **)vdso);



	return __dso__cmp_long_name(key->long_name, key->id, dso);

}



/*

 * Find a matching entry and/or link current entry to RB tree.

 * Either one of the dso or name parameter must be non-NULL or the
@@ -143,7 +158,11 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, 
					       struct dso_id *id,

					       bool write_locked)

{

	int low = 0, high = dsos->cnt - 1;

	struct dsos__key key = {

		.long_name = name,

		.id = id,

	};

	struct dso **res;



	if (!dsos->sorted) {

		if (!write_locked) {
@@ -162,23 +181,12 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, 
		dsos->sorted = true;

	}



	/*

	 * Find node with the matching name

	 */

	while (low <= high) {

		int mid = (low + high) / 2;

		struct dso *this = dsos->dsos[mid];

		int rc = __dso__cmp_long_name(name, id, this);



		if (rc == 0) {

			return dso__get(this);	/* Find matching dso */

		}

		if (rc < 0)

			high = mid - 1;

		else

			low = mid + 1;

	}

	res = bsearch(&key, dsos->dsos, dsos->cnt, sizeof(struct dso *),

		      dsos__cmp_key_long_name_id);

	if (!res)

		return NULL;



	return dso__get(*res);

}



int __dsos__add(struct dsos *dsos, struct dso *dso)