tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

NativeFd fixes.

Browse Source 
GitOrigin-RevId: b792887066dc5f004f3d4f61224840be4cd01eeb
This commit is contained in:
levlam 2019-08-01 02:48:34 +03:00
parent 1d570ca85c
commit dacd81a8fa
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tdutils/td/utils/port/detail/Epoll.h
View File

@ -12,6 +12,7 @@
#include "td/utils/common.h" #include "td/utils/common.h"
#include "td/utils/List.h" #include "td/utils/List.h"
#include "td/utils/port/detail/NativeFd.h"
#include "td/utils/port/detail/PollableFd.h" #include "td/utils/port/detail/PollableFd.h"
#include "td/utils/port/PollBase.h" #include "td/utils/port/PollBase.h"
#include "td/utils/port/PollFlags.h" #include "td/utils/port/PollFlags.h"

1
tdutils/td/utils/port/detail/KQueue.h
View File

@ -12,6 +12,7 @@
#include "td/utils/common.h" #include "td/utils/common.h"
#include "td/utils/List.h" #include "td/utils/List.h"
#include "td/utils/port/detail/NativeFd.h"
#include "td/utils/port/detail/PollableFd.h" #include "td/utils/port/detail/PollableFd.h"
#include "td/utils/port/PollBase.h" #include "td/utils/port/PollBase.h"
#include "td/utils/port/PollFlags.h" #include "td/utils/port/PollFlags.h"

27
tdutils/td/utils/port/detail/NativeFd.cpp
View File

@ -16,8 +16,8 @@
#endif #endif
#if TD_FD_DEBUG #if TD_FD_DEBUG
#include <set>
#include <mutex> #include <mutex>
#include <set>
#endif #endif
namespace td { namespace td {
@ -26,7 +26,7 @@ namespace td {
class FdSet { class FdSet {
public: public:
void on_create_fd(NativeFd::Fd fd) { void on_create_fd(NativeFd::Fd fd) {
CHECK(fd >= 0); CHECK(is_valid(fd));
if (is_stdio(fd)) { if (is_stdio(fd)) {
return; return;
} }
@ -38,7 +38,7 @@ class FdSet {
} }
void on_release_fd(NativeFd::Fd fd) { void on_release_fd(NativeFd::Fd fd) {
CHECK(fd >= 0); CHECK(is_valid(fd));
if (is_stdio(fd)) { if (is_stdio(fd)) {
return; return;
} }
@ -46,7 +46,7 @@ class FdSet {
} }
Status validate(NativeFd::Fd fd) { Status validate(NativeFd::Fd fd) {
if (fd < 0) { if (!is_valid(fd)) {
return Status::Error(PSLICE() << "Invalid fd: " << fd); return Status::Error(PSLICE() << "Invalid fd: " << fd);
} }
if (is_stdio(fd)) { if (is_stdio(fd)) {
@ -60,7 +60,7 @@ class FdSet {
} }
void on_close_fd(NativeFd::Fd fd) { void on_close_fd(NativeFd::Fd fd) {
CHECK(fd >= 0); CHECK(is_valid(fd));
if (is_stdio(fd)) { if (is_stdio(fd)) {
return; return;
} }
@ -75,8 +75,20 @@ class FdSet {
std::mutex mutex_; std::mutex mutex_;
std::set<NativeFd::Fd> fds_; std::set<NativeFd::Fd> fds_;
bool is_stdio(NativeFd::Fd fd) { bool is_stdio(NativeFd::Fd fd) const {
#if TD_PORT_WINDOWS
return fd == STD_INPUT_HANDLE || fd == STD_OUTPUT_HANDLE || fd == STD_ERROR_HANDLE;
#else
return fd >= 0 && fd <= 2; return fd >= 0 && fd <= 2;
#endif
}
bool is_valid(NativeFd::Fd fd) const {
#if TD_PORT_WINDOWS
return fd != INVALID_HANDLE_VALUE;
#else
return fd >= 0;
#endif
} }
}; };
@ -88,6 +100,7 @@ FdSet &get_fd_set() {
} // namespace } // namespace
#endif #endif
Status NativeFd::validate() const { Status NativeFd::validate() const {
#if TD_FD_DEBUG #if TD_FD_DEBUG
return get_fd_set().validate(fd_.get()); return get_fd_set().validate(fd_.get());
@ -114,7 +127,9 @@ NativeFd::NativeFd(Socket socket) : fd_(reinterpret_cast<Fd>(socket)), is_socket
VLOG(fd) << *this << " create"; VLOG(fd) << *this << " create";
} }
#endif #endif
NativeFd &NativeFd::operator=(NativeFd &&from) { NativeFd &NativeFd::operator=(NativeFd &&from) {
CHECK(this != &from);
close(); close();
fd_ = std::move(from.fd_); fd_ = std::move(from.fd_);
#if TD_PORT_WINDOWS #if TD_PORT_WINDOWS