RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-30 07:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10345 from tchaikov/wip-dump-cmdline

Browse Source 
global/signal_handler: dump cmdline instead of arg[0]

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
This commit is contained in:
Yuri Weinstein 2016-07-26 15:47:18 -07:00 committed by GitHub
commit 71f393d786
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/global/signal_handler.cc
View File

@ -152,7 +152,7 @@ void install_standard_sighandlers(void)
#include "common/Thread.h"
#include <errno.h>
void get_name_by_pid(pid_t pid, char *task_name)
string get_name_by_pid(pid_t pid)
{
char proc_pid_path[PATH_MAX] = {0};
snprintf(proc_pid_path, PATH_MAX, "/proc/%d/cmdline", pid);
@ -163,18 +163,22 @@ void get_name_by_pid(pid_t pid, char *task_name)
derr << "Fail to open '" << proc_pid_path
<< "' error = " << cpp_strerror(fd)
<< dendl;
return;
return "<unknown>";
}
int ret = read(fd, task_name, PATH_MAX-1);
// assuming the cmdline length does not exceed PATH_MAX. if it
// really does, it's fine to return a truncated version.
char buf[PATH_MAX] = {0};
int ret = read(fd, buf, sizeof(buf));
close(fd);
if (ret < 0) {
ret = -errno;
derr << "Fail to read '" << proc_pid_path
<< "' error = " << cpp_strerror(ret)
derr << "Fail to read '" << proc_pid_path
<< "' error = " << cpp_strerror(ret)
<< dendl;
return "<unknown>";
}
close(fd);
std::replace(buf, buf + ret, '\0', ' ');
return string(buf, ret);
}
@ -283,14 +287,13 @@ struct SignalHandler : public Thread {
if (handlers[signum]) {
r = read(handlers[signum]->pipefd[0], &v, 1);
if (r == 1) {
char task_name[PATH_MAX] = "unknown";
siginfo_t * siginfo = &handlers[signum]->info_t;
get_name_by_pid(siginfo->si_pid, task_name);
derr << "received signal: " << sys_siglist[signum]
<< " from " << " PID: " << siginfo->si_pid
<< " task name: " << task_name
<< " UID: " << siginfo->si_uid
<< dendl;
string task_name = get_name_by_pid(siginfo->si_pid);
derr << "received signal: " << sys_siglist[signum]
<< " from " << " PID: " << siginfo->si_pid
<< " task name: " << task_name
<< " UID: " << siginfo->si_uid
<< dendl;
handlers[signum]->handler(signum);
}
}