changeset:   85468:acc7439b1406
user:        Antoine Pitrou <solipsis@pitrou.net>
date:        Sat Aug 31 00:26:02 2013 +0200
files:       Include/pythonrun.h Misc/NEWS Python/pythonrun.c Python/random.c
description:
Issue #18756: os.urandom() now uses a lazily-opened persistent file descriptor, so as to avoid using many file descriptors when run in parallel from multiple threads.


diff -r 290ca31d4cfe -r acc7439b1406 Include/pythonrun.h
--- a/Include/pythonrun.h	Sat Aug 31 00:12:37 2013 +0200
+++ b/Include/pythonrun.h	Sat Aug 31 00:26:02 2013 +0200
@@ -246,6 +246,7 @@
 PyAPI_FUNC(void) _PyGC_Fini(void);
 PyAPI_FUNC(void) PySlice_Fini(void);
 PyAPI_FUNC(void) _PyType_Fini(void);
+PyAPI_FUNC(void) _PyRandom_Fini(void);
 
 PyAPI_DATA(PyThreadState *) _Py_Finalizing;
 #endif
diff -r 290ca31d4cfe -r acc7439b1406 Misc/NEWS
--- a/Misc/NEWS	Sat Aug 31 00:12:37 2013 +0200
+++ b/Misc/NEWS	Sat Aug 31 00:26:02 2013 +0200
@@ -51,6 +51,10 @@
 Library
 -------
 
+- Issue #18756: os.urandom() now uses a lazily-opened persistent file
+  descriptor, so as to avoid using many file descriptors when run in
+  parallel from multiple threads.
+
 - Issue #18418: After fork(), reinit all threads states, not only active ones.
   Patch by A. Jesse Jiryu Davis.
 
diff -r 290ca31d4cfe -r acc7439b1406 Python/pythonrun.c
--- a/Python/pythonrun.c	Sat Aug 31 00:12:37 2013 +0200
+++ b/Python/pythonrun.c	Sat Aug 31 00:26:02 2013 +0200
@@ -625,6 +625,7 @@
     PyDict_Fini();
     PySlice_Fini();
     _PyGC_Fini();
+    _PyRandom_Fini();
 
     /* Cleanup Unicode implementation */
     _PyUnicode_Fini();
diff -r 290ca31d4cfe -r acc7439b1406 Python/random.c
--- a/Python/random.c	Sat Aug 31 00:12:37 2013 +0200
+++ b/Python/random.c	Sat Aug 31 00:26:02 2013 +0200
@@ -90,6 +90,7 @@
 
 
 #if !defined(MS_WINDOWS) && !defined(__VMS)
+static int urandom_fd = -1;
 
 /* Read size bytes from /dev/urandom into buffer.
    Call Py_FatalError() on error. */
@@ -133,18 +134,30 @@
     if (size <= 0)
         return 0;
 
-    Py_BEGIN_ALLOW_THREADS
-    fd = _Py_open("/dev/urandom", O_RDONLY);
-    Py_END_ALLOW_THREADS
-    if (fd < 0)
-    {
-        if (errno == ENOENT || errno == ENXIO ||
-            errno == ENODEV || errno == EACCES)
-            PyErr_SetString(PyExc_NotImplementedError,
-                            "/dev/urandom (or equivalent) not found");
+    if (urandom_fd >= 0)
+        fd = urandom_fd;
+    else {
+        Py_BEGIN_ALLOW_THREADS
+        fd = _Py_open("/dev/urandom", O_RDONLY);
+        Py_END_ALLOW_THREADS
+        if (fd < 0)
+        {
+            if (errno == ENOENT || errno == ENXIO ||
+                errno == ENODEV || errno == EACCES)
+                PyErr_SetString(PyExc_NotImplementedError,
+                                "/dev/urandom (or equivalent) not found");
+            else
+                PyErr_SetFromErrno(PyExc_OSError);
+            return -1;
+        }
+        if (urandom_fd >= 0) {
+            /* urandom_fd was initialized by another thread while we were
+               not holding the GIL, keep it. */
+            close(fd);
+            fd = urandom_fd;
+        }
         else
-            PyErr_SetFromErrno(PyExc_OSError);
-        return -1;
+            urandom_fd = fd;
     }
 
     Py_BEGIN_ALLOW_THREADS
@@ -168,12 +181,20 @@
             PyErr_Format(PyExc_RuntimeError,
                          "Failed to read %zi bytes from /dev/urandom",
                          size);
-        close(fd);
         return -1;
     }
-    close(fd);
     return 0;
 }
+
+static void
+dev_urandom_close(void)
+{
+    if (urandom_fd >= 0) {
+        close(urandom_fd);
+        urandom_fd = -1;
+    }
+}
+
 #endif /* !defined(MS_WINDOWS) && !defined(__VMS) */
 
 /* Fill buffer with pseudo-random bytes generated by a linear congruent
@@ -271,3 +292,11 @@
 #endif
     }
 }
+
+void
+_PyRandom_Fini(void)
+{
+#if !defined(MS_WINDOWS) && !defined(__VMS)
+    dev_urandom_close();
+#endif
+}