From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Tue, 27 Mar 2012 19:57:14 +0000 (-0700)
Subject: msgr: make a bunch of stuff private.
X-Git-Tag: v0.45~11^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e966c39df69028df88625e08e5571144aa50186d;p=ceph.git

msgr: make a bunch of stuff private.

Why were all these data members public? They're accessed by Pipes
and the Accepter and stuff, so maybe that's why...but that's all
internal interface stuff.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 0cfc1240bcab..8b9de3b3215b 100644
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -460,7 +460,6 @@ private:
   void dispatch_throttle_release(uint64_t msize);
 
   // SimpleMessenger stuff
- public:
   Mutex lock;
   Cond  wait_cond;  // for wait()
   bool did_bind;
@@ -483,6 +482,13 @@ private:
   Policy default_policy;
   map<int, Policy> policy_map; // entity_name_t::type -> Policy
 
+  // --- pipes ---
+  set<Pipe*>      pipes;
+  list<Pipe*>     pipe_reap_queue;
+
+  Mutex global_seq_lock;
+  __u32 global_seq;
+public:
   Policy& get_policy(int t) {
     if (policy_map.count(t))
       return policy_map[t];
@@ -490,15 +496,7 @@ private:
       return default_policy;
   }
 
-  // --- pipes ---
-  set<Pipe*>      pipes;
-  list<Pipe*>     pipe_reap_queue;
-  
-  Mutex global_seq_lock;
-  __u32 global_seq;
-      
   Pipe *connect_rank(const entity_addr_t& addr, int type);
-
   virtual void mark_down(const entity_addr_t& addr);
   virtual void mark_down(Connection *con);
   virtual void mark_down_on_empty(Connection *con);