Commit 7cb10a08 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Remove const from thread read accessors 



The namespaces and comm fields of a thread are protected by rwsem and
require write access for it.  So it ended up using a cast to remove
the const qualifier.  Let's get rid of the const then.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Suggested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Hari Bathini <hbathini@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Krister Johansen <kjlx@templeofstupid.com>
Link: http://lkml.kernel.org/r/20190527061149.168640-1-namhyung@kernel.org


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

tools/perf/util/hist.c

+1 −1
Original line number Diff line number Diff line
@@ -2561,7 +2561,7 @@ int __hists__scnprintf_title(struct hists *hists, char *bf, size_t size, bool sh 
	char unit;

	int printed;

	const struct dso *dso = hists->dso_filter;

	const struct thread *thread = hists->thread_filter;

	struct thread *thread = hists->thread_filter;

	int socket_id = hists->socket_filter;

	unsigned long nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE];

	u64 nr_events = hists->stats.total_period;

tools/perf/util/thread.c

+6 −6
Original line number Diff line number Diff line
@@ -141,13 +141,13 @@ static struct namespaces *__thread__namespaces(const struct thread *thread) 
	return list_first_entry(&thread->namespaces_list, struct namespaces, list);

}



struct namespaces *thread__namespaces(const struct thread *thread)

struct namespaces *thread__namespaces(struct thread *thread)

{

	struct namespaces *ns;



	down_read((struct rw_semaphore *)&thread->namespaces_lock);

	down_read(&thread->namespaces_lock);

	ns = __thread__namespaces(thread);

	up_read((struct rw_semaphore *)&thread->namespaces_lock);

	up_read(&thread->namespaces_lock);



	return ns;

}
@@ -271,13 +271,13 @@ static const char *__thread__comm_str(const struct thread *thread) 
	return comm__str(comm);

}



const char *thread__comm_str(const struct thread *thread)

const char *thread__comm_str(struct thread *thread)

{

	const char *str;



	down_read((struct rw_semaphore *)&thread->comm_lock);

	down_read(&thread->comm_lock);

	str = __thread__comm_str(thread);

	up_read((struct rw_semaphore *)&thread->comm_lock);

	up_read(&thread->comm_lock);



	return str;

}

tools/perf/util/thread.h

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static inline void thread__exited(struct thread *thread) 
	thread->dead = true;

}



struct namespaces *thread__namespaces(const struct thread *thread);

struct namespaces *thread__namespaces(struct thread *thread);

int thread__set_namespaces(struct thread *thread, u64 timestamp,

			   struct namespaces_event *event);
@@ -93,7 +93,7 @@ int thread__set_comm_from_proc(struct thread *thread); 
int thread__comm_len(struct thread *thread);

struct comm *thread__comm(const struct thread *thread);

struct comm *thread__exec_comm(const struct thread *thread);

const char *thread__comm_str(const struct thread *thread);

const char *thread__comm_str(struct thread *thread);

int thread__insert_map(struct thread *thread, struct map *map);

int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp, bool do_maps_clone);

size_t thread__fprintf(struct thread *thread, FILE *fp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE