Author: Matti Picus <[email protected]>
Branch:
Changeset: r94496:cb8878f4cca1
Date: 2018-05-07 08:25 +0300
http://bitbucket.org/pypy/pypy/changeset/cb8878f4cca1/
Log: resync with vmprof upstream, the typo should be fixed there first
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -15,3 +15,6 @@
Make sure 'blocking-ness' of socket is set along with default timeout
+.. branch: crypt_h
+
+Include crypt.h for crypt() on Linux
diff --git a/rpython/rlib/rvmprof/src/shared/vmp_stack.c
b/rpython/rlib/rvmprof/src/shared/vmp_stack.c
--- a/rpython/rlib/rvmprof/src/shared/vmp_stack.c
+++ b/rpython/rlib/rvmprof/src/shared/vmp_stack.c
@@ -214,7 +214,7 @@
ret = unw_getcontext(&uc);
if (ret < 0) {
// could not initialize lib unwind cursor and context
- fprintf(stderr, "WARNING: unw_getcontext did not retrieve context,
switching to python profiling mode \n");
+ fprintf(stderr, "WARNING: unw_getcontext did not retreive context,
switching to python profiling mode \n");
vmp_native_disable();
return vmp_walk_and_record_python_stack_only(frame, result, max_depth,
0, pc);
}
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
