project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve naming for prof system thread name option

Browse Source
This commit is contained in:
Yinan Zhang
2020-06-19 15:16:53 -07:00
parent 25e43c6022
commit d460333efb
9 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/unit/mallctl.c
View File

@@ -192,7 +192,7 @@ TEST_BEGIN(test_mallctl_opt) {
TEST_MALLCTL_OPT(bool, prof_final, prof);
TEST_MALLCTL_OPT(bool, prof_leak, prof);
TEST_MALLCTL_OPT(ssize_t, prof_recent_alloc_max, prof);
TEST_MALLCTL_OPT(bool, prof_experimental_use_sys_thread_name, prof);
TEST_MALLCTL_OPT(bool, prof_sys_thread_name, prof);
#undef TEST_MALLCTL_OPT
}

20
test/unit/prof_use_sys_thread_name.c → test/unit/prof_sys_thread_name.c
View File

@@ -3,31 +3,31 @@
static const char *test_thread_name = "test_name";
static int
test_prof_read_sys_thread_name_error(char *buf, size_t limit) {
test_prof_sys_thread_name_read_error(char *buf, size_t limit) {
return ENOSYS;
}
static int
test_prof_read_sys_thread_name(char *buf, size_t limit) {
test_prof_sys_thread_name_read(char *buf, size_t limit) {
assert(strlen(test_thread_name) < limit);
strncpy(buf, test_thread_name, limit);
return 0;
}
static int
test_prof_read_sys_thread_name_clear(char *buf, size_t limit) {
test_prof_sys_thread_name_read_clear(char *buf, size_t limit) {
assert(limit > 0);
buf[0] = '\0';
return 0;
}
TEST_BEGIN(test_prof_experimental_use_sys_thread_name) {
TEST_BEGIN(test_prof_sys_thread_name) {
test_skip_if(!config_prof);
bool oldval;
size_t sz = sizeof(oldval);
assert_d_eq(mallctl("opt.prof_experimental_use_sys_thread_name",
&oldval, &sz, NULL, 0), 0, "mallctl failed");
assert_d_eq(mallctl("opt.prof_sys_thread_name", &oldval, &sz, NULL, 0),
0, "mallctl failed");
assert_true(oldval, "option was not set correctly");
const char *thread_name;
@@ -42,7 +42,7 @@ TEST_BEGIN(test_prof_experimental_use_sys_thread_name) {
assert_ptr_eq(thread_name, test_thread_name,
"Thread name should not be touched");
prof_read_sys_thread_name = test_prof_read_sys_thread_name_error;
prof_sys_thread_name_read = test_prof_sys_thread_name_read_error;
void *p = malloc(1);
free(p);
assert_d_eq(mallctl("thread.prof.name", &thread_name, &sz, NULL, 0), 0,
@@ -50,7 +50,7 @@ TEST_BEGIN(test_prof_experimental_use_sys_thread_name) {
assert_str_eq(thread_name, "",
"Thread name should stay the same if the system call fails");
prof_read_sys_thread_name = test_prof_read_sys_thread_name;
prof_sys_thread_name_read = test_prof_sys_thread_name_read;
p = malloc(1);
free(p);
assert_d_eq(mallctl("thread.prof.name", &thread_name, &sz, NULL, 0), 0,
@@ -58,7 +58,7 @@ TEST_BEGIN(test_prof_experimental_use_sys_thread_name) {
assert_str_eq(thread_name, test_thread_name,
"Thread name should be changed if the system call succeeds");
prof_read_sys_thread_name = test_prof_read_sys_thread_name_clear;
prof_sys_thread_name_read = test_prof_sys_thread_name_read_clear;
p = malloc(1);
free(p);
assert_d_eq(mallctl("thread.prof.name", &thread_name, &sz, NULL, 0), 0,
@@ -71,5 +71,5 @@ TEST_END
int
main(void) {
return test(
test_prof_experimental_use_sys_thread_name);
test_prof_sys_thread_name);
}

5
test/unit/prof_sys_thread_name.sh Normal file
View File

@@ -0,0 +1,5 @@
#!/bin/sh
if [ "x${enable_prof}" = "x1" ] ; then
export MALLOC_CONF="prof:true,lg_prof_sample:0,prof_sys_thread_name:true"
fi

5
test/unit/prof_use_sys_thread_name.sh
View File

@@ -1,5 +0,0 @@
#!/bin/sh
if [ "x${enable_prof}" = "x1" ] ; then
export MALLOC_CONF="prof:true,lg_prof_sample:0,prof_experimental_use_sys_thread_name:true"
fi