[gentoo-commits] gentoo-x86 commit in dev-python/pypy/files: 1.9-get_python_lib_standard_lib-04ea518e5b71.patch 1.9-more-ignored-ops-a9a8faa76bca.patch 1.9-no-static-hack.patch 1.9-pybuffer-release-double-decref-4ec2a5b49386.patch 1.9-ssl-errors-25d3418150d2.patch 1.9-ssl-threads-2-25cd11066d95.patch 1.9-getargs-freelist-c26dc70ee340.patch 1.9-more-ignored-ops-146ddf82a279.patch 1.9-ssl-threads-1-34b3b5aac082.patch 1.9-signal-a33052b17f4e.patch

[Marien Zwart (marienz)]

marienz     12/06/17 15:29:17

  Added:                1.9-get_python_lib_standard_lib-04ea518e5b71.patch
                        1.9-more-ignored-ops-a9a8faa76bca.patch
                        1.9-no-static-hack.patch
                        1.9-pybuffer-release-double-decref-4ec2a5b49386.patch
                        1.9-ssl-errors-25d3418150d2.patch
                        1.9-ssl-threads-2-25cd11066d95.patch
                        1.9-getargs-freelist-c26dc70ee340.patch
                        1.9-more-ignored-ops-146ddf82a279.patch
                        1.9-ssl-threads-1-34b3b5aac082.patch
                        1.9-signal-a33052b17f4e.patch
  Log:
  Revision bump including several patches from upstream (including a fix for bug #421361), a fix needed for prefix (bug #420621, thanks to XU Benda) and support for picking up -j from MAKEOPTS (bug #403991).
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-python/pypy/files/1.9-get_python_lib_standard_lib-04ea518e5b71.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-get_python_lib_standard_lib-04ea518e5b71.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-get_python_lib_standard_lib-04ea518e5b71.patch?rev=1.1&content-type=text/plain

Index: 1.9-get_python_lib_standard_lib-04ea518e5b71.patch
===================================================================
changeset:   55566:04ea518e5b71
parent:      55554:fa1ecb3a52df
user:        Armin Rigo <arigo@×××××.org>
date:        Mon Jun 11 10:28:26 2012 +0200
summary:     issue1164: get_python_lib(standard_lib=1) should probably just

diff -r fa1ecb3a52df -r 04ea518e5b71 lib-python/2.7/distutils/sysconfig_pypy.py
--- a/lib-python/2.7/distutils/sysconfig_pypy.py	Sun Jun 10 23:49:16 2012 +0300
+++ b/lib-python/2.7/distutils/sysconfig_pypy.py	Mon Jun 11 10:28:26 2012 +0200
@@ -39,11 +39,10 @@
     If 'prefix' is supplied, use it instead of sys.prefix or
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """
-    if standard_lib:
-        raise DistutilsPlatformError(
-            "calls to get_python_lib(standard_lib=1) cannot succeed")
     if prefix is None:
         prefix = PREFIX
+    if standard_lib:
+        return os.path.join(prefix, "lib-python", get_python_version())
     return os.path.join(prefix, 'site-packages')
 
 




1.1                  dev-python/pypy/files/1.9-more-ignored-ops-a9a8faa76bca.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-more-ignored-ops-a9a8faa76bca.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-more-ignored-ops-a9a8faa76bca.patch?rev=1.1&content-type=text/plain

Index: 1.9-more-ignored-ops-a9a8faa76bca.patch
===================================================================
changeset:   55523:a9a8faa76bca
parent:      55518:f0daafccddc5
user:        Armin Rigo <arigo@×××××.org>
date:        Fri Jun 08 19:55:01 2012 +0200
summary:     Add more instructions to ignore by copying from Intel docs.

diff -r f0daafccddc5 -r a9a8faa76bca pypy/translator/c/gcc/trackgcroot.py
--- a/pypy/translator/c/gcc/trackgcroot.py	Fri Jun 08 18:30:54 2012 +0200
+++ b/pypy/translator/c/gcc/trackgcroot.py	Fri Jun 08 19:55:01 2012 +0200
@@ -483,8 +483,10 @@
         'inc', 'dec', 'not', 'neg', 'or', 'and', 'sbb', 'adc',
         'shl', 'shr', 'sal', 'sar', 'rol', 'ror', 'mul', 'imul', 'div', 'idiv',
         'bswap', 'bt', 'rdtsc',
-        'punpck', 'pshufd', 'pcmp', 'pand', 'psllw', 'pslld', 'psllq',
-        'paddq', 'pinsr', 'pmul', 'psrl',
+        'pabs', 'pack', 'padd', 'palign', 'pand', 'pavg', 'pcmp', 'pextr',
+        'phadd', 'phsub', 'pinsr', 'pmadd', 'pmax', 'pmin', 'pmovmsk',
+        'pmul', 'por', 'psadb', 'pshuf', 'psign', 'psll', 'psra', 'psrl',
+        'psub', 'punpck', 'pxor',
         # all vectors don't produce pointers
         'v',
         # sign-extending moves should not produce GC pointers
@@ -492,7 +494,7 @@
         # zero-extending moves should not produce GC pointers
         'movz', 
         # locked operations should not move GC pointers, at least so far
-        'lock',
+        'lock', 'pause',
         ])
 
     # a partial list is hopefully good enough for now; it's all to support




1.1                  dev-python/pypy/files/1.9-no-static-hack.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-no-static-hack.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-no-static-hack.patch?rev=1.1&content-type=text/plain

Index: 1.9-no-static-hack.patch
===================================================================
Remove logic that links to libssl and libcrypto statically if
possible. Just always link dynamically: Gentoo is expected to have
sane dynamic libraries for us to use, and our users are not expected
to copy their pypy binary to a system with an incompatible
libssl/libcrypto and expect it to work.

Patch contributed by XU Benda <heroxbd@g.o>.

--- pypy/rlib/ropenssl.py	2012-06-07 21:24:48.000000000 +0900
+++ pypy/rlib/ropenssl.py.new	2012-06-10 17:28:29.000000000 +0900
@@ -19,18 +19,8 @@ if sys.platform == 'win32' and platform.
         # so that openssl/ssl.h can repair this nonsense.
         'wincrypt.h']
 else:
-    libraries = ['z']
+    libraries = ['z', 'ssl', 'crypto']
     includes = []
-    if (sys.platform.startswith('linux') and
-        os.path.exists('/usr/lib/libssl.a') and
-        os.path.exists('/usr/lib/libcrypto.a')):
-        # use static linking to avoid the infinite
-        # amount of troubles due to symbol versions
-        # and 0.9.8/1.0.0
-        link_files += ['/usr/lib/libssl.a', '/usr/lib/libcrypto.a']
-        testonly_libraries += ['ssl', 'crypto']
-    else:
-        libraries += ['ssl', 'crypto']
 
 includes += [
     'openssl/ssl.h', 



1.1                  dev-python/pypy/files/1.9-pybuffer-release-double-decref-4ec2a5b49386.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-pybuffer-release-double-decref-4ec2a5b49386.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-pybuffer-release-double-decref-4ec2a5b49386.patch?rev=1.1&content-type=text/plain

Index: 1.9-pybuffer-release-double-decref-4ec2a5b49386.patch
===================================================================
changeset:   55598:4ec2a5b49386
tag:         tip
user:        Armin Rigo <arigo@×××××.org>
date:        Mon Jun 11 19:54:04 2012 +0200
summary:     Test and fix (thanks marienz)

diff -r cdb2d1b3d0da -r 4ec2a5b49386 pypy/module/cpyext/object.py
--- a/pypy/module/cpyext/object.py	Mon Jun 11 19:41:35 2012 +0200
+++ b/pypy/module/cpyext/object.py	Mon Jun 11 19:54:04 2012 +0200
@@ -489,3 +489,4 @@
     provides a subset of CPython's behavior.
     """
     Py_DecRef(space, view.c_obj)
+    view.c_obj = lltype.nullptr(PyObject.TO)
diff -r cdb2d1b3d0da -r 4ec2a5b49386 pypy/module/cpyext/test/test_object.py
--- a/pypy/module/cpyext/test/test_object.py	Mon Jun 11 19:41:35 2012 +0200
+++ b/pypy/module/cpyext/test/test_object.py	Mon Jun 11 19:54:04 2012 +0200
@@ -363,6 +363,10 @@
      * Py_buffer and the string should be released as well.
      */
     PyBuffer_Release(&buf);
+    assert(!buf.obj);
+    PyBuffer_Release(&buf);   /* call again, should not have any more effect */
+    PyBuffer_Release(&buf);
+    PyBuffer_Release(&buf);
 
     Py_RETURN_NONE;
                  """)])




1.1                  dev-python/pypy/files/1.9-ssl-errors-25d3418150d2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-ssl-errors-25d3418150d2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-ssl-errors-25d3418150d2.patch?rev=1.1&content-type=text/plain

Index: 1.9-ssl-errors-25d3418150d2.patch
===================================================================
# HG changeset patch
# User Amaury Forgeot d'Arc <amauryfa@×××××.com>
# Date 1339449304 -7200
# Node ID 25d3418150d2e2820913043432f568e31bf3a19a
# Parent  33c305197a3d05217be023fa39a692ad89802317
issue1169: _ssl errors outside any SSL context should use ERR_peek_last_error()

diff -r 33c305197a3d05217be023fa39a692ad89802317 -r 25d3418150d2e2820913043432f568e31bf3a19a pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py	Mon Jun 11 23:01:31 2012 +0200
+++ b/pypy/module/_ssl/interp_ssl.py	Mon Jun 11 23:15:04 2012 +0200
@@ -789,7 +789,11 @@
 def _ssl_seterror(space, ss, ret):
     assert ret <= 0
 
-    if ss and ss.ssl:
+    if ss is None:
+        errval = libssl_ERR_peek_last_error()
+        errstr = rffi.charp2str(libssl_ERR_error_string(errval, None))
+        return ssl_error(space, errstr, errval)
+    elif ss.ssl:
         err = libssl_SSL_get_error(ss.ssl, ret)
     else:
         err = SSL_ERROR_SSL
diff -r 33c305197a3d05217be023fa39a692ad89802317 -r 25d3418150d2e2820913043432f568e31bf3a19a pypy/rlib/ropenssl.py
--- a/pypy/rlib/ropenssl.py	Mon Jun 11 23:01:31 2012 +0200
+++ b/pypy/rlib/ropenssl.py	Mon Jun 11 23:15:04 2012 +0200
@@ -259,6 +259,7 @@
 ssl_external('SSL_CIPHER_get_bits', [SSL_CIPHER, rffi.INTP], rffi.INT)
 
 ssl_external('ERR_get_error', [], rffi.INT)
+ssl_external('ERR_peek_last_error', [], rffi.INT)
 ssl_external('ERR_error_string', [rffi.ULONG, rffi.CCHARP], rffi.CCHARP)
 
 ssl_external('SSL_free', [SSL], lltype.Void)



1.1                  dev-python/pypy/files/1.9-ssl-threads-2-25cd11066d95.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-ssl-threads-2-25cd11066d95.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-ssl-threads-2-25cd11066d95.patch?rev=1.1&content-type=text/plain

Index: 1.9-ssl-threads-2-25cd11066d95.patch
===================================================================
changeset:   55578:25cd11066d95
tag:         tip
user:        Armin Rigo <arigo@×××××.org>
date:        Mon Jun 11 15:19:38 2012 +0200
summary:     Fix.

diff -r e701bca5f3b9 -r 25cd11066d95 pypy/module/_ssl/thread_lock.py
--- a/pypy/module/_ssl/thread_lock.py	Mon Jun 11 15:01:00 2012 +0200
+++ b/pypy/module/_ssl/thread_lock.py	Mon Jun 11 15:19:38 2012 +0200
@@ -39,9 +39,9 @@
         return;
 
     if (mode & CRYPTO_LOCK) {
-        RPyThreadAcquireLock(_ssl_locks[n], 1);
+        RPyThreadAcquireLock(_ssl_locks + n, 1);
     } else {
-        RPyThreadReleaseLock(_ssl_locks[n]);
+        RPyThreadReleaseLock(_ssl_locks + n);
     }
 }
 




1.1                  dev-python/pypy/files/1.9-getargs-freelist-c26dc70ee340.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-getargs-freelist-c26dc70ee340.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-getargs-freelist-c26dc70ee340.patch?rev=1.1&content-type=text/plain

Index: 1.9-getargs-freelist-c26dc70ee340.patch
===================================================================
# HG changeset patch
# User Armin Rigo <arigo@×××××.org>
# Date 1339595299 -7200
# Node ID c26dc70ee34018efeec8b789d40ec78478304bc0
# Parent  c7dff5469611f03946466caed17c567c4ea5d8d0
Fix for the issue of abuse of PyCapsules, relying on immediate
destruction, as CPython does.  This problem was first described in
https://bazaar.launchpad.net/~exarkun/pyopenssl/trunk/revision/166.
The fix is rather obvious and consist in a *negative* total amount
of lines :-/

diff -r c7dff5469611f03946466caed17c567c4ea5d8d0 -r c26dc70ee34018efeec8b789d40ec78478304bc0 pypy/module/cpyext/src/getargs.c
--- a/pypy/module/cpyext/src/getargs.c	Wed Jun 13 13:19:05 2012 +0200
+++ b/pypy/module/cpyext/src/getargs.c	Wed Jun 13 15:48:19 2012 +0200
@@ -24,14 +24,15 @@
 
 
 /* Forward */
+typedef struct freelist_s freelist_t;
 static int vgetargs1(PyObject *, const char *, va_list *, int);
 static void seterror(int, const char *, int *, const char *, const char *);
 static char *convertitem(PyObject *, const char **, va_list *, int, int *,
-                         char *, size_t, PyObject **);
+                         char *, size_t, freelist_t **);
 static char *converttuple(PyObject *, const char **, va_list *, int,
-                          int *, char *, size_t, int, PyObject **);
+                          int *, char *, size_t, int, freelist_t **);
 static char *convertsimple(PyObject *, const char **, va_list *, int, char *,
-                           size_t, PyObject **);
+                           size_t, freelist_t **);
 static Py_ssize_t convertbuffer(PyObject *, void **p, char **);
 static int getbuffer(PyObject *, Py_buffer *, char**);
 
@@ -128,72 +129,45 @@
 
 /* Handle cleanup of allocated memory in case of exception */
 
-#define GETARGS_CAPSULE_NAME_CLEANUP_PTR "getargs.cleanup_ptr"
-#define GETARGS_CAPSULE_NAME_CLEANUP_BUFFER "getargs.cleanup_buffer"
+typedef void (*cleanup_fn)(void *);
 
-static void
-cleanup_ptr(PyObject *self)
-{
-    void *ptr = PyCapsule_GetPointer(self, GETARGS_CAPSULE_NAME_CLEANUP_PTR);
-    if (ptr) {
-      PyMem_FREE(ptr);
-    }
-}
+struct freelist_s {
+    void *ptr;
+    cleanup_fn destr;
+    struct freelist_s *next;
+};
 
-static void
-cleanup_buffer(PyObject *self)
-{
-    Py_buffer *ptr = (Py_buffer *)PyCapsule_GetPointer(self, GETARGS_CAPSULE_NAME_CLEANUP_BUFFER);
-    if (ptr) {
-        PyBuffer_Release(ptr);
-    }
-}
+#define cleanup_ptr ((cleanup_fn)PyMem_FREE)
+#define cleanup_buffer ((cleanup_fn)PyBuffer_Release)
 
 static int
-addcleanup(void *ptr, PyObject **freelist, PyCapsule_Destructor destr)
+addcleanup(void *ptr, freelist_t **freelist, cleanup_fn destr)
 {
-    PyObject *cobj;
-    const char *name;
-
-    if (!*freelist) {
-        *freelist = PyList_New(0);
-        if (!*freelist) {
-            destr(ptr);
-            return -1;
-        }
-    }
-
-    if (destr == cleanup_ptr) {
-        name = GETARGS_CAPSULE_NAME_CLEANUP_PTR;
-    } else if (destr == cleanup_buffer) {
-        name = GETARGS_CAPSULE_NAME_CLEANUP_BUFFER;
-    } else {
-        return -1;
-    }
-    cobj = PyCapsule_New(ptr, name, destr);
-    if (!cobj) {
+    freelist_t *node = PyMem_MALLOC(sizeof(freelist_t));
+    if (!node) {
         destr(ptr);
         return -1;
     }
-    if (PyList_Append(*freelist, cobj)) {
-        Py_DECREF(cobj);
-        return -1;
-    }
-    Py_DECREF(cobj);
+    node->ptr = ptr;
+    node->destr = destr;
+    node->next = *freelist;
+    *freelist = node;
     return 0;
 }
 
 static int
-cleanreturn(int retval, PyObject *freelist)
+cleanreturn(int retval, freelist_t *freelist)
 {
-    if (freelist && retval != 0) {
-        /* We were successful, reset the destructors so that they
-           don't get called. */
-        Py_ssize_t len = PyList_GET_SIZE(freelist), i;
-        for (i = 0; i < len; i++)
-            PyCapsule_SetDestructor(PyList_GET_ITEM(freelist, i), NULL);
+    freelist_t *next;
+    while (freelist != NULL) {
+        if (retval == 0) {
+            /* Leaving with an error */
+            freelist->destr(freelist->ptr);
+        }
+        next = freelist->next;
+        PyMem_FREE(freelist);
+        freelist = next;
     }
-    Py_XDECREF(freelist);
     return retval;
 }
 
@@ -212,7 +186,7 @@
     const char *formatsave = format;
     Py_ssize_t i, len;
     char *msg;
-    PyObject *freelist = NULL;
+    freelist_t *freelist = NULL;
     int compat = flags & FLAG_COMPAT;
 
     assert(compat || (args != (PyObject*)NULL));
@@ -412,7 +386,7 @@
 static char *
 converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
              int *levels, char *msgbuf, size_t bufsize, int toplevel,
-             PyObject **freelist)
+             freelist_t **freelist)
 {
     int level = 0;
     int n = 0;
@@ -488,7 +462,7 @@
 
 static char *
 convertitem(PyObject *arg, const char **p_format, va_list *p_va, int flags,
-            int *levels, char *msgbuf, size_t bufsize, PyObject **freelist)
+            int *levels, char *msgbuf, size_t bufsize, freelist_t **freelist)
 {
     char *msg;
     const char *format = *p_format;
@@ -569,7 +543,7 @@
 
 static char *
 convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
-              char *msgbuf, size_t bufsize, PyObject **freelist)
+              char *msgbuf, size_t bufsize, freelist_t **freelist)
 {
     /* For # codes */
 #define FETCH_SIZE      int *q=NULL;Py_ssize_t *q2=NULL;\
@@ -1534,7 +1508,8 @@
     const char *fname, *msg, *custom_msg, *keyword;
     int min = INT_MAX;
     int i, len, nargs, nkeywords;
-    PyObject *freelist = NULL, *current_arg;
+    freelist_t *freelist = NULL;
+    PyObject *current_arg;
 
     assert(args != NULL && PyTuple_Check(args));
     assert(keywords == NULL || PyDict_Check(keywords));
diff -r c7dff5469611f03946466caed17c567c4ea5d8d0 -r c26dc70ee34018efeec8b789d40ec78478304bc0 pypy/module/cpyext/test/test_getargs.py
--- a/pypy/module/cpyext/test/test_getargs.py	Wed Jun 13 13:19:05 2012 +0200
+++ b/pypy/module/cpyext/test/test_getargs.py	Wed Jun 13 15:48:19 2012 +0200
@@ -144,6 +144,31 @@
         assert 'foo\0bar\0baz' == pybuffer(buffer('foo\0bar\0baz'))
 
 
+    def test_pyarg_parse_string_fails(self):
+        """
+        Test the failing case of PyArg_ParseTuple(): it must not keep
+        a reference on the PyObject passed in.
+        """
+        pybuffer = self.import_parser(
+            '''
+            Py_buffer buf1, buf2, buf3;
+            PyObject *result;
+            if (!PyArg_ParseTuple(args, "s*s*s*", &buf1, &buf2, &buf3)) {
+                return NULL;
+            }
+            Py_FatalError("should not get there");
+            return NULL;
+            ''')
+        freed = []
+        class freestring(str):
+            def __del__(self):
+                freed.append('x')
+        raises(TypeError, pybuffer,
+               freestring("string"), freestring("other string"), 42)
+        import gc; gc.collect()
+        assert freed == ['x', 'x']
+
+
     def test_pyarg_parse_charbuf_and_length(self):
         """
         The `t#` format specifier can be used to parse a read-only 8-bit



1.1                  dev-python/pypy/files/1.9-more-ignored-ops-146ddf82a279.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-more-ignored-ops-146ddf82a279.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-more-ignored-ops-146ddf82a279.patch?rev=1.1&content-type=text/plain

Index: 1.9-more-ignored-ops-146ddf82a279.patch
===================================================================
changeset:   55567:146ddf82a279
user:        Armin Rigo <arigo@×××××.org>
date:        Mon Jun 11 10:33:19 2012 +0200
summary:     More ignored ops

diff -r 04ea518e5b71 -r 146ddf82a279 pypy/translator/c/gcc/trackgcroot.py
--- a/pypy/translator/c/gcc/trackgcroot.py	Mon Jun 11 10:28:26 2012 +0200
+++ b/pypy/translator/c/gcc/trackgcroot.py	Mon Jun 11 10:33:19 2012 +0200
@@ -476,13 +476,13 @@
         # floating-point operations cannot produce GC pointers
         'f',
         'cvt', 'ucomi', 'comi', 'subs', 'subp' , 'adds', 'addp', 'xorp',
-        'movap', 'movd', 'movlp', 'sqrtsd', 'movhpd',
+        'movap', 'movd', 'movlp', 'sqrt', 'rsqrt', 'movhpd',
         'mins', 'minp', 'maxs', 'maxp', 'unpck', 'pxor', 'por', # sse2
         'shufps', 'shufpd',
         # arithmetic operations should not produce GC pointers
         'inc', 'dec', 'not', 'neg', 'or', 'and', 'sbb', 'adc',
         'shl', 'shr', 'sal', 'sar', 'rol', 'ror', 'mul', 'imul', 'div', 'idiv',
-        'bswap', 'bt', 'rdtsc',
+        'bswap', 'bt', 'rdtsc', 'rounds',
         'pabs', 'pack', 'padd', 'palign', 'pand', 'pavg', 'pcmp', 'pextr',
         'phadd', 'phsub', 'pinsr', 'pmadd', 'pmax', 'pmin', 'pmovmsk',
         'pmul', 'por', 'psadb', 'pshuf', 'psign', 'psll', 'psra', 'psrl',




1.1                  dev-python/pypy/files/1.9-ssl-threads-1-34b3b5aac082.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-ssl-threads-1-34b3b5aac082.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-ssl-threads-1-34b3b5aac082.patch?rev=1.1&content-type=text/plain

Index: 1.9-ssl-threads-1-34b3b5aac082.patch
===================================================================
changeset:   55575:34b3b5aac082
parent:      55569:fa8262a5746a
user:        Armin Rigo <arigo@×××××.org>
date:        Mon Jun 11 14:38:35 2012 +0200
summary:     Move the callback logic to C code instead of using RPython code

diff -r fa8262a5746a -r 34b3b5aac082 pypy/module/_ssl/__init__.py
--- a/pypy/module/_ssl/__init__.py	Mon Jun 11 11:04:53 2012 +0200
+++ b/pypy/module/_ssl/__init__.py	Mon Jun 11 14:38:35 2012 +0200
@@ -31,5 +31,6 @@
     def startup(self, space):
         from pypy.rlib.ropenssl import init_ssl
         init_ssl()
-        from pypy.module._ssl.interp_ssl import setup_ssl_threads
-        setup_ssl_threads()
+        if space.config.objspace.usemodules.thread:
+            from pypy.module._ssl.thread_lock import setup_ssl_threads
+            setup_ssl_threads()
diff -r fa8262a5746a -r 34b3b5aac082 pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py	Mon Jun 11 11:04:53 2012 +0200
+++ b/pypy/module/_ssl/interp_ssl.py	Mon Jun 11 14:38:35 2012 +0200
@@ -880,38 +880,3 @@
             libssl_X509_free(x)
     finally:
         libssl_BIO_free(cert)
-
-# this function is needed to perform locking on shared data
-# structures. (Note that OpenSSL uses a number of global data
-# structures that will be implicitly shared whenever multiple threads
-# use OpenSSL.) Multi-threaded applications will crash at random if
-# it is not set.
-#
-# locking_function() must be able to handle up to CRYPTO_num_locks()
-# different mutex locks. It sets the n-th lock if mode & CRYPTO_LOCK, and
-# releases it otherwise.
-#
-# filename and line are the file number of the function setting the
-# lock. They can be useful for debugging.
-_ssl_locks = []
-
-def _ssl_thread_locking_function(mode, n, filename, line):
-    n = intmask(n)
-    if n < 0 or n >= len(_ssl_locks):
-        return
-
-    if intmask(mode) & CRYPTO_LOCK:
-        _ssl_locks[n].acquire(True)
-    else:
-        _ssl_locks[n].release()
-
-def _ssl_thread_id_function():
-    from pypy.module.thread import ll_thread
-    return rffi.cast(rffi.LONG, ll_thread.get_ident())
-
-def setup_ssl_threads():
-    from pypy.module.thread import ll_thread
-    for i in range(libssl_CRYPTO_num_locks()):
-        _ssl_locks.append(ll_thread.allocate_lock())
-    libssl_CRYPTO_set_locking_callback(_ssl_thread_locking_function)
-    libssl_CRYPTO_set_id_callback(_ssl_thread_id_function)
diff -r fa8262a5746a -r 34b3b5aac082 pypy/module/_ssl/thread_lock.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pypy/module/_ssl/thread_lock.py	Mon Jun 11 14:38:35 2012 +0200
@@ -0,0 +1,78 @@
+from pypy.rlib.ropenssl import *
+from pypy.rpython.lltypesystem import lltype, rffi
+from pypy.translator.tool.cbuild import ExternalCompilationInfo
+
+# CRYPTO_set_locking_callback:
+#
+# this function is needed to perform locking on shared data
+# structures. (Note that OpenSSL uses a number of global data
+# structures that will be implicitly shared whenever multiple threads
+# use OpenSSL.) Multi-threaded applications will crash at random if
+# it is not set.
+#
+# locking_function() must be able to handle up to CRYPTO_num_locks()
+# different mutex locks. It sets the n-th lock if mode & CRYPTO_LOCK, and
+# releases it otherwise.
+#
+# filename and line are the file number of the function setting the
+# lock. They can be useful for debugging.
+
+
+# This logic is moved to C code so that the callbacks can be invoked
+# without caring about the GIL.
+
+separate_module_source = """
+
+#include <openssl/crypto.h>
+
+static unsigned int _ssl_locks_count = 0;
+static struct RPyOpaque_ThreadLock *_ssl_locks;
+
+static unsigned long _ssl_thread_id_function(void) {
+    return RPyThreadGetIdent();
+}
+
+static void _ssl_thread_locking_function(int mode, int n, const char *file,
+                                         int line) {
+    if ((_ssl_locks == NULL) ||
+        (n < 0) || ((unsigned)n >= _ssl_locks_count))
+        return;
+
+    if (mode & CRYPTO_LOCK) {
+        RPyThreadAcquireLock(_ssl_locks[n], 1);
+    } else {
+        RPyThreadReleaseLock(_ssl_locks[n]);
+    }
+}
+
+int _PyPy_SSL_SetupThreads(void)
+{
+    unsigned int i;
+    _ssl_locks_count = CRYPTO_num_locks();
+    _ssl_locks = calloc(_ssl_locks_count, sizeof(struct RPyOpaque_ThreadLock));
+    if (_ssl_locks == NULL)
+        return 0;
+    for (i=0; i<_ssl_locks_count; i++) {
+        if (RPyThreadLockInit(_ssl_locks + i) == 0)
+            return 0;
+    }
+    CRYPTO_set_locking_callback(_ssl_thread_locking_function);
+    CRYPTO_set_id_callback(_ssl_thread_id_function);
+    return 1;
+}
+"""
+
+
+eci = ExternalCompilationInfo(
+    separate_module_sources=[separate_module_source],
+    export_symbols=['_PyPy_SSL_SetupThreads'],
+)
+
+_PyPy_SSL_SetupThreads = rffi.llexternal('_PyPy_SSL_SetupThreads',
+                                         [], rffi.INT,
+                                         compilation_info=eci)
+
+def setup_ssl_threads():
+    result = _PyPy_SSL_SetupThreads()
+    if rffi.cast(lltype.Signed, result) == 0:
+        raise MemoryError




1.1                  dev-python/pypy/files/1.9-signal-a33052b17f4e.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-signal-a33052b17f4e.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/1.9-signal-a33052b17f4e.patch?rev=1.1&content-type=text/plain

Index: 1.9-signal-a33052b17f4e.patch
===================================================================
changeset:   55595:a33052b17f4e
parent:      55589:4f58f2db96c0
user:        Armin Rigo <arigo@×××××.org>
date:        Mon Jun 11 18:06:35 2012 +0200
summary:     issue1167: changed the test (according to py.test -A on Linux), and fix

diff -r 4f58f2db96c0 -r a33052b17f4e pypy/module/signal/interp_signal.py
--- a/pypy/module/signal/interp_signal.py	Mon Jun 11 17:05:01 2012 +0200
+++ b/pypy/module/signal/interp_signal.py	Mon Jun 11 18:06:35 2012 +0200
@@ -227,7 +227,7 @@
     None -- if an unknown handler is in effect (XXX UNIMPLEMENTED)
     anything else -- the callable Python object used as a handler
     """
-    check_signum(space, signum)
+    check_signum_in_range(space, signum)
     action = space.check_signal_action
     if signum in action.handlers_w:
         return action.handlers_w[signum]
@@ -253,12 +253,18 @@
     c_pause()
     return space.w_None
 
-def check_signum(space, signum):
+def check_signum_exists(space, signum):
     if signum in signal_values:
         return
     raise OperationError(space.w_ValueError,
                          space.wrap("invalid signal value"))
 
+def check_signum_in_range(space, signum):
+    if 1 <= signum < NSIG:
+        return
+    raise OperationError(space.w_ValueError,
+                         space.wrap("signal number out of range"))
+
 
 @jit.dont_look_inside
 @unwrap_spec(signum=int)
@@ -319,7 +325,7 @@
 
 @unwrap_spec(signum=int, flag=int)
 def siginterrupt(space, signum, flag):
-    check_signum(space, signum)
+    check_signum_exists(space, signum)
     if rffi.cast(lltype.Signed, c_siginterrupt(signum, flag)) < 0:
         errno = rposix.get_errno()
         raise OperationError(space.w_RuntimeError, space.wrap(errno))
diff -r 4f58f2db96c0 -r a33052b17f4e pypy/module/signal/test/test_signal.py
--- a/pypy/module/signal/test/test_signal.py	Mon Jun 11 17:05:01 2012 +0200
+++ b/pypy/module/signal/test/test_signal.py	Mon Jun 11 18:06:35 2012 +0200
@@ -154,7 +154,12 @@
 
         raises(ValueError, getsignal, 4444)
         raises(ValueError, signal, 4444, lambda *args: None)
-        raises(ValueError, signal, 42, lambda *args: None)
+        import sys
+        if sys.platform == 'win32':
+            raises(ValueError, signal, 42, lambda *args: None)
+        else:
+            signal(42, lambda *args: None)
+            signal(42, SIG_DFL)
 
     def test_alarm(self):
         try: