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

Side by Side Diff: mojo/public/cpp/test_support/lib/test_utils.cc

Issue 612243002: Mojo: NULL -> nullptr in mojo/public/cpp outside of bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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/public/cpp/test_support/lib/test_support.cc ('k') | no next file » | 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/public/cpp/test_support/test_utils.h" 5 #include "mojo/public/cpp/test_support/test_utils.h"
6 6
7 #include "mojo/public/cpp/system/core.h" 7 #include "mojo/public/cpp/system/core.h"
8 #include "mojo/public/cpp/test_support/test_support.h" 8 #include "mojo/public/cpp/test_support/test_support.h"
9 9
10 namespace mojo { 10 namespace mojo {
11 namespace test { 11 namespace test {
12 12
13 bool WriteTextMessage(const MessagePipeHandle& handle, 13 bool WriteTextMessage(const MessagePipeHandle& handle,
14 const std::string& text) { 14 const std::string& text) {
15 MojoResult rv = WriteMessageRaw(handle, 15 MojoResult rv = WriteMessageRaw(handle,
16 text.data(), 16 text.data(),
17 static_cast<uint32_t>(text.size()), 17 static_cast<uint32_t>(text.size()),
18 NULL, 18 nullptr,
19 0, 19 0,
20 MOJO_WRITE_MESSAGE_FLAG_NONE); 20 MOJO_WRITE_MESSAGE_FLAG_NONE);
21 return rv == MOJO_RESULT_OK; 21 return rv == MOJO_RESULT_OK;
22 } 22 }
23 23
24 bool ReadTextMessage(const MessagePipeHandle& handle, std::string* text) { 24 bool ReadTextMessage(const MessagePipeHandle& handle, std::string* text) {
25 MojoResult rv; 25 MojoResult rv;
26 bool did_wait = false; 26 bool did_wait = false;
27 27
28 uint32_t num_bytes = 0, num_handles = 0; 28 uint32_t num_bytes = 0, num_handles = 0;
29 for (;;) { 29 for (;;) {
30 rv = ReadMessageRaw(handle, 30 rv = ReadMessageRaw(handle,
31 NULL, 31 nullptr,
32 &num_bytes, 32 &num_bytes,
33 NULL, 33 nullptr,
34 &num_handles, 34 &num_handles,
35 MOJO_READ_MESSAGE_FLAG_NONE); 35 MOJO_READ_MESSAGE_FLAG_NONE);
36 if (rv == MOJO_RESULT_SHOULD_WAIT) { 36 if (rv == MOJO_RESULT_SHOULD_WAIT) {
37 if (did_wait) { 37 if (did_wait) {
38 assert(false); // Looping endlessly!? 38 assert(false); // Looping endlessly!?
39 return false; 39 return false;
40 } 40 }
41 rv = Wait(handle, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE); 41 rv = Wait(handle, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE);
42 if (rv != MOJO_RESULT_OK) 42 if (rv != MOJO_RESULT_OK)
43 return false; 43 return false;
44 did_wait = true; 44 did_wait = true;
45 } else { 45 } else {
46 assert(!num_handles); 46 assert(!num_handles);
47 break; 47 break;
48 } 48 }
49 } 49 }
50 50
51 text->resize(num_bytes); 51 text->resize(num_bytes);
52 rv = ReadMessageRaw(handle, 52 rv = ReadMessageRaw(handle,
53 &text->at(0), 53 &text->at(0),
54 &num_bytes, 54 &num_bytes,
55 NULL, 55 nullptr,
56 &num_handles, 56 &num_handles,
57 MOJO_READ_MESSAGE_FLAG_NONE); 57 MOJO_READ_MESSAGE_FLAG_NONE);
58 return rv == MOJO_RESULT_OK; 58 return rv == MOJO_RESULT_OK;
59 } 59 }
60 60
61 bool DiscardMessage(const MessagePipeHandle& handle) { 61 bool DiscardMessage(const MessagePipeHandle& handle) {
62 MojoResult rv = ReadMessageRaw(handle, NULL, NULL, NULL, NULL, 62 MojoResult rv = ReadMessageRaw(handle, nullptr, nullptr, nullptr, nullptr,
63 MOJO_READ_MESSAGE_FLAG_MAY_DISCARD); 63 MOJO_READ_MESSAGE_FLAG_MAY_DISCARD);
64 return rv == MOJO_RESULT_OK; 64 return rv == MOJO_RESULT_OK;
65 } 65 }
66 66
67 void IterateAndReportPerf(const char* test_name, 67 void IterateAndReportPerf(const char* test_name,
68 PerfTestSingleIteration single_iteration, 68 PerfTestSingleIteration single_iteration,
69 void* closure) { 69 void* closure) {
70 // TODO(vtl): These should be specifiable using command-line flags. 70 // TODO(vtl): These should be specifiable using command-line flags.
71 static const size_t kGranularity = 100; 71 static const size_t kGranularity = 100;
72 static const MojoTimeTicks kPerftestTimeMicroseconds = 3 * 1000000; 72 static const MojoTimeTicks kPerftestTimeMicroseconds = 3 * 1000000;
73 73
74 const MojoTimeTicks start_time = GetTimeTicksNow(); 74 const MojoTimeTicks start_time = GetTimeTicksNow();
75 MojoTimeTicks end_time; 75 MojoTimeTicks end_time;
76 size_t iterations = 0; 76 size_t iterations = 0;
77 do { 77 do {
78 for (size_t i = 0; i < kGranularity; i++) 78 for (size_t i = 0; i < kGranularity; i++)
79 (*single_iteration)(closure); 79 (*single_iteration)(closure);
80 iterations += kGranularity; 80 iterations += kGranularity;
81 81
82 end_time = GetTimeTicksNow(); 82 end_time = GetTimeTicksNow();
83 } while (end_time - start_time < kPerftestTimeMicroseconds); 83 } while (end_time - start_time < kPerftestTimeMicroseconds);
84 84
85 MojoTestSupportLogPerfResult(test_name, 85 MojoTestSupportLogPerfResult(test_name,
86 1000000.0 * iterations / (end_time - start_time), 86 1000000.0 * iterations / (end_time - start_time),
87 "iterations/second"); 87 "iterations/second");
88 } 88 }
89 89
90 } // namespace test 90 } // namespace test
91 } // namespace mojo 91 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/public/cpp/test_support/lib/test_support.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698