Commit c62c46f3 authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from trunk.

parents bbd347f5 f01769f9
2012-04-21 Paul Eggert <eggert@cs.ucla.edu>
2012-04-22 Paul Eggert <eggert@cs.ucla.edu>
Fix integer width and related bugs (Bug#9874).
* alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
......@@ -790,6 +790,17 @@
rather than rolling our own approximation.
(SCROLL_BAR_VEC_SIZE): Remove; not used.
2012-04-22 Leo Liu <sdl.web@gmail.com>
* sysdep.c (list_system_processes): Support Darwin (Bug#5725).
2012-04-22 Paul Eggert <eggert@cs.ucla.edu>
* sysdep.c [__FreeBSD__]: Minor cleanups.
(list_system_processes, system_process_attributes) [__FreeBSD__]:
Use Emacs indenting style more consistently. Avoid some casts.
Use 'double' consistently rather than mixing 'float' and 'double'.
2012-04-21 Eduard Wiebe <usenet@pusto.de>
* sysdep.c (list_system_processes, system_process_attributes): Add
......
......@@ -44,6 +44,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <math.h>
#endif
#ifdef DARWIN_OS
#include <sys/sysctl.h>
#endif
#ifdef WINDOWSNT
#define read sys_read
#define write sys_write
......@@ -2537,12 +2541,16 @@ list_system_processes (void)
return proclist;
}
#elif defined (__FreeBSD__)
#elif defined BSD_SYSTEM
Lisp_Object
list_system_processes ()
list_system_processes (void)
{
#ifdef DARWIN_OS
int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL};
#else
int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PROC};
#endif
size_t len;
struct kinfo_proc *procs;
size_t i;
......@@ -2552,20 +2560,26 @@ list_system_processes ()
if (sysctl (mib, 3, NULL, &len, NULL, 0) != 0)
return proclist;
procs = xmalloc (len);
if (sysctl (mib, 3, procs, &len, NULL, 0) != 0)
{
xfree (procs);
return proclist;
}
GCPRO1 (proclist);
len /= sizeof (struct kinfo_proc);
for (i = 0; i < len; i++)
proclist = Fcons (make_fixnum_or_float (procs[i].ki_pid), proclist);
{
#ifdef DARWIN_OS
proclist = Fcons (make_fixnum_or_float (procs[i].kp_proc.p_pid), proclist);
#else
proclist = Fcons (make_fixnum_or_float (procs[i].ki_pid), proclist);
#endif
}
UNGCPRO;
xfree (procs);
return proclist;
......@@ -3118,13 +3132,13 @@ system_process_attributes (Lisp_Object pid)
return attrs;
}
#elif defined(__FreeBSD__)
#elif defined __FreeBSD__
Lisp_Object
system_process_attributes (Lisp_Object pid)
{
int proc_id;
int pagesize = getpagesize();
int pagesize = getpagesize ();
int npages;
int fscale;
struct passwd *pw;
......@@ -3133,33 +3147,33 @@ system_process_attributes (Lisp_Object pid)
size_t len;
char args[MAXPATHLEN];
EMACS_TIME t, now;
int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PID};
struct kinfo_proc proc;
size_t proclen = sizeof(proc);
size_t proclen = sizeof proc;
struct gcpro gcpro1, gcpro2;
Lisp_Object attrs = Qnil;
Lisp_Object decoded_comm;
CHECK_NUMBER_OR_FLOAT (pid);
proc_id = FLOATP (pid) ? XFLOAT_DATA (pid) : XINT (pid);
mib[3] = proc_id;
if (sysctl (mib, 4, &proc, &proclen, NULL, 0) != 0)
return attrs;
GCPRO2 (attrs, decoded_comm);
attrs = Fcons (Fcons (Qeuid, make_fixnum_or_float(proc.ki_uid)), attrs);
attrs = Fcons (Fcons (Qeuid, make_fixnum_or_float (proc.ki_uid)), attrs);
BLOCK_INPUT;
pw = getpwuid (proc.ki_uid);
UNBLOCK_INPUT;
if (pw)
attrs = Fcons (Fcons (Quser, build_string (pw->pw_name)), attrs);
attrs = Fcons (Fcons (Qegid, make_fixnum_or_float(proc.ki_svgid)), attrs);
attrs = Fcons (Fcons (Qegid, make_fixnum_or_float (proc.ki_svgid)), attrs);
BLOCK_INPUT;
gr = getgrgid (proc.ki_svgid);
......@@ -3170,7 +3184,7 @@ system_process_attributes (Lisp_Object pid)
decoded_comm = code_convert_string_norecord
(make_unibyte_string (proc.ki_comm, strlen (proc.ki_comm)),
Vlocale_coding_system, 0);
attrs = Fcons (Fcons (Qcomm, decoded_comm), attrs);
{
char state[2] = {'\0', '\0'};
......@@ -3183,7 +3197,7 @@ system_process_attributes (Lisp_Object pid)
case SSLEEP:
state[0] = 'S';
break;
case SLOCK:
state[0] = 'D';
break;
......@@ -3191,14 +3205,14 @@ system_process_attributes (Lisp_Object pid)
case SZOMB:
state[0] = 'Z';
break;
case SSTOP:
state[0] = 'T';
break;
}
attrs = Fcons (Fcons (Qstate, build_string (state)), attrs);
}
attrs = Fcons (Fcons (Qppid, make_fixnum_or_float (proc.ki_ppid)), attrs);
attrs = Fcons (Fcons (Qpgrp, make_fixnum_or_float (proc.ki_pgid)), attrs);
attrs = Fcons (Fcons (Qsess, make_fixnum_or_float (proc.ki_sid)), attrs);
......@@ -3208,7 +3222,7 @@ system_process_attributes (Lisp_Object pid)
UNBLOCK_INPUT;
if (ttyname)
attrs = Fcons (Fcons (Qtty, build_string (ttyname)), attrs);
attrs = Fcons (Fcons (Qtpgid, make_fixnum_or_float (proc.ki_tpgid)), attrs);
attrs = Fcons (Fcons (Qminflt, make_fixnum_or_float (proc.ki_rusage.ru_minflt)), attrs);
attrs = Fcons (Fcons (Qmajflt, make_fixnum_or_float (proc.ki_rusage.ru_majflt)), attrs);
......@@ -3220,50 +3234,52 @@ system_process_attributes (Lisp_Object pid)
make_number (EMACS_SECS (ts) & 0xffff), \
make_number (EMACS_USECS (ts)))
attrs = Fcons (Fcons (Qutime, TIMELIST(proc.ki_rusage.ru_utime)), attrs);
attrs = Fcons (Fcons (Qstime, TIMELIST(proc.ki_rusage.ru_stime)), attrs);
attrs = Fcons (Fcons (Qutime, TIMELIST (proc.ki_rusage.ru_utime)), attrs);
attrs = Fcons (Fcons (Qstime, TIMELIST (proc.ki_rusage.ru_stime)), attrs);
EMACS_ADD_TIME (t, proc.ki_rusage.ru_utime, proc.ki_rusage.ru_stime);
attrs = Fcons (Fcons (Qtime, TIMELIST(t)), attrs);
attrs = Fcons (Fcons (Qtime, TIMELIST (t)), attrs);
attrs = Fcons (Fcons (Qcutime, TIMELIST(proc.ki_rusage_ch.ru_utime)), attrs);
attrs = Fcons (Fcons (Qcstime, TIMELIST(proc.ki_rusage_ch.ru_utime)), attrs);
attrs = Fcons (Fcons (Qcutime, TIMELIST (proc.ki_rusage_ch.ru_utime)), attrs);
attrs = Fcons (Fcons (Qcstime, TIMELIST (proc.ki_rusage_ch.ru_utime)), attrs);
EMACS_ADD_TIME (t, proc.ki_rusage_ch.ru_utime, proc.ki_rusage_ch.ru_stime);
attrs = Fcons (Fcons (Qctime, TIMELIST(t)), attrs);
attrs = Fcons (Fcons (Qctime, TIMELIST (t)), attrs);
attrs = Fcons (Fcons (Qthcount, make_fixnum_or_float (proc.ki_numthreads)), attrs);
attrs = Fcons (Fcons (Qthcount, make_fixnum_or_float (proc.ki_numthreads)),
attrs);
attrs = Fcons (Fcons (Qpri, make_number (proc.ki_pri.pri_native)), attrs);
attrs = Fcons (Fcons (Qnice, make_number (proc.ki_nice)), attrs);
attrs = Fcons (Fcons (Qstart, TIMELIST(proc.ki_start)), attrs);
attrs = Fcons (Fcons (Qstart, TIMELIST (proc.ki_start)), attrs);
attrs = Fcons (Fcons (Qvsize, make_number (proc.ki_size >> 10)), attrs);
attrs = Fcons (Fcons (Qrss, make_number (proc.ki_rssize * pagesize >> 10)), attrs);
attrs = Fcons (Fcons (Qrss, make_number (proc.ki_rssize * pagesize >> 10)),
attrs);
EMACS_GET_TIME (now);
EMACS_SUB_TIME (t, now, proc.ki_start);
attrs = Fcons (Fcons (Qetime, TIMELIST(t)), attrs);
attrs = Fcons (Fcons (Qetime, TIMELIST (t)), attrs);
#undef TIMELIST
len = sizeof(fscale);
len = sizeof fscale;
if (sysctlbyname ("kern.fscale", &fscale, &len, NULL, 0) == 0)
{
float pcpu;
double pcpu;
fixpt_t ccpu;
len = sizeof (ccpu);
len = sizeof ccpu;
if (sysctlbyname ("kern.ccpu", &ccpu, &len, NULL, 0) == 0)
{
pcpu = 100.0 * ((double) proc.ki_pctcpu / fscale)
/ (1.0 - exp(proc.ki_swtime * log((double) ccpu / fscale)));
attrs = Fcons (Fcons (Qpcpu, make_fixnum_or_float(pcpu)), attrs);
pcpu = (100.0 * proc.ki_pctcpu / fscale
/ (1 - exp (proc.ki_swtime * log ((double) ccpu / fscale))));
attrs = Fcons (Fcons (Qpcpu, make_fixnum_or_float (pcpu)), attrs);
}
}
len = sizeof(npages);
len = sizeof npages;
if (sysctlbyname ("hw.availpages", &npages, &len, NULL, 0) == 0)
{
float pmem = proc.ki_flag & P_INMEM
? 100.0 * ((float) proc.ki_rssize / npages)
: 0.0;
attrs = Fcons (Fcons (Qpmem, make_fixnum_or_float(pmem)), attrs);
double pmem = (proc.ki_flag & P_INMEM
? 100.0 * proc.ki_rssize / npages
: 0);
attrs = Fcons (Fcons (Qpmem, make_fixnum_or_float (pmem)), attrs);
}
mib[2] = KERN_PROC_ARGS;
......@@ -3277,13 +3293,14 @@ system_process_attributes (Lisp_Object pid)
args[i] = ' ';
}
decoded_comm = code_convert_string_norecord
(make_unibyte_string (args, strlen (args)),
Vlocale_coding_system, 0);
decoded_comm =
(code_convert_string_norecord
(make_unibyte_string (args, strlen (args)),
Vlocale_coding_system, 0));
attrs = Fcons (Fcons (Qargs, decoded_comm), attrs);
}
UNGCPRO;
return attrs;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment