aboutsummaryrefslogtreecommitdiffstats
path: root/src/sysdep.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/sysdep.c')
-rw-r--r--src/sysdep.c24
1 files changed, 15 insertions, 9 deletions
diff --git a/src/sysdep.c b/src/sysdep.c
index 875f343135e..42f53a75e9d 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -3116,7 +3116,7 @@ timeval_to_EMACS_TIME (struct timeval t)
3116} 3116}
3117 3117
3118static Lisp_Object 3118static Lisp_Object
3119TIMELIST (struct timeval t) 3119make_lisp_timeval (struct timeval t)
3120{ 3120{
3121 return make_lisp_time (timeval_to_EMACS_TIME (t)); 3121 return make_lisp_time (timeval_to_EMACS_TIME (t));
3122} 3122}
@@ -3216,32 +3216,38 @@ system_process_attributes (Lisp_Object pid)
3216 attrs = Fcons (Fcons (Qcminflt, make_number (proc.ki_rusage_ch.ru_minflt)), attrs); 3216 attrs = Fcons (Fcons (Qcminflt, make_number (proc.ki_rusage_ch.ru_minflt)), attrs);
3217 attrs = Fcons (Fcons (Qcmajflt, make_number (proc.ki_rusage_ch.ru_majflt)), attrs); 3217 attrs = Fcons (Fcons (Qcmajflt, make_number (proc.ki_rusage_ch.ru_majflt)), attrs);
3218 3218
3219 attrs = Fcons (Fcons (Qutime, TIMELIST (proc.ki_rusage.ru_utime)), attrs); 3219 attrs = Fcons (Fcons (Qutime, make_lisp_timeval (proc.ki_rusage.ru_utime)),
3220 attrs = Fcons (Fcons (Qstime, TIMELIST (proc.ki_rusage.ru_stime)), attrs); 3220 attrs);
3221 attrs = Fcons (Fcons (Qstime, make_lisp_timeval (proc.ki_rusage.ru_stime)),
3222 attrs);
3221 EMACS_ADD_TIME (t, 3223 EMACS_ADD_TIME (t,
3222 timeval_to_EMACS_TIME (proc.ki_rusage.ru_utime), 3224 timeval_to_EMACS_TIME (proc.ki_rusage.ru_utime),
3223 timeval_to_EMACS_TIME (proc.ki_rusage.ru_stime)); 3225 timeval_to_EMACS_TIME (proc.ki_rusage.ru_stime));
3224 attrs = Fcons (Fcons (Qtime, TIMELIST (t)), attrs); 3226 attrs = Fcons (Fcons (Qtime, make_lisp_time (t)), attrs);
3225 3227
3226 attrs = Fcons (Fcons (Qcutime, TIMELIST (proc.ki_rusage_ch.ru_utime)), attrs); 3228 attrs = Fcons (Fcons (Qcutime,
3227 attrs = Fcons (Fcons (Qcstime, TIMELIST (proc.ki_rusage_ch.ru_utime)), attrs); 3229 make_lisp_timeval (proc.ki_rusage_ch.ru_utime)),
3230 attrs);
3231 attrs = Fcons (Fcons (Qcstime,
3232 make_lisp_timeval (proc.ki_rusage_ch.ru_utime)),
3233 attrs);
3228 EMACS_ADD_TIME (t, 3234 EMACS_ADD_TIME (t,
3229 timeval_to_EMACS_TIME (proc.ki_rusage_ch.ru_utime), 3235 timeval_to_EMACS_TIME (proc.ki_rusage_ch.ru_utime),
3230 timeval_to_EMACS_TIME (proc.ki_rusage_ch.ru_stime)); 3236 timeval_to_EMACS_TIME (proc.ki_rusage_ch.ru_stime));
3231 attrs = Fcons (Fcons (Qctime, TIMELIST (t)), attrs); 3237 attrs = Fcons (Fcons (Qctime, make_lisp_time (t)), attrs);
3232 3238
3233 attrs = Fcons (Fcons (Qthcount, make_fixnum_or_float (proc.ki_numthreads)), 3239 attrs = Fcons (Fcons (Qthcount, make_fixnum_or_float (proc.ki_numthreads)),
3234 attrs); 3240 attrs);
3235 attrs = Fcons (Fcons (Qpri, make_number (proc.ki_pri.pri_native)), attrs); 3241 attrs = Fcons (Fcons (Qpri, make_number (proc.ki_pri.pri_native)), attrs);
3236 attrs = Fcons (Fcons (Qnice, make_number (proc.ki_nice)), attrs); 3242 attrs = Fcons (Fcons (Qnice, make_number (proc.ki_nice)), attrs);
3237 attrs = Fcons (Fcons (Qstart, TIMELIST (proc.ki_start)), attrs); 3243 attrs = Fcons (Fcons (Qstart, make_lisp_timeval (proc.ki_start)), attrs);
3238 attrs = Fcons (Fcons (Qvsize, make_number (proc.ki_size >> 10)), attrs); 3244 attrs = Fcons (Fcons (Qvsize, make_number (proc.ki_size >> 10)), attrs);
3239 attrs = Fcons (Fcons (Qrss, make_number (proc.ki_rssize * pagesize >> 10)), 3245 attrs = Fcons (Fcons (Qrss, make_number (proc.ki_rssize * pagesize >> 10)),
3240 attrs); 3246 attrs);
3241 3247
3242 EMACS_GET_TIME (now); 3248 EMACS_GET_TIME (now);
3243 EMACS_SUB_TIME (t, now, timeval_to_EMACS_TIME (proc.ki_start)); 3249 EMACS_SUB_TIME (t, now, timeval_to_EMACS_TIME (proc.ki_start));
3244 attrs = Fcons (Fcons (Qetime, TIMELIST (t)), attrs); 3250 attrs = Fcons (Fcons (Qetime, make_lisp_time (t)), attrs);
3245 3251
3246 len = sizeof fscale; 3252 len = sizeof fscale;
3247 if (sysctlbyname ("kern.fscale", &fscale, &len, NULL, 0) == 0) 3253 if (sysctlbyname ("kern.fscale", &fscale, &len, NULL, 0) == 0)