From 57148cbcbdad689080c2db7681b0e2bfc952d3d8 Mon Sep 17 00:00:00 2001 From: JF Bastien Date: Mon, 1 Dec 2014 19:19:55 +0000 Subject: libc++: add NaCl and PNaCl support for std::random_device Summary: The NaCl sandbox doesn't allow opening files under /dev, but it offers an API which provides the same capabilities. This is the same random device emulation that nacl_io performs for POSIX support, but nacl_io is an optional library so libc++ can't assume that device emulation will be performed. Note that NaCl only supports /dev/urandom, not /dev/random. This patch also cleans up some of the preprocessor #endif, and fixes the test for Win32 (it accepts any token, and would therefore never throw regardless of the token provided). Test Plan: ninja check-libcxx Reviewers: dschuff, mclow.lists, danalbert Subscribers: jfb, cfe-commits Differential Revision: http://reviews.llvm.org/D6442 llvm-svn: 223068 --- .../test/numerics/rand/rand.device/ctor.pass.cpp | 96 +++++++++++++++------- 1 file changed, 66 insertions(+), 30 deletions(-) (limited to 'libcxx/test/numerics/rand') diff --git a/libcxx/test/numerics/rand/rand.device/ctor.pass.cpp b/libcxx/test/numerics/rand/rand.device/ctor.pass.cpp index dfa546be709..2d9bc2ff8f1 100644 --- a/libcxx/test/numerics/rand/rand.device/ctor.pass.cpp +++ b/libcxx/test/numerics/rand/rand.device/ctor.pass.cpp @@ -11,39 +11,75 @@ // class random_device; -// explicit random_device(const string& token = "/dev/urandom"); +// explicit random_device(const string& token = implementation-defined); + +// For the following ctors, the standard states: "The semantics and default +// value of the token parameter are implementation-defined". Implementations +// therefore aren't required to accept any string, but the default shouldn't +// throw. #include #include #include -int main() -{ - try - { - std::random_device r("wrong file"); - assert(false); - } - catch (const std::system_error& e) - { - } - { - std::random_device r; - } - { - int ec; - ec = close(STDIN_FILENO); - assert(!ec); - ec = close(STDOUT_FILENO); - assert(!ec); - ec = close(STDERR_FILENO); - assert(!ec); - std::random_device r; - } - { - std::random_device r("/dev/urandom");; - } - { - std::random_device r("/dev/random");; - } +bool is_valid_random_device(const std::string &token) { +#if defined(_WIN32) + return true; +#elif defined(_LIBCPP_USING_NACL_RANDOM) + return token == "/dev/urandom"; +#else // !defined(_WIN32) && !defined(_LIBCPP_USING_NACL_RANDOM) + // Not an exhaustive list: they're the only tokens that are tested below. + return token == "/dev/urandom" || token == "/dev/random"; +#endif // defined(_WIN32) || defined(_LIBCPP_USING_NACL_RANDOM) +} + +void check_random_device_valid(const std::string &token) { + std::random_device r(token); +} + +void check_random_device_invalid(const std::string &token) { + try { + std::random_device r(token); + assert(false); + } catch (const std::system_error &e) { + } +} + +int main() { + { std::random_device r; } + + { + int ec; + ec = close(STDIN_FILENO); + assert(!ec); + ec = close(STDOUT_FILENO); + assert(!ec); + ec = close(STDERR_FILENO); + assert(!ec); + std::random_device r; + } + + { + std::string token = "wrong file"; + if (is_valid_random_device(token)) + check_random_device_valid(token); + else + check_random_device_invalid(token); + } + + { + std::string token = "/dev/urandom"; + if (is_valid_random_device(token)) + check_random_device_valid(token); + else + check_random_device_invalid(token); + } + + { + std::string token = "/dev/random"; + if (is_valid_random_device(token)) + check_random_device_valid(token); + else + check_random_device_invalid(token); + } } -- cgit v1.2.3