generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix pthread_setname_np's behavior on invalid pthread_ts.

Browse Source 
Change-Id: I0a154beaab4d164ac812f2564d12e4d79b80a8e8
This commit is contained in:
Elliott Hughes 2013-03-21 20:02:35 -07:00
parent 26c815c489
commit a41ba2f0bf
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libc/bionic/pthread_setname_np.cpp
View File

@ -35,6 +35,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "pthread_accessor.h"
#include "pthread_internal.h" #include "pthread_internal.h"
#include "private/ErrnoRestorer.h" #include "private/ErrnoRestorer.h"
@ -42,10 +43,10 @@
#define MAX_TASK_COMM_LEN 16 #define MAX_TASK_COMM_LEN 16
#define TASK_COMM_FMT "/proc/self/task/%d/comm" #define TASK_COMM_FMT "/proc/self/task/%d/comm"
int pthread_setname_np(pthread_t thread, const char* thread_name) { int pthread_setname_np(pthread_t t, const char* thread_name) {
ErrnoRestorer errno_restorer; ErrnoRestorer errno_restorer;
if (thread == 0 || thread_name == NULL) { if (thread_name == NULL) {
return EINVAL; return EINVAL;
} }
@ -55,14 +56,21 @@ int pthread_setname_np(pthread_t thread, const char* thread_name) {
} }
// Changing our own name is an easy special case. // Changing our own name is an easy special case.
if (thread == pthread_self()) { if (t == pthread_self()) {
return prctl(PR_SET_NAME, thread_name) ? errno : 0; return prctl(PR_SET_NAME, thread_name) ? errno : 0;
} }
// Have to change another thread's name. // We have to change another thread's name.
pthread_internal_t* t = reinterpret_cast<pthread_internal_t*>(thread); pid_t tid = 0;
{
pthread_accessor thread(t);
if (thread.get() == NULL) {
return ESRCH;
}
tid = thread->tid;
}
char comm_name[sizeof(TASK_COMM_FMT) + 8]; char comm_name[sizeof(TASK_COMM_FMT) + 8];
snprintf(comm_name, sizeof(comm_name), TASK_COMM_FMT, t->tid); snprintf(comm_name, sizeof(comm_name), TASK_COMM_FMT, tid);
int fd = open(comm_name, O_WRONLY); int fd = open(comm_name, O_WRONLY);
if (fd == -1) { if (fd == -1) {
return errno; return errno;
@ -72,7 +80,7 @@ int pthread_setname_np(pthread_t thread, const char* thread_name) {
if (n < 0) { if (n < 0) {
return errno; return errno;
} else if ((size_t)n != thread_name_len) { } else if (n != static_cast<ssize_t>(thread_name_len)) {
return EIO; return EIO;
} }
return 0; return 0;

2
tests/pthread_test.cpp
View File

@ -239,7 +239,7 @@ TEST(pthread, pthread_setname_np__no_such_thread) {
MakeDeadThread(dead_thread); MakeDeadThread(dead_thread);
// Call pthread_setname_np after thread has already exited. // Call pthread_setname_np after thread has already exited.
ASSERT_EQ(ENOENT, pthread_setname_np(dead_thread, "short 3")); ASSERT_EQ(ESRCH, pthread_setname_np(dead_thread, "short 3"));
} }
#endif #endif