From: Jesse Williamson <jwilliamson@suse.de>
Date: Fri, 8 Sep 2017 22:48:54 +0000 (-0700)
Subject: msg: remove manual lock and RNG call
X-Git-Tag: v13.0.1~911^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc4edc46c1c0f8dbde8e95fb3748452047c16f95;p=ceph.git

msg: remove manual lock and RNG call

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
---

diff --git a/src/msg/Messenger.cc b/src/msg/Messenger.cc
index f97de0f14aa..3d9b57c12bc 100644
--- a/src/msg/Messenger.cc
+++ b/src/msg/Messenger.cc
@@ -1,12 +1,11 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include <mutex>
-#include <random>
-
 #include <netdb.h>
 
 #include "include/types.h"
+#include "include/random.h"
+
 #include "Messenger.h"
 
 #include "msg/simple/SimpleMessenger.h"
@@ -30,14 +29,7 @@ Messenger *Messenger::create(CephContext *cct, const string &type,
 {
   int r = -1;
   if (type == "random") {
-    static std::random_device seed;
-    static std::default_random_engine random_engine(seed());
-
-    static std::mutex random_lock;
-    std::lock_guard<std::mutex> lock(random_lock);
-
-    std::uniform_int_distribution<> dis(0, 1);
-    r = dis(random_engine);
+    r = ceph::util::generate_random_number(0, 1);
   }
   if (r == 0 || type == "simple")
     return new SimpleMessenger(cct, name, std::move(lname), nonce);