perf db-export: Factor out db_export__threads() (b3694e6c) · Commits · 戴 / test

tools/perf/util/db-export.c

+48 −34

Original line number	Original line	Diff line number	Diff line
	@@ -286,50 +286,32 @@ int db_export__branch_type(struct db_export *dbe, u32 branch_type,
	return 0;		return 0;
	}		}

	int db_export__sample(struct db_export dbe, union perf_event event,		static int db_export__threads(struct db_export dbe, struct thread thread,
	struct perf_sample sample, struct perf_evsel evsel,		struct thread *main_thread,
	struct addr_location *al)		struct machine machine, struct comm *comm_ptr)
	{		{
	struct thread *thread = al->thread;
	struct export_sample es = {
	.event = event,
	.sample = sample,
	.evsel = evsel,
	.al = al,
	};
	struct thread *main_thread;
	struct comm *comm = NULL;		struct comm *comm = NULL;
	struct comm *curr_comm;		struct comm *curr_comm;
	int err;		int err;

	err = db_export__evsel(dbe, evsel);
	if (err)
	return err;

	err = db_export__machine(dbe, al->machine);
	if (err)
	return err;

	main_thread = thread__main_thread(al->machine, thread);
	if (main_thread) {		if (main_thread) {
	/*		/*
	* A thread has a reference to the main thread, so export the		* A thread has a reference to the main thread, so export the
	* main thread first.		* main thread first.
	*/		*/
	err = db_export__thread(dbe, main_thread, al->machine,		err = db_export__thread(dbe, main_thread, machine, main_thread);
	main_thread);
	if (err)		if (err)
	goto out_put;		return err;
	/*		/*
	* Export comm before exporting the non-main thread because		* Export comm before exporting the non-main thread because
	* db_export__comm_thread() can be called further below.		* db_export__comm_thread() can be called further below.
	*/		*/
	comm = machine__thread_exec_comm(al->machine, main_thread);		comm = machine__thread_exec_comm(machine, main_thread);
	if (comm) {		if (comm) {
	err = db_export__exec_comm(dbe, comm, main_thread);		err = db_export__exec_comm(dbe, comm, main_thread);
	if (err)		if (err)
	goto out_put;		return err;
	es.comm_db_id = comm->db_id;		*comm_ptr = comm;
	}		}
	}		}

	@@ -340,23 +322,55 @@ int db_export__sample(struct db_export dbe, union perf_event event,
	*/		*/
	bool export_comm_thread = comm && !thread->db_id;		bool export_comm_thread = comm && !thread->db_id;

	err = db_export__thread(dbe, thread, al->machine, main_thread);		err = db_export__thread(dbe, thread, machine, main_thread);
	if (err)		if (err)
	goto out_put;		return err;

	if (export_comm_thread) {		if (export_comm_thread) {
	err = db_export__comm_thread(dbe, comm, thread);		err = db_export__comm_thread(dbe, comm, thread);
	if (err)		if (err)
	goto out_put;		return err;
	}		}
	}		}

	curr_comm = thread__comm(thread);		curr_comm = thread__comm(thread);
	if (curr_comm) {		if (curr_comm)
	err = db_export__comm(dbe, curr_comm, thread);		return db_export__comm(dbe, curr_comm, thread);

			return 0;
			}

			int db_export__sample(struct db_export dbe, union perf_event event,
			struct perf_sample sample, struct perf_evsel evsel,
			struct addr_location *al)
			{
			struct thread *thread = al->thread;
			struct export_sample es = {
			.event = event,
			.sample = sample,
			.evsel = evsel,
			.al = al,
			};
			struct thread *main_thread;
			struct comm *comm = NULL;
			int err;

			err = db_export__evsel(dbe, evsel);
			if (err)
			return err;

			err = db_export__machine(dbe, al->machine);
			if (err)
			return err;

			main_thread = thread__main_thread(al->machine, thread);

			err = db_export__threads(dbe, thread, main_thread, al->machine, &comm);
	if (err)		if (err)
	goto out_put;		goto out_put;
	}
			if (comm)
			es.comm_db_id = comm->db_id;

	es.db_id = ++dbe->sample_last_db_id;		es.db_id = ++dbe->sample_last_db_id;

Admin message