@@ -1,8 +1,11 @@
+sudo: required
+dist: trusty
 language: python
 
 python:
   - 2.7
   - 3.4
+  - 3.5
 
 cache: apt
 
@@ -11,13 +14,14 @@ before_install:
   - sudo apt-get install -y python-dev
   - sudo apt-get install -y libdwarf-dev
   - sudo apt-get install -y libelfg0-dev
-  - sudo apt-get install -y libunwind7-dev
+  - sudo apt-get install -y libunwind8-dev
 
 install:
   - pip install .
 
 script:
   - py.test tests/ -vrs
+  - py.test vmprof/ -vrs
 
 notifications:
   irc:
 
@@ -0,0 +1 @@
+On windows, we handle all the threads, not just ones that are running.
@@ -0,0 +1,27 @@
+vmprof is a delicate piece of software. Following considerations should
+be present when developing it.
+
+Supported platform combinations (all combinations are supported):
+
+* pypy (>=4.1), cpython
+
+* windows, os x and linux
+
+CPython should be tested on both TeamCity and Travis, PyPy is more
+patchy since there is never a new enough version on either. Since PyPy
+only exercises the pure python part, please test it each time you change
+and interface between _vmprof and vmprof.
+
+Signals
+=======
+
+On OS X and Linux we handle signal handlers. This means that we have
+to be very very careful at what we can and cannot do. Notably, we can't
+use malloc, locks or refcounting in any of the signal handlers. Python data
+should be read-only and we should be prepared to read garbage or NULL
+from anything.
+
+On windows we use an external thread, so it's an imperative we freeze
+the thread we're inspecting. It's possible that the interpreter state
+handling is not thread safe in a way it should be, investigate how we
+can improve it.
@@ -7,14 +7,23 @@
 
 See https://vmprof.readthedocs.org for up to date info
 
-basic usage:
+## Basic usage
 
+###Linux
 ```console
 sudo apt-get install python-dev
 pip install vmprof
 python -m vmprof <your program> <your program args>
 ```
 
+###Windows
+Install Microsoft Visual C++ Compiler for Python 2.7
+	
+	pip install vmprof
+
+For development:
+	pip install -e .
+
 ## vmprofshow
 
 `vmprofshow` is a command line tool that comes with **VMprof** which can read profile files generated by **VMprof** and produce a nicely formatted output.
 
@@ -14,7 +14,8 @@ continuously taking samples of the call stack of the running program, at a
 given frequency. This is similar to tools like `vtune`_ or `gperftools`_: the
 main difference is that those tools target C and C-like languages and are not
 very helpful to profile higher-level languages which run on top of a virtual
-machine, while vmprof is designed specifically for them.
+machine, while vmprof is designed specifically for them. vmprof is also thread
+safe and will correctly display the information regardless of usage of threads.
 
 There are three primary modes. The recommended one is to use our server
 infrastructure for a web-based visualization of the result::
@@ -140,17 +141,16 @@ Example `config.ini` file::
 API
 ===
 
-
 There is also an API that can bring more details to the table,
-but consider it unstable. The current API usage is as follows::
+but consider it unstable. The current API usage is as follows:
 
 Module level functions
 ----------------------
 
-* ``vmprof.enable(fileno, period=0.099, memory=False)`` - enable writing ``vmprof`` data to a
-  file described by a fileno file descriptor. Timeout is in float seconds. The
-  minimal available resolution is 4ms, we're working on improving that
-  (note the default is 9.9ms). Passing ``memory=True`` will provide additional
+* ``vmprof.enable(fileno, period=0.00099, memory=False)`` - enable writing ``vmprof`` data to a
+  file described by a fileno file descriptor. Period is in float seconds. The
+  minimal available resolution is around 1ms, we're working on improving that
+  (note the default is 0.99ms). Passing ``memory=True`` will provide additional
   data in the form of total RSS of the process memory interspersed with
   tracebacks.
 
@@ -239,3 +239,10 @@ The machinery to gather the information has been the focus of the initial
 phase of vmprof development and now it is working well: we are currently
 focusing on the frontend to make sure we can process and display the info in
 useful ways.
+
+Links
+=====
+
+* `vmprof-flamegraph <https://pypi.python.org/pypi/vmprof-flamegraph>`_
+  Convert vmprof data into text format for
+  `flamegraph <http://www.brendangregg.com/FlameGraphs/cpuflamegraphs.html>`_
@@ -26,12 +26,13 @@
     name='vmprof',
     author='vmprof team',
     author_email='fijal@baroquesoftware.com',
-    version="0.2.5",
+    version="0.2.7",
     packages=find_packages(),
     description="Python's vmprof client",
     long_description='See https://vmprof.readthedocs.org/',
     url='https://github.com/vmprof/vmprof-python',
     install_requires=[
+        'requests',
         'six',
     ],
     setup_requires=['pytest-runner'],
 
@@ -4,15 +4,6 @@
 #include <frameobject.h>
 #include <signal.h>
 
-// for whatever reason python-dev decided to hide that one
-#if PY_MAJOR_VERSION >= 3 && !defined(_Py_atomic_load_relaxed)
-                             /* this was abruptly un-defined in 3.5.1 */
-void *volatile _PyThreadState_Current;
-   /* XXX simple volatile access is assumed atomic */
-#  define _Py_atomic_load_relaxed(pp)  (*(pp))
-#endif
-
-
 #define RPY_EXTERN static
 static PyObject* cpyprof_PyEval_EvalFrameEx(PyFrameObject *, int);
 #define VMPROF_ADDR_OF_TRAMPOLINE(x)  ((x) == &cpyprof_PyEval_EvalFrameEx)
 
@@ -0,0 +1,31 @@
+/* On OS X we can get RSS using the Mach API. */
+#include <mach/mach.h>
+#include <mach/message.h>
+#include <mach/kern_return.h>
+#include <mach/task_info.h>
+
+static mach_port_t mach_task;
+
+static int setup_rss(void)
+{
+    mach_task = mach_task_self();
+    return 0;
+}
+
+static int teardown_rss(void)
+{
+    return 0;
+}
+
+static long get_current_proc_rss(void)
+{
+    mach_msg_type_number_t out_count = MACH_TASK_BASIC_INFO_COUNT;
+    mach_task_basic_info_data_t taskinfo = { .resident_size = 0 };
+
+    kern_return_t error = task_info(mach_task, MACH_TASK_BASIC_INFO, (task_info_t)&taskinfo, &out_count);
+    if (error == KERN_SUCCESS) {
+        return taskinfo.resident_size / 1024;
+    } else {
+        return -1;
+    }
+}
@@ -0,0 +1,35 @@
+/* On normal Unices we can get RSS from '/proc/<pid>/status'. */
+static int proc_file = -1;
+
+static int setup_rss(void)
+{
+    char buf[128];
+
+    sprintf(buf, "/proc/%d/status", getpid());
+    proc_file = open(buf, O_RDONLY);
+    return proc_file;
+}
+
+static int teardown_rss(void) {
+    close(proc_file);
+    proc_file = -1;
+}
+
+static long get_current_proc_rss(void)
+{
+    char buf[1024];
+    int i = 0;
+
+    if (lseek(proc_file, 0, SEEK_SET) == -1)
+        return -1;
+    if (read(proc_file, buf, 1024) == -1)
+        return -1;
+    while (i < 1020) {
+        if (strncmp(buf + i, "VmRSS:\t", 7) == 0) {
+            i += 7;
+            return atoi(buf + i);
+        }
+        i++;
+    }
+    return -1;
+}
@@ -44,11 +44,9 @@ char *vmprof_init(int fd, double interval, int memory, char *interp_name)
         return "out of memory";
 #if defined(__unix__) || defined(__APPLE__)
     current_codes = NULL;
-#endif
-
-#if !defined(__unix__)
+#else
     if (memory)
-        return "memory tracking not supported on non-linux";
+        return "memory tracking only supported on unix";
 #endif
     assert(fd >= 0);
     profile_file = fd;
@@ -97,3 +95,20 @@ static int opened_profile(char *interp_name, int memory)
     memcpy(&header.interp_name[4], interp_name, namelen);
     return _write_all((char*)&header, 5 * sizeof(long) + 4 + namelen);
 }
+
+// for whatever reason python-dev decided to hide that one
+#if PY_MAJOR_VERSION >= 3 && !defined(_Py_atomic_load_relaxed)
+                                 /* this was abruptly un-defined in 3.5.1 */
+    extern void *volatile _PyThreadState_Current;
+       /* XXX simple volatile access is assumed atomic */
+#  define _Py_atomic_load_relaxed(pp)  (*(pp))
+#endif
+ 
+PyThreadState* get_current_thread_state(void)
+{
+#if PY_MAJOR_VERSION >= 3
+    return (PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current);
+#else
+    return _PyThreadState_Current;
+#endif
+}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+On windows, we handle all the threads, not just ones that are running.`