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

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

Issue 2915253002: Delete SignalThread class. (Closed)
Patch Set: Implement Destroy logic, using new method MessageQueue::PostFunctor. Created 3 years, 5 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 #include <memory>
22 23
23 #include "webrtc/base/asyncresolverinterface.h" 24 #include "webrtc/base/asyncresolverinterface.h"
24 #include "webrtc/base/signalthread.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 #include "webrtc/base/thread_checker.h"
27 28
28 namespace rtc { 29 namespace rtc {
29 30
30 class AsyncResolverTest; 31 class Thread;
32 class TaskQueue;
31 33
32 // AsyncResolver will perform async DNS resolution, signaling the result on 34 // AsyncResolver will perform async DNS resolution, signaling the result on the
33 // the SignalDone from AsyncResolverInterface when the operation completes. 35 // SignalDone from AsyncResolverInterface when the operation completes.
34 class AsyncResolver : public SignalThread, public AsyncResolverInterface { 36 // SignalDone is fired on the same thread on which the AsyncResolver was
37 // constructed.
38 class AsyncResolver : public AsyncResolverInterface {
35 public: 39 public:
36 AsyncResolver(); 40 AsyncResolver();
37 ~AsyncResolver() override; 41 ~AsyncResolver() override;
38 42
39 void Start(const SocketAddress& addr) override; 43 void Start(const SocketAddress& addr) override;
40 bool GetResolvedAddress(int family, SocketAddress* addr) const override; 44 bool GetResolvedAddress(int family, SocketAddress* addr) const override;
41 int GetError() const override; 45 int GetError() const override;
42 void Destroy(bool wait) override; 46 void Destroy(bool wait) override;
43 47
44 const std::vector<IPAddress>& addresses() const { return addresses_; } 48 const std::vector<IPAddress>& addresses() const { return addresses_; }
45 void set_error(int error) { error_ = error; }
46
47 protected:
48 void DoWork() override;
49 void OnWorkDone() override;
50 49
51 private: 50 private:
51 void ResolveDone(int error, std::vector<IPAddress> addresses);
52
53 enum class State { NONE, PENDING, DESTROYED };
54
55 State state_ ACCESS_ON(construction_thread_) ;
56
57 rtc::Thread* const construction_thread_;
58 // Queue used only for a single task.
59 std::unique_ptr<TaskQueue> resolver_queue_;
52 SocketAddress addr_; 60 SocketAddress addr_;
53 std::vector<IPAddress> addresses_; 61 std::vector<IPAddress> addresses_;
54 int error_; 62 int error_ = -1;
55 }; 63 };
56 64
57 // rtc namespaced wrappers for inet_ntop and inet_pton so we can avoid 65 // rtc namespaced wrappers for inet_ntop and inet_pton so we can avoid
58 // the windows-native versions of these. 66 // the windows-native versions of these.
59 const char* inet_ntop(int af, const void *src, char* dst, socklen_t size); 67 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); 68 int inet_pton(int af, const char* src, void *dst);
61 69
62 bool HasIPv4Enabled(); 70 bool HasIPv4Enabled();
63 bool HasIPv6Enabled(); 71 bool HasIPv6Enabled();
64 } // namespace rtc 72 } // namespace rtc
65 73
66 #endif // WEBRTC_BASE_NETHELPERS_H_ 74 #endif // WEBRTC_BASE_NETHELPERS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698