| Index: third_party/psutil/psutil/_psutil_osx.h
|
| diff --git a/third_party/psutil/psutil/_psutil_osx.h b/third_party/psutil/psutil/_psutil_osx.h
|
| index ebef76474ec82ceb021300dff70991286062fbc7..a0378a774d33e7c3819a82ce7eff4c06faf42f23 100644
|
| --- a/third_party/psutil/psutil/_psutil_osx.h
|
| +++ b/third_party/psutil/psutil/_psutil_osx.h
|
| @@ -1,5 +1,9 @@
|
| /*
|
| - * $Id: _psutil_osx.h 780 2010-11-10 18:42:47Z jloden $
|
| + * $Id: _psutil_osx.h 1142 2011-10-05 18:45:49Z g.rodola $
|
| + *
|
| + * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
|
| + * Use of this source code is governed by a BSD-style license that can be
|
| + * found in the LICENSE file.
|
| *
|
| * OS X platform-specific module methods for _psutil_osx
|
| */
|
| @@ -10,15 +14,19 @@
|
| static PyObject* get_process_name(PyObject* self, PyObject* args);
|
| static PyObject* get_process_cmdline(PyObject* self, PyObject* args);
|
| static PyObject* get_process_ppid(PyObject* self, PyObject* args);
|
| -static PyObject* get_process_uid(PyObject* self, PyObject* args);
|
| -static PyObject* get_process_gid(PyObject* self, PyObject* args);
|
| +static PyObject* get_process_uids(PyObject* self, PyObject* args);
|
| +static PyObject* get_process_gids(PyObject* self, PyObject* args);
|
| static PyObject* get_cpu_times(PyObject* self, PyObject* args);
|
| static PyObject* get_process_create_time(PyObject* self, PyObject* args);
|
| static PyObject* get_memory_info(PyObject* self, PyObject* args);
|
| static PyObject* get_process_num_threads(PyObject* self, PyObject* args);
|
| +static PyObject* get_process_status(PyObject* self, PyObject* args);
|
| +static PyObject* get_process_threads(PyObject* self, PyObject* args);
|
| +static PyObject* get_process_open_files(PyObject* self, PyObject* args);
|
| +static PyObject* get_process_connections(PyObject* self, PyObject* args);
|
| +static PyObject* get_process_tty_nr(PyObject* self, PyObject* args);
|
|
|
| // --- system-related functions
|
| -static int pid_exists(long pid);
|
| static PyObject* get_pid_list(PyObject* self, PyObject* args);
|
| static PyObject* get_num_cpus(PyObject* self, PyObject* args);
|
| static PyObject* get_total_phymem(PyObject* self, PyObject* args);
|
| @@ -26,4 +34,8 @@ static PyObject* get_avail_phymem(PyObject* self, PyObject* args);
|
| static PyObject* get_total_virtmem(PyObject* self, PyObject* args);
|
| static PyObject* get_avail_virtmem(PyObject* self, PyObject* args);
|
| static PyObject* get_system_cpu_times(PyObject* self, PyObject* args);
|
| -
|
| +static PyObject* get_system_per_cpu_times(PyObject* self, PyObject* args);
|
| +static PyObject* get_system_boot_time(PyObject* self, PyObject* args);
|
| +static PyObject* get_disk_partitions(PyObject* self, PyObject* args);
|
| +static PyObject* get_network_io_counters(PyObject* self, PyObject* args);
|
| +static PyObject* get_disk_io_counters(PyObject* self, PyObject* args);
|
|
|