Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

zed: print combined system/user time after ZEDLET death 

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #11834
This commit is contained in:
наб 2021-04-02 14:10:31 +02:00 committed by Brian Behlendorf
parent fa991f2a47
commit b73e40a5ad
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/zed/zed_exec.c
View File

@ -20,6 +20,7 @@
#include <string.h> #include <string.h>
#include <stddef.h> #include <stddef.h>
#include <sys/avl.h> #include <sys/avl.h>
#include <sys/resource.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <time.h> #include <time.h>
@ -175,6 +176,7 @@ _zed_exec_fork_child(uint64_t eid, const char *dir, const char *prog,
node->pid = pid; node->pid = pid;
node->eid = eid; node->eid = eid;
node->name = strdup(prog); node->name = strdup(prog);
(void) pthread_mutex_lock(&_launched_processes_lock); (void) pthread_mutex_lock(&_launched_processes_lock);
avl_add(&_launched_processes, node); avl_add(&_launched_processes, node);
(void) pthread_mutex_unlock(&_launched_processes_lock); (void) pthread_mutex_unlock(&_launched_processes_lock);
@ -191,6 +193,7 @@ _reap_children(void *arg)
struct launched_process_node node, *pnode; struct launched_process_node node, *pnode;
pid_t pid; pid_t pid;
int status; int status;
struct rusage usage;
struct sigaction sa = {}; struct sigaction sa = {};
(void) sigfillset(&sa.sa_mask); (void) sigfillset(&sa.sa_mask);
@ -203,7 +206,7 @@ _reap_children(void *arg)
(void) sigaction(SIGCHLD, &sa, NULL); (void) sigaction(SIGCHLD, &sa, NULL);
for (_reap_children_stop = B_FALSE; !_reap_children_stop; ) { for (_reap_children_stop = B_FALSE; !_reap_children_stop; ) {
pid = waitpid(0, &status, 0); pid = wait4(0, &status, 0, &usage);
if (pid == (pid_t)-1) { if (pid == (pid_t)-1) {
if (errno == ECHILD) if (errno == ECHILD)
@ -227,21 +230,37 @@ _reap_children(void *arg)
__atomic_add_fetch(&_launched_processes_limit, 1, __atomic_add_fetch(&_launched_processes_limit, 1,
__ATOMIC_SEQ_CST); __ATOMIC_SEQ_CST);
usage.ru_utime.tv_sec += usage.ru_stime.tv_sec;
usage.ru_utime.tv_usec += usage.ru_stime.tv_usec;
usage.ru_utime.tv_sec +=
usage.ru_utime.tv_usec / (1000 * 1000);
usage.ru_utime.tv_usec %= 1000 * 1000;
if (WIFEXITED(status)) { if (WIFEXITED(status)) {
zed_log_msg(LOG_INFO, zed_log_msg(LOG_INFO,
"Finished \"%s\" eid=%llu pid=%d exit=%d", "Finished \"%s\" eid=%llu pid=%d "
"time=%llu.%06us exit=%d",
node.name, node.eid, pid, node.name, node.eid, pid,
(unsigned long long) usage.ru_utime.tv_sec,
(unsigned int) usage.ru_utime.tv_usec,
WEXITSTATUS(status)); WEXITSTATUS(status));
} else if (WIFSIGNALED(status)) { } else if (WIFSIGNALED(status)) {
zed_log_msg(LOG_INFO, zed_log_msg(LOG_INFO,
"Finished \"%s\" eid=%llu pid=%d sig=%d/%s", "Finished \"%s\" eid=%llu pid=%d "
node.name, node.eid, pid, WTERMSIG(status), "time=%llu.%06us sig=%d/%s",
node.name, node.eid, pid,
(unsigned long long) usage.ru_utime.tv_sec,
(unsigned int) usage.ru_utime.tv_usec,
WTERMSIG(status),
strsignal(WTERMSIG(status))); strsignal(WTERMSIG(status)));
} else { } else {
zed_log_msg(LOG_INFO, zed_log_msg(LOG_INFO,
"Finished \"%s\" eid=%llu pid=%d " "Finished \"%s\" eid=%llu pid=%d "
"status=0x%X", "time=%llu.%06us status=0x%X",
node.name, node.eid, (unsigned int) status); node.name, node.eid,
(unsigned long long) usage.ru_utime.tv_sec,
(unsigned int) usage.ru_utime.tv_usec,
(unsigned int) status);
} }
free(node.name); free(node.name);