Access ChromotingHost::clients_ only on network thread.

remoting/host/chromoting_host.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_CHROMOTING_HOST_H_
 #define REMOTING_CHROMOTING_HOST_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 97 matching lines @@
   virtual void OnSessionClosed(ClientSession* session) OVERRIDE;
   virtual void OnSessionSequenceNumber(ClientSession* session,
                                        int64 sequence_number) OVERRIDE;
 
   // SessionManager::Listener implementation.
   virtual void OnSessionManagerInitialized() OVERRIDE;
   virtual void OnIncomingSession(
       protocol::Session* session,
       protocol::SessionManager::IncomingSessionResponse* response) OVERRIDE;
 
-  void AddAuthenticatedClient(ClientSession* client,
-                              const protocol::SessionConfig& config,
-                              const std::string& jid);
-
   // Sets desired configuration for the protocol. Ownership of the
   // |config| is transferred to the object. Must be called before Start().
   void set_protocol_config(protocol::CandidateSessionConfig* config);
 
   // TODO(wez): ChromotingHost shouldn't need to know about Me2Mom.
   void set_it2me(bool is_it2me) {
     is_it2me_ = is_it2me;
   }
   void set_access_code(const std::string& access_code) {
     access_code_ = access_code;
@@ skipping 28 matching lines @@
 
   // Takes ownership of |access_verifier|, and adds a reference to
   // |config|. Caller keeps ownership of |context| and |environment|.
   ChromotingHost(ChromotingHostContext* context,
                  MutableHostConfig* config,
                  DesktopEnvironment* environment,
                  AccessVerifier* access_verifier,
                  bool allow_nat_traversal);
   virtual ~ChromotingHost();
 
-  // This method is called if a client is disconnected from the host.
-  void OnClientDisconnected(ClientSession* client);
-
   // Creates encoder for the specified configuration.
   Encoder* CreateEncoder(const protocol::SessionConfig& config);
 
   std::string GenerateHostAuthToken(const std::string& encoded_client_token);
 
   int AuthenticatedClientsCount() const;
 
   void EnableCurtainMode(bool enable);
 
   void StopScreenRecorder();
   void OnScreenRecorderStopped();
 
-  // The following methods are called during shutdown.
-  void ShutdownNetwork();
-  void ShutdownRecorder();
+  // Called from Shutdown() or OnScreenRecorderStopped() to finish shutdown.
   void ShutdownFinish();
 
   // Parameters specified when the host was created.
   ChromotingHostContext* context_;
   DesktopEnvironment* desktop_environment_;
   scoped_refptr<MutableHostConfig> config_;
   scoped_ptr<AccessVerifier> access_verifier_;
   bool allow_nat_traversal_;
 
   // Connection objects.
   scoped_ptr<SignalStrategy> signal_strategy_;
   std::string local_jid_;
   scoped_ptr<protocol::SessionManager> session_manager_;
 
   StatusObserverList status_observers_;
 
-  // The connections to remote clients.
+  // The connections to remote clients. Must be used only on the
+  // network thread.
   ClientList clients_;
 
-  // Session manager for the host process.
+  // Session manager for the host process. Must be used only on the
+  // network thread.

[Wez, 2011/11/09 02:32:22]

nit: Consider bundling all the members which are network-thread only together,
and similarly for the other thread-specific members.

[Sergey Ulanov, 2011/11/09 21:24:00]

Done. Practically all members of this class are used on the network thread only.
Updated comments to reflect it.
Also removed |lock_| as it is not needed anymore.

   scoped_refptr<ScreenRecorder> recorder_;
 
-  // Tracks the internal state of the host.
-  // This variable is written on the main thread of ChromotingHostContext
-  // and read by jingle thread.
-  State state_;
-
   // Number of screen recorders that are currently being
   // stopped. Normally set to 0 or 1, but in some cases it may be
   // greater than 1, particularly if when second client can connect
-  // immidiately after previous one disconnected.
+  // immidiately after previous one disconnected. Must be used only on
+  // the network thread.
   int stopping_recorders_;
 
+  // Tracks the internal state of the host.
+  // This variable is written on the main thread of ChromotingHostContext
+  // and read on the network thread.
+  State state_;
+
   // Lock is to lock the access to |state_|.
   base::Lock lock_;
 
   // Configuration of the protocol.
   scoped_ptr<protocol::CandidateSessionConfig> protocol_config_;
 
   bool is_curtained_;
 
   // Whether or not the host is running in "IT2Me" mode, in which connections
   // are pre-authenticated, and hence the local login challenge can be bypassed.
   bool is_it2me_;
 
   std::string access_code_;
 
   // Stores list of tasks that should be executed when we finish
   // shutdown. Used only while |state_| is set to kStopping.
   std::vector<Task*> shutdown_tasks_;
 
   UiStrings ui_strings_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_