From 09e5f47ad0ab092bdf03025eb72c2a29cb9fe2ec Mon Sep 17 00:00:00 2001 From: "deanm@chromium.org" Date: Fri, 26 Jun 2009 10:00:02 +0000 Subject: [PATCH] Cache the file descriptor for /dev/urandom to avoid needing to reopen it for every call. Patch by Mike Mammarella. BUG=none TEST=none Review URL: http://codereview.chromium.org/144010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19352 0039d316-1c4b-4281-b951-d872f2087c98 --- base/rand_util_posix.cc | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/base/rand_util_posix.cc b/base/rand_util_posix.cc index b4f3ac259622..a2bdeb898d1a 100644 --- a/base/rand_util_posix.cc +++ b/base/rand_util_posix.cc @@ -4,24 +4,51 @@ #include "base/rand_util.h" +#include #include #include #include "base/file_util.h" +#include "base/lazy_instance.h" #include "base/logging.h" +namespace { + +// We keep the file descriptor for /dev/urandom around so we don't need to +// reopen it (which is expensive), and since we may not even be able to reopen +// it if we are later put in a sandbox. This class wraps the file descriptor so +// we can use LazyInstance to handle opening it on the first access. +class URandomFd { + public: + URandomFd() { + fd_ = open("/dev/urandom", O_RDONLY); + CHECK(fd_ >= 0) << "Cannot open /dev/urandom: " << errno; + } + + ~URandomFd() { + close(fd_); + } + + int fd() const { return fd_; } + + private: + int fd_; +}; + +base::LazyInstance g_urandom_fd(base::LINKER_INITIALIZED); + +} // namespace + namespace base { uint64 RandUint64() { uint64 number; - int urandom_fd = open("/dev/urandom", O_RDONLY); - CHECK(urandom_fd >= 0); + int urandom_fd = g_urandom_fd.Pointer()->fd(); bool success = file_util::ReadFromFD(urandom_fd, reinterpret_cast(&number), sizeof(number)); CHECK(success); - close(urandom_fd); return number; }