Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f988e71b authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Lock to protect comm_str rb tree 



Add comm_str_lock to protect comm_str rb tree.

The lock is only needed for multithreaded code, so using mutex wrappers
provided by perf tool.

Signed-off-by: default avatarKan Liang <kan.liang@intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Lukasz Odzioba <lukasz.odzioba@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1506696477-146932-3-git-send-email-kan.liang@intel.com


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

tools/perf/util/comm.c

+17 −1
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <stdio.h>

#include <stdio.h>

#include <string.h>

#include <string.h>

#include <linux/refcount.h>

#include <linux/refcount.h>

#include "rwsem.h"





struct comm_str {

struct comm_str {

	char *str;

	char *str;
@@ -14,6 +15,7 @@ struct comm_str { 




/* Should perhaps be moved to struct machine */

/* Should perhaps be moved to struct machine */

static struct rb_root comm_str_root;

static struct rb_root comm_str_root;

static struct rw_semaphore comm_str_lock = {.lock = PTHREAD_RWLOCK_INITIALIZER,};





static struct comm_str *comm_str__get(struct comm_str *cs)

static struct comm_str *comm_str__get(struct comm_str *cs)

{

{
@@ -25,7 +27,9 @@ static struct comm_str *comm_str__get(struct comm_str *cs) 
static void comm_str__put(struct comm_str *cs)

static void comm_str__put(struct comm_str *cs)

{

{

	if (cs && refcount_dec_and_test(&cs->refcnt)) {

	if (cs && refcount_dec_and_test(&cs->refcnt)) {

		down_write(&comm_str_lock);

		rb_erase(&cs->rb_node, &comm_str_root);

		rb_erase(&cs->rb_node, &comm_str_root);

		up_write(&comm_str_lock);

		zfree(&cs->str);

		zfree(&cs->str);

		free(cs);

		free(cs);

	}

	}
@@ -50,7 +54,8 @@ static struct comm_str *comm_str__alloc(const char *str) 
	return cs;

	return cs;

}

}





static struct comm_str *comm_str__findnew(const char *str, struct rb_root *root)

static

struct comm_str *__comm_str__findnew(const char *str, struct rb_root *root)

{

{

	struct rb_node **p = &root->rb_node;

	struct rb_node **p = &root->rb_node;

	struct rb_node *parent = NULL;

	struct rb_node *parent = NULL;
@@ -81,6 +86,17 @@ static struct comm_str *comm_str__findnew(const char *str, struct rb_root *root) 
	return new;

	return new;

}

}





static struct comm_str *comm_str__findnew(const char *str, struct rb_root *root)

{

	struct comm_str *cs;



	down_write(&comm_str_lock);

	cs = __comm_str__findnew(str, root);

	up_write(&comm_str_lock);



	return cs;

}



struct comm *comm__new(const char *str, u64 timestamp, bool exec)

struct comm *comm__new(const char *str, u64 timestamp, bool exec)

{

{

	struct comm *comm = zalloc(sizeof(*comm));

	struct comm *comm = zalloc(sizeof(*comm));