mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-05 08:00:30 +00:00
Rescue pthread_set_name_np for compatible reason, remove unused code.
This commit is contained in:
David Xu
parent
a53747d8fe
commit
e35e2ebd24
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=154130
|
|
@ -20,6 +20,7 @@ SRCS+= \
|
|||
thr_fork.c \
|
||||
thr_getprio.c \
|
||||
thr_getschedparam.c \
|
||||
thr_info.c \
|
||||
thr_init.c \
|
||||
thr_join.c \
|
||||
thr_list.c \
|
||||
|
|
|
|||
|
|
@ -34,168 +34,26 @@
|
|||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <pthread.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "thr_private.h"
|
||||
|
||||
#ifndef NELEMENTS
|
||||
#define NELEMENTS(arr) (sizeof(arr) / sizeof(arr[0]))
|
||||
#endif
|
||||
|
||||
static void dump_thread(int fd, pthread_t pthread, int long_version);
|
||||
|
||||
__weak_reference(_pthread_set_name_np, pthread_set_name_np);
|
||||
|
||||
struct s_thread_info {
|
||||
enum pthread_state state;
|
||||
char *name;
|
||||
};
|
||||
|
||||
/* Static variables: */
|
||||
static const struct s_thread_info thread_info[] = {
|
||||
{PS_RUNNING , "Running"},
|
||||
{PS_MUTEX_WAIT , "Waiting on a mutex"},
|
||||
{PS_JOIN , "Waiting to join"},
|
||||
{PS_SUSPENDED , "Suspended"},
|
||||
{PS_DEAD , "Dead"},
|
||||
{PS_DEADLOCK , "Deadlocked"},
|
||||
{PS_STATE_MAX , "Not a real state!"}
|
||||
};
|
||||
|
||||
void
|
||||
_thread_dump_info(void)
|
||||
{
|
||||
char s[512], tmpfile[128];
|
||||
pthread_t pthread;
|
||||
int fd, i;
|
||||
|
||||
for (i = 0; i < 100000; i++) {
|
||||
snprintf(tmpfile, sizeof(tmpfile), "/tmp/pthread.dump.%u.%i",
|
||||
getpid(), i);
|
||||
/* Open the dump file for append and create it if necessary: */
|
||||
if ((fd = __sys_open(tmpfile, O_RDWR | O_CREAT | O_EXCL,
|
||||
0666)) < 0) {
|
||||
/* Can't open the dump file. */
|
||||
if (errno == EEXIST)
|
||||
continue;
|
||||
/*
|
||||
* We only need to continue in case of
|
||||
* EEXIT error. Most other error
|
||||
* codes means that we will fail all
|
||||
* the times.
|
||||
*/
|
||||
return;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i==100000) {
|
||||
/* all 100000 possibilities are in use :( */
|
||||
return;
|
||||
} else {
|
||||
/* Dump the active threads. */
|
||||
strcpy(s, "\n\n========\nACTIVE THREADS\n\n");
|
||||
__sys_write(fd, s, strlen(s));
|
||||
|
||||
/* Enter a loop to report each thread in the global list: */
|
||||
TAILQ_FOREACH(pthread, &_thread_list, tle) {
|
||||
if (pthread->state != PS_DEAD)
|
||||
dump_thread(fd, pthread, /*long_verson*/ 1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Dump the ready threads.
|
||||
* XXX - We can't easily do this because the run queues
|
||||
* are per-KSEG.
|
||||
*/
|
||||
strcpy(s, "\n\n========\nREADY THREADS - unimplemented\n\n");
|
||||
__sys_write(fd, s, strlen(s));
|
||||
|
||||
|
||||
/*
|
||||
* Dump the waiting threads.
|
||||
* XXX - We can't easily do this because the wait queues
|
||||
* are per-KSEG.
|
||||
*/
|
||||
strcpy(s, "\n\n========\nWAITING THREADS - unimplemented\n\n");
|
||||
__sys_write(fd, s, strlen(s));
|
||||
|
||||
/* Close the dump file. */
|
||||
__sys_close(fd);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
dump_thread(int fd, pthread_t pthread, int long_version)
|
||||
{
|
||||
struct pthread *curthread = _get_curthread();
|
||||
char s[512];
|
||||
int i;
|
||||
|
||||
/* Find the state: */
|
||||
for (i = 0; i < NELEMENTS(thread_info) - 1; i++)
|
||||
if (thread_info[i].state == pthread->state)
|
||||
break;
|
||||
|
||||
/* Output a record for the thread: */
|
||||
snprintf(s, sizeof(s),
|
||||
"--------------------\n"
|
||||
"Thread %p (%s), scope %s, prio %3d, state %s [%s:%d]\n",
|
||||
pthread, (pthread->name == NULL) ? "" : pthread->name,
|
||||
pthread->attr.flags & PTHREAD_SCOPE_SYSTEM ? "system" : "process",
|
||||
pthread->active_priority,
|
||||
thread_info[i].name, pthread->fname, pthread->lineno);
|
||||
__sys_write(fd, s, strlen(s));
|
||||
|
||||
if (long_version != 0) {
|
||||
/* Check if this is the running thread: */
|
||||
if (pthread == curthread) {
|
||||
/* Output a record for the running thread: */
|
||||
strcpy(s, "This is the running thread\n");
|
||||
__sys_write(fd, s, strlen(s));
|
||||
}
|
||||
/* Check if this is the initial thread: */
|
||||
if (pthread == _thr_initial) {
|
||||
/* Output a record for the initial thread: */
|
||||
strcpy(s, "This is the initial thread\n");
|
||||
__sys_write(fd, s, strlen(s));
|
||||
}
|
||||
|
||||
/* Process according to thread state: */
|
||||
switch (pthread->state) {
|
||||
/*
|
||||
* Trap other states that are not explicitly
|
||||
* coded to dump information:
|
||||
*/
|
||||
default:
|
||||
snprintf(s, sizeof(s), "sigmask (hi) ");
|
||||
__sys_write(fd, s, strlen(s));
|
||||
for (i = _SIG_WORDS - 1; i >= 0; i--) {
|
||||
snprintf(s, sizeof(s), "%08x ",
|
||||
pthread->sigmask.__bits[i]);
|
||||
__sys_write(fd, s, strlen(s));
|
||||
}
|
||||
snprintf(s, sizeof(s), "(lo)\n");
|
||||
__sys_write(fd, s, strlen(s));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Set the thread name for debug: */
|
||||
/* Set the thread name for debug. */
|
||||
void
|
||||
_pthread_set_name_np(pthread_t thread, char *name)
|
||||
{
|
||||
/* Check if the caller has specified a valid thread: */
|
||||
#if 0
|
||||
struct pthread *curthread = _get_curthread();
|
||||
|
||||
if (thread != NULL && thread->magic == THR_MAGIC) {
|
||||
THR_THREAD_LOCK(curthread, thread);
|
||||
if (thread->name != NULL) {
|
||||
/* Free space for previous name. */
|
||||
free(thread->name);
|
||||
thread->name = NULL;
|
||||
}
|
||||
thread->name = strdup(name);
|
||||
if (name != NULL)
|
||||
thread->name = strdup(name);
|
||||
THR_THREAD_UNLOCK(curthread, thread);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue