diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 06:16:15 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 06:16:15 +0000 |
| commit | 34e3b522eca7e8741cecb7c2241091f181d1bd1f (patch) | |
| tree | 3b64ac3aa4603539b8f8f384bc39998e29948900 /procfs | |
| parent | d4e6a14eb3fad1b43a21214db139db441025baf5 (diff) | |
| parent | 6fafeb146e9efd59140ea58cebd7dd38ae9a6379 (diff) | |
Merge branch 'upstream-merged'
Diffstat (limited to 'procfs')
| -rw-r--r-- | procfs/process.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/procfs/process.c b/procfs/process.c index 6652a4e9..17a38ea8 100644 --- a/procfs/process.c +++ b/procfs/process.c @@ -81,6 +81,12 @@ static long long int timeval_jiffies (time_value_t tv) return secs * opt_clk_tck / 1000000.; } +static const char *args_filename (const char *name) +{ + char *sp = strrchr (name, '/'); + return sp != NULL && *(sp + 1) != '\0' ? sp + 1 : name; +} + /* Actual content generators */ static ssize_t @@ -126,7 +132,7 @@ process_file_gc_stat (struct proc_stat *ps, char **contents) "%u %u " /* RT priority and policy */ "%llu " /* aggregated block I/O delay */ "\n", - proc_stat_pid (ps), proc_stat_args (ps), state_char (ps), + proc_stat_pid (ps), args_filename (proc_stat_args (ps)), state_char (ps), pi->ppid, pi->pgrp, pi->session, 0, 0, /* no such thing as a major:minor for ctty */ 0, /* no such thing as CLONE_* flags on Hurd */ @@ -178,7 +184,7 @@ process_file_gc_status (struct proc_stat *ps, char **contents) "VmRSS:\t%8u kB\n" "VmHWM:\t%8u kB\n" /* ie. resident peak */ "Threads:\t%u\n", - proc_stat_args (ps), + args_filename (proc_stat_args (ps)), state_string (ps), proc_stat_pid (ps), /* XXX will need more work for threads */ proc_stat_pid (ps), |