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

Side by Side Diff: webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h

Issue 2786363002: Revert of Loosening the coupling between WebRTC and //third_party/protobuf (Closed)
Patch Set: Created 3 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_HELPER_THREAD_H_ 11 #ifndef WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_HELPER_THREAD_H_
12 #define WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_HELPER_THREAD_H_ 12 #define WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_HELPER_THREAD_H_
13 13
14 #include <limits> 14 #include <limits>
15 #include <memory> 15 #include <memory>
16 #include <string>
16 #include <utility> 17 #include <utility>
17 #include <vector> 18 #include <vector>
18 19
19 #include "webrtc/base/constructormagic.h" 20 #include "webrtc/base/constructormagic.h"
20 #include "webrtc/base/event.h" 21 #include "webrtc/base/event.h"
21 #include "webrtc/base/ignore_wundef.h" 22 #include "webrtc/base/ignore_wundef.h"
22 #include "webrtc/base/platform_thread.h" 23 #include "webrtc/base/platform_thread.h"
23 #include "webrtc/base/protobuf_utils.h"
24 #include "webrtc/base/swap_queue.h" 24 #include "webrtc/base/swap_queue.h"
25 #include "webrtc/logging/rtc_event_log/ringbuffer.h" 25 #include "webrtc/logging/rtc_event_log/ringbuffer.h"
26 #include "webrtc/system_wrappers/include/file_wrapper.h" 26 #include "webrtc/system_wrappers/include/file_wrapper.h"
27 27
28 #ifdef ENABLE_RTC_EVENT_LOG 28 #ifdef ENABLE_RTC_EVENT_LOG
29 // *.ph.h files are generated at build-time by the protobuf compiler. 29 // Files generated at build-time by the protobuf compiler.
30 RTC_PUSH_IGNORING_WUNDEF() 30 RTC_PUSH_IGNORING_WUNDEF()
31 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD 31 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
32 #include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h" 32 #include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h"
33 #else 33 #else
34 #include "webrtc/logging/rtc_event_log/rtc_event_log.pb.h" 34 #include "webrtc/logging/rtc_event_log/rtc_event_log.pb.h"
35 #endif 35 #endif
36 RTC_POP_IGNORING_WUNDEF() 36 RTC_POP_IGNORING_WUNDEF()
37 #endif 37 #endif
38 38
39 #ifdef ENABLE_RTC_EVENT_LOG 39 #ifdef ENABLE_RTC_EVENT_LOG
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 int64_t max_size_bytes_; 106 int64_t max_size_bytes_;
107 int64_t written_bytes_; 107 int64_t written_bytes_;
108 int64_t start_time_; 108 int64_t start_time_;
109 int64_t stop_time_; 109 int64_t stop_time_;
110 110
111 bool has_recent_event_; 111 bool has_recent_event_;
112 std::unique_ptr<rtclog::Event> most_recent_event_; 112 std::unique_ptr<rtclog::Event> most_recent_event_;
113 113
114 // Temporary space for serializing profobuf data. 114 // Temporary space for serializing profobuf data.
115 ProtoString output_string_; 115 std::string output_string_;
116 116
117 rtc::Event wake_periodically_; 117 rtc::Event wake_periodically_;
118 rtc::Event wake_from_hibernation_; 118 rtc::Event wake_from_hibernation_;
119 rtc::Event file_finished_; 119 rtc::Event file_finished_;
120 120
121 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtcEventLogHelperThread); 121 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtcEventLogHelperThread);
122 }; 122 };
123 123
124 } // namespace webrtc 124 } // namespace webrtc
125 125
126 #endif // ENABLE_RTC_EVENT_LOG 126 #endif // ENABLE_RTC_EVENT_LOG
127 127
128 #endif // WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_HELPER_THREAD_H_ 128 #endif // WEBRTC_LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_HELPER_THREAD_H_
OLDNEW
« no previous file with comments | « webrtc/logging/rtc_event_log/rtc_event_log.cc ('k') | webrtc/logging/rtc_event_log/rtc_event_log_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698