procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/sysdep.c (list_system_processes): Support Darwin.

Browse source 
Fixes: debbugs:5725
This commit is contained in:
Leo Liu 2012-04-22 10:58:23 +08:00
parent 5790543d1f
commit f01769f9ca
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
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.

18
src/sysdep.c
View file

@ -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
@ -2536,12 +2540,16 @@ list_system_processes (void)
return proclist;
}
#elif defined __FreeBSD__
#elif defined BSD_SYSTEM
Lisp_Object
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;
@ -2562,7 +2570,13 @@ list_system_processes (void)
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);