Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: mojo/edk/system/channel.cc

Issue 1426343002: EDK: Move mutex.*, cond_var.*, and thread_annotations.h to //mojo/edk/util. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: oops Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/edk/system/channel.h ('k') | mojo/edk/system/channel_endpoint.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/edk/system/channel.h" 5 #include "mojo/edk/system/channel.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
13 #include "mojo/edk/embedder/platform_handle_vector.h" 13 #include "mojo/edk/embedder/platform_handle_vector.h"
14 #include "mojo/edk/system/endpoint_relayer.h" 14 #include "mojo/edk/system/endpoint_relayer.h"
15 #include "mojo/edk/system/transport_data.h" 15 #include "mojo/edk/system/transport_data.h"
16 16
17 using mojo::util::MakeRefCounted; 17 using mojo::util::MakeRefCounted;
18 using mojo::util::MutexLocker;
18 using mojo::util::RefPtr; 19 using mojo::util::RefPtr;
19 20
20 namespace mojo { 21 namespace mojo {
21 namespace system { 22 namespace system {
22 23
23 namespace { 24 namespace {
24 25
25 struct SerializedEndpoint { 26 struct SerializedEndpoint {
26 // This is the endpoint ID on the receiving side, and should be a "remote ID". 27 // This is the endpoint ID on the receiving side, and should be a "remote ID".
27 // (The receiving side should already have had an endpoint attached and been 28 // (The receiving side should already have had an endpoint attached and been
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 << ", local ID " << local_id << ", remote ID " << remote_id; 624 << ", local ID " << local_id << ", remote ID " << remote_id;
624 std::unique_ptr<MessageInTransit> message(new MessageInTransit( 625 std::unique_ptr<MessageInTransit> message(new MessageInTransit(
625 MessageInTransit::Type::CHANNEL, subtype, num_bytes, bytes)); 626 MessageInTransit::Type::CHANNEL, subtype, num_bytes, bytes));
626 message->set_source_id(local_id); 627 message->set_source_id(local_id);
627 message->set_destination_id(remote_id); 628 message->set_destination_id(remote_id);
628 return WriteMessage(std::move(message)); 629 return WriteMessage(std::move(message));
629 } 630 }
630 631
631 } // namespace system 632 } // namespace system
632 } // namespace mojo 633 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/edk/system/channel.h ('k') | mojo/edk/system/channel_endpoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698