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

Side by Side Diff: webrtc/base/nethelpers.h

Issue 2915253002: Delete SignalThread class. (Closed)
Patch Set: Write the member variables for the result only on the |construction_thread_|. Created 3 years, 6 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 2008 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2008 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_BASE_NETHELPERS_H_ 11 #ifndef WEBRTC_BASE_NETHELPERS_H_
12 #define WEBRTC_BASE_NETHELPERS_H_ 12 #define WEBRTC_BASE_NETHELPERS_H_
13 13
14 #if defined(WEBRTC_POSIX) 14 #if defined(WEBRTC_POSIX)
15 #include <netdb.h> 15 #include <netdb.h>
16 #include <stddef.h> 16 #include <stddef.h>
17 #elif WEBRTC_WIN 17 #elif WEBRTC_WIN
18 #include <winsock2.h> // NOLINT 18 #include <winsock2.h> // NOLINT
19 #endif 19 #endif
20 20
21 #include <list> 21 #include <list>
22 22
23 #include "webrtc/base/asyncresolverinterface.h" 23 #include "webrtc/base/asyncresolverinterface.h"
24 #include "webrtc/base/signalthread.h" 24 #include "webrtc/base/platform_thread.h"
25 #include "webrtc/base/sigslot.h" 25 #include "webrtc/base/sigslot.h"
26 #include "webrtc/base/socketaddress.h" 26 #include "webrtc/base/socketaddress.h"
27 27
28 namespace rtc { 28 namespace rtc {
29 29
30 class AsyncResolverTest; 30 class Thread;
31 31
32 // AsyncResolver will perform async DNS resolution, signaling the result on 32 // AsyncResolver will perform async DNS resolution, signaling the result on the
33 // the SignalDone from AsyncResolverInterface when the operation completes. 33 // SignalDone from AsyncResolverInterface when the operation completes.
34 class AsyncResolver : public SignalThread, public AsyncResolverInterface { 34 // SignalDone is fired on the same thread on which the AsyncResolver was
35 // constructed.
36 class AsyncResolver : public AsyncResolverInterface {
35 public: 37 public:
36 AsyncResolver(); 38 AsyncResolver();
37 ~AsyncResolver() override; 39 ~AsyncResolver() override;
38 40
39 void Start(const SocketAddress& addr) override; 41 void Start(const SocketAddress& addr) override;
40 bool GetResolvedAddress(int family, SocketAddress* addr) const override; 42 bool GetResolvedAddress(int family, SocketAddress* addr) const override;
41 int GetError() const override; 43 int GetError() const override;
42 void Destroy(bool wait) override; 44 void Destroy(bool wait) override;
43 45
44 const std::vector<IPAddress>& addresses() const { return addresses_; } 46 const std::vector<IPAddress>& addresses() const { return addresses_; }
45 void set_error(int error) { error_ = error; } 47 void set_error(int error) { error_ = error; }
46 48
47 protected: 49 private:
48 void DoWork() override; 50 // Worker thread main function.
49 void OnWorkDone() override; 51 static void ThreadEntry_w(void* p);
52 void ResolveAddress_w();
50 53
51 private: 54 void ResolveDone(int error, std::vector<IPAddress> addresses);
tommi 2017/06/15 10:20:32 passing by value intentionally? If so, a comment a
nisse-webrtc 2017/06/15 11:33:47 I was aiming to keep this as simple as possible, a
55
56 rtc::Thread* construction_thread_;
tommi 2017/06/15 10:20:32 rtc::Thread* const construction_thread_;
nisse-webrtc 2017/06/15 11:33:47 Done.
57 PlatformThread worker_;
tommi 2017/06/15 10:20:32 nit: resolve_thread_
nisse-webrtc 2017/06/15 11:33:47 Not doing this now, since I'll attempt to replace
52 SocketAddress addr_; 58 SocketAddress addr_;
53 std::vector<IPAddress> addresses_; 59 std::vector<IPAddress> addresses_;
54 int error_; 60 int error_ = -1;
55 }; 61 };
56 62
57 // rtc namespaced wrappers for inet_ntop and inet_pton so we can avoid 63 // rtc namespaced wrappers for inet_ntop and inet_pton so we can avoid
58 // the windows-native versions of these. 64 // the windows-native versions of these.
59 const char* inet_ntop(int af, const void *src, char* dst, socklen_t size); 65 const char* inet_ntop(int af, const void *src, char* dst, socklen_t size);
60 int inet_pton(int af, const char* src, void *dst); 66 int inet_pton(int af, const char* src, void *dst);
61 67
62 bool HasIPv4Enabled(); 68 bool HasIPv4Enabled();
63 bool HasIPv6Enabled(); 69 bool HasIPv6Enabled();
64 } // namespace rtc 70 } // namespace rtc
65 71
66 #endif // WEBRTC_BASE_NETHELPERS_H_ 72 #endif // WEBRTC_BASE_NETHELPERS_H_
OLDNEW
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | webrtc/base/nethelpers.cc » ('j') | webrtc/base/nethelpers.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698