From fc0cbae579870192bc41f13a87daf29696417355 Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 10 Sep 2018 04:08:15 +0300 Subject: [PATCH] Fix some includes. GitOrigin-RevId: 9b36a638202fb8b34e13494efd6b4a48ff7f4845 --- td/telegram/Client.cpp | 2 +- td/telegram/cli.cpp | 4 +-- td/telegram/files/FileHashUploader.cpp | 2 +- tdactor/td/actor/impl/Scheduler-decl.h | 2 +- tdactor/td/actor/impl/Scheduler.h | 1 + tdactor/test/actors_simple.cpp | 1 + tddb/td/db/binlog/Binlog.cpp | 1 + tdutils/td/utils/BufferedUdp.h | 2 ++ tdutils/td/utils/DecTree.h | 1 + tdutils/td/utils/format.h | 8 +++--- tdutils/td/utils/port/Fd.h | 1 - tdutils/td/utils/port/FileFd.cpp | 1 + tdutils/td/utils/port/PollBase.h | 1 + tdutils/td/utils/port/ServerSocketFd.cpp | 2 ++ tdutils/td/utils/port/SocketFd.cpp | 2 ++ tdutils/td/utils/port/SocketFd.h | 4 +-- tdutils/td/utils/port/UdpSocketFd.cpp | 25 +++++++++++-------- tdutils/td/utils/port/detail/Epoll.h | 2 ++ tdutils/td/utils/port/detail/EventFdBsd.cpp | 1 + tdutils/td/utils/port/detail/EventFdLinux.cpp | 1 + .../td/utils/port/detail/EventFdWindows.cpp | 2 ++ tdutils/td/utils/port/detail/KQueue.h | 2 ++ tdutils/td/utils/port/detail/NativeFd.h | 2 +- tdutils/td/utils/port/detail/Poll.h | 1 + tdutils/td/utils/port/detail/PollableFd.h | 2 ++ tdutils/td/utils/port/detail/Select.h | 1 + tdutils/td/utils/port/detail/WineventPoll.cpp | 1 - tdutils/td/utils/port/detail/WineventPoll.h | 2 ++ tdutils/td/utils/port/path.cpp | 2 ++ tdutils/test/buffer.cpp | 1 + tdutils/test/port.cpp | 1 + test/http.cpp | 1 + 32 files changed, 57 insertions(+), 25 deletions(-) diff --git a/td/telegram/Client.cpp b/td/telegram/Client.cpp index 43d76504..38cb1b1b 100644 --- a/td/telegram/Client.cpp +++ b/td/telegram/Client.cpp @@ -13,8 +13,8 @@ #include "td/utils/crypto.h" #include "td/utils/logging.h" #include "td/utils/MpscPollableQueue.h" -#include "td/utils/port/detail/PollableFd.h" #include "td/utils/port/Poll.h" +#include "td/utils/port/PollFlags.h" #include "td/utils/port/thread.h" #include diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp index 7f30ce7c..a8d476e0 100644 --- a/td/telegram/cli.cpp +++ b/td/telegram/cli.cpp @@ -26,10 +26,10 @@ #include "td/utils/JsonBuilder.h" #include "td/utils/logging.h" #include "td/utils/misc.h" -#include "td/utils/port/detail/PollableFd.h" +#include "td/utils/port/detail/Pollable.h" #include "td/utils/port/FileFd.h" +#include "td/utils/port/PollFlags.h" #include "td/utils/port/signals.h" -#include "td/utils/port/SocketFd.h" #include "td/utils/port/Stat.h" #include "td/utils/port/StdStreams.h" #include "td/utils/port/thread_local.h" diff --git a/td/telegram/files/FileHashUploader.cpp b/td/telegram/files/FileHashUploader.cpp index ef242f41..7aae6b2a 100644 --- a/td/telegram/files/FileHashUploader.cpp +++ b/td/telegram/files/FileHashUploader.cpp @@ -18,8 +18,8 @@ #include "td/utils/MimeType.h" #include "td/utils/misc.h" #include "td/utils/PathView.h" -#include "td/utils/port/detail/PollableFd.h" #include "td/utils/port/FileFd.h" +#include "td/utils/port/PollFlags.h" #include "td/utils/Status.h" namespace td { diff --git a/tdactor/td/actor/impl/Scheduler-decl.h b/tdactor/td/actor/impl/Scheduler-decl.h index df1a30d6..fff95325 100644 --- a/tdactor/td/actor/impl/Scheduler-decl.h +++ b/tdactor/td/actor/impl/Scheduler-decl.h @@ -17,8 +17,8 @@ #include "td/utils/MpscPollableQueue.h" #include "td/utils/ObjectPool.h" #include "td/utils/port/detail/PollableFd.h" -#include "td/utils/port/EventFd.h" #include "td/utils/port/Poll.h" +#include "td/utils/port/PollFlags.h" #include "td/utils/port/thread_local.h" #include "td/utils/Slice.h" #include "td/utils/type_traits.h" diff --git a/tdactor/td/actor/impl/Scheduler.h b/tdactor/td/actor/impl/Scheduler.h index 1b21bfff..eda84250 100644 --- a/tdactor/td/actor/impl/Scheduler.h +++ b/tdactor/td/actor/impl/Scheduler.h @@ -15,6 +15,7 @@ #include "td/utils/MpscPollableQueue.h" #include "td/utils/ObjectPool.h" #include "td/utils/port/detail/PollableFd.h" +#include "td/utils/port/PollFlags.h" #include "td/utils/Slice.h" #include diff --git a/tdactor/test/actors_simple.cpp b/tdactor/test/actors_simple.cpp index d56aced8..a27ae454 100644 --- a/tdactor/test/actors_simple.cpp +++ b/tdactor/test/actors_simple.cpp @@ -13,6 +13,7 @@ #include "td/actor/Timeout.h" #include "td/utils/logging.h" +#include "td/utils/MpscPollableQueue.h" #include "td/utils/Observer.h" #include "td/utils/port/FileFd.h" #include "td/utils/port/thread.h" diff --git a/tddb/td/db/binlog/Binlog.cpp b/tddb/td/db/binlog/Binlog.cpp index 8089854f..02d226ba 100644 --- a/tddb/td/db/binlog/Binlog.cpp +++ b/tddb/td/db/binlog/Binlog.cpp @@ -15,6 +15,7 @@ #include "td/utils/misc.h" #include "td/utils/port/Clocks.h" #include "td/utils/port/path.h" +#include "td/utils/port/PollFlags.h" #include "td/utils/port/Stat.h" #include "td/utils/Random.h" #include "td/utils/ScopeGuard.h" diff --git a/tdutils/td/utils/BufferedUdp.h b/tdutils/td/utils/BufferedUdp.h index e3acbd2a..8965c7ff 100644 --- a/tdutils/td/utils/BufferedUdp.h +++ b/tdutils/td/utils/BufferedUdp.h @@ -7,11 +7,13 @@ #pragma once #include "td/utils/buffer.h" +#include "td/utils/logging.h" #include "td/utils/optional.h" #include "td/utils/port/detail/PollableFd.h" #include "td/utils/port/thread_local.h" #include "td/utils/port/UdpSocketFd.h" #include "td/utils/Span.h" +#include "td/utils/Status.h" #include "td/utils/VectorQueue.h" #include diff --git a/tdutils/td/utils/DecTree.h b/tdutils/td/utils/DecTree.h index b44f7a0c..c197f7b5 100644 --- a/tdutils/td/utils/DecTree.h +++ b/tdutils/td/utils/DecTree.h @@ -7,6 +7,7 @@ #pragma once #include "td/utils/int_types.h" +#include "td/utils/logging.h" #include "td/utils/Random.h" #include diff --git a/tdutils/td/utils/format.h b/tdutils/td/utils/format.h index 52a00bcf..c2263a60 100644 --- a/tdutils/td/utils/format.h +++ b/tdutils/td/utils/format.h @@ -17,7 +17,7 @@ namespace td { namespace format { /*** HexDump ***/ -template +template struct HexDumpSize { const unsigned char *data; }; @@ -26,12 +26,12 @@ inline char hex_digit(int x) { return "0123456789abcdef"[x]; } -template -StringBuilder &operator<<(StringBuilder &builder, const HexDumpSize &dump) { +template +StringBuilder &operator<<(StringBuilder &builder, const HexDumpSize &dump) { const unsigned char *ptr = dump.data; // TODO: append unsafe for (std::size_t i = 0; i < size; i++) { - int xy = ptr[reversed ? size - 1 - i : i]; + int xy = ptr[is_reversed ? size - 1 - i : i]; int x = xy >> 4; int y = xy & 15; builder << hex_digit(x) << hex_digit(y); diff --git a/tdutils/td/utils/port/Fd.h b/tdutils/td/utils/port/Fd.h index 5aac934e..c1e6486c 100644 --- a/tdutils/td/utils/port/Fd.h +++ b/tdutils/td/utils/port/Fd.h @@ -23,7 +23,6 @@ #include #include -#include #endif namespace td { diff --git a/tdutils/td/utils/port/FileFd.cpp b/tdutils/td/utils/port/FileFd.cpp index b0c4042e..e9fbdc97 100644 --- a/tdutils/td/utils/port/FileFd.cpp +++ b/tdutils/td/utils/port/FileFd.cpp @@ -16,6 +16,7 @@ #include "td/utils/logging.h" #include "td/utils/misc.h" #include "td/utils/port/detail/PollableFd.h" +#include "td/utils/port/PollFlags.h" #include "td/utils/port/sleep.h" #include "td/utils/StringBuilder.h" diff --git a/tdutils/td/utils/port/PollBase.h b/tdutils/td/utils/port/PollBase.h index 49fd369f..6f5098dd 100644 --- a/tdutils/td/utils/port/PollBase.h +++ b/tdutils/td/utils/port/PollBase.h @@ -7,6 +7,7 @@ #pragma once #include "td/utils/port/detail/PollableFd.h" +#include "td/utils/port/PollFlags.h" namespace td { class PollBase { diff --git a/tdutils/td/utils/port/ServerSocketFd.cpp b/tdutils/td/utils/port/ServerSocketFd.cpp index fd107db0..1aed2576 100644 --- a/tdutils/td/utils/port/ServerSocketFd.cpp +++ b/tdutils/td/utils/port/ServerSocketFd.cpp @@ -10,6 +10,7 @@ #include "td/utils/logging.h" #include "td/utils/port/IPAddress.h" +#include "td/utils/port/PollFlags.h" #if TD_PORT_POSIX @@ -29,6 +30,7 @@ #include "td/utils/VectorQueue.h" #endif +#include #include namespace td { diff --git a/tdutils/td/utils/port/SocketFd.cpp b/tdutils/td/utils/port/SocketFd.cpp index 0a30a973..c9471c04 100644 --- a/tdutils/td/utils/port/SocketFd.cpp +++ b/tdutils/td/utils/port/SocketFd.cpp @@ -8,6 +8,7 @@ #include "td/utils/logging.h" #include "td/utils/misc.h" +#include "td/utils/port/PollFlags.h" #if TD_PORT_WINDOWS #include "td/utils/buffer.h" @@ -26,6 +27,7 @@ #include #endif +#include #include namespace td { diff --git a/tdutils/td/utils/port/SocketFd.h b/tdutils/td/utils/port/SocketFd.h index 8abc529e..2a5a4b2f 100644 --- a/tdutils/td/utils/port/SocketFd.h +++ b/tdutils/td/utils/port/SocketFd.h @@ -64,10 +64,10 @@ class SocketFd { explicit SocketFd(std::unique_ptr impl); }; -namespace detail { #if TD_PORT_POSIX +namespace detail { Status get_socket_pending_error(const NativeFd &fd); -#endif } // namespace detail +#endif } // namespace td diff --git a/tdutils/td/utils/port/UdpSocketFd.cpp b/tdutils/td/utils/port/UdpSocketFd.cpp index 591c8bc8..c7ab2687 100644 --- a/tdutils/td/utils/port/UdpSocketFd.cpp +++ b/tdutils/td/utils/port/UdpSocketFd.cpp @@ -10,11 +10,13 @@ #include "td/utils/format.h" #include "td/utils/logging.h" #include "td/utils/misc.h" +#include "td/utils/port/PollFlags.h" #include "td/utils/port/SocketFd.h" #include "td/utils/VectorQueue.h" #if TD_PORT_WINDOWS #include "td/utils/port/detail/WineventPoll.h" +#include "td/utils/SpinLock.h" #endif #if TD_PORT_POSIX @@ -32,6 +34,7 @@ #endif // TD_PORT_POSIX #include +#include #include namespace td { @@ -97,21 +100,21 @@ class UdpSocketSendHelper { class UdpSocketFdImpl : private IOCP::Callback { public: - explicit UdpSocketFdImpl(NativeFd fd) : info(std::move(fd)) { + explicit UdpSocketFdImpl(NativeFd fd) : info_(std::move(fd)) { get_poll_info().add_flags(PollFlags::Write()); IOCP::get()->subscribe(get_native_fd(), this); is_receive_active_ = true; notify_iocp_connected(); } PollableFdInfo &get_poll_info() { - return info; + return info_; } const PollableFdInfo &get_poll_info() const { - return info; + return info_; } const NativeFd &get_native_fd() const { - return info.native_fd(); + return info_.native_fd(); } void close() { @@ -149,7 +152,7 @@ class UdpSocketFdImpl : private IOCP::Callback { } private: - PollableFdInfo info; + PollableFdInfo info_; SpinLock lock_; std::atomic refcnt_{1}; @@ -322,7 +325,7 @@ class UdpSocketFdImpl : private IOCP::Callback { void on_close() { VLOG(fd) << get_native_fd().io_handle() << " on close"; close_flag_ = true; - info.set_native_fd({}); + info_.set_native_fd({}); } bool dec_refcnt() { @@ -467,17 +470,17 @@ class UdpSocketSendHelper { class UdpSocketFdImpl { public: - explicit UdpSocketFdImpl(NativeFd fd) : info(std::move(fd)) { + explicit UdpSocketFdImpl(NativeFd fd) : info_(std::move(fd)) { } PollableFdInfo &get_poll_info() { - return info; + return info_; } const PollableFdInfo &get_poll_info() const { - return info; + return info_; } const NativeFd &get_native_fd() const { - return info.native_fd(); + return info_.native_fd(); } Status get_pending_error() { if (get_poll_info().get_flags().has_pending_error()) { @@ -638,7 +641,7 @@ class UdpSocketFdImpl { } private: - PollableFdInfo info; + PollableFdInfo info_; Status send_messages_slow(Span messages, size_t &cnt) { cnt = 0; diff --git a/tdutils/td/utils/port/detail/Epoll.h b/tdutils/td/utils/port/detail/Epoll.h index a6e024d2..fc433743 100644 --- a/tdutils/td/utils/port/detail/Epoll.h +++ b/tdutils/td/utils/port/detail/Epoll.h @@ -11,8 +11,10 @@ #ifdef TD_POLL_EPOLL #include "td/utils/common.h" +#include "td/utils/List.h" #include "td/utils/port/detail/PollableFd.h" #include "td/utils/port/PollBase.h" +#include "td/utils/port/PollFlags.h" #include diff --git a/tdutils/td/utils/port/detail/EventFdBsd.cpp b/tdutils/td/utils/port/detail/EventFdBsd.cpp index f4d37467..37fb2c0a 100644 --- a/tdutils/td/utils/port/detail/EventFdBsd.cpp +++ b/tdutils/td/utils/port/detail/EventFdBsd.cpp @@ -12,6 +12,7 @@ char disable_linker_warning_about_empty_file_event_fd_bsd_cpp TD_UNUSED; #include "td/utils/logging.h" #include "td/utils/port/detail/NativeFd.h" +#include "td/utils/port/PollFlags.h" #include "td/utils/port/SocketFd.h" #include "td/utils/Slice.h" diff --git a/tdutils/td/utils/port/detail/EventFdLinux.cpp b/tdutils/td/utils/port/detail/EventFdLinux.cpp index 89e2ecfe..a7271934 100644 --- a/tdutils/td/utils/port/detail/EventFdLinux.cpp +++ b/tdutils/td/utils/port/detail/EventFdLinux.cpp @@ -13,6 +13,7 @@ char disable_linker_warning_about_empty_file_event_fd_linux_cpp TD_UNUSED; #include "td/utils/logging.h" #include "td/utils/misc.h" #include "td/utils/port/detail/NativeFd.h" +#include "td/utils/port/PollFlags.h" #include "td/utils/Slice.h" #include diff --git a/tdutils/td/utils/port/detail/EventFdWindows.cpp b/tdutils/td/utils/port/detail/EventFdWindows.cpp index ede07498..60bfdc86 100644 --- a/tdutils/td/utils/port/detail/EventFdWindows.cpp +++ b/tdutils/td/utils/port/detail/EventFdWindows.cpp @@ -10,6 +10,8 @@ char disable_linker_warning_about_empty_file_event_fd_windows_cpp TD_UNUSED; #ifdef TD_EVENTFD_WINDOWS +#include "td/utils/logging.h" + namespace td { namespace detail { diff --git a/tdutils/td/utils/port/detail/KQueue.h b/tdutils/td/utils/port/detail/KQueue.h index 0e26df16..0c233168 100644 --- a/tdutils/td/utils/port/detail/KQueue.h +++ b/tdutils/td/utils/port/detail/KQueue.h @@ -11,8 +11,10 @@ #ifdef TD_POLL_KQUEUE #include "td/utils/common.h" +#include "td/utils/List.h" #include "td/utils/port/detail/PollableFd.h" #include "td/utils/port/PollBase.h" +#include "td/utils/port/PollFlags.h" #include diff --git a/tdutils/td/utils/port/detail/NativeFd.h b/tdutils/td/utils/port/detail/NativeFd.h index 5930f8e4..cf5479f7 100644 --- a/tdutils/td/utils/port/detail/NativeFd.h +++ b/tdutils/td/utils/port/detail/NativeFd.h @@ -11,6 +11,7 @@ #include "td/utils/common.h" #include "td/utils/MovableValue.h" #include "td/utils/Status.h" +#include "td/utils/StringBuilder.h" namespace td { @@ -59,7 +60,6 @@ class NativeFd { #endif }; -class StringBuilder; StringBuilder &operator<<(StringBuilder &sb, const NativeFd &fd); } // namespace td diff --git a/tdutils/td/utils/port/detail/Poll.h b/tdutils/td/utils/port/detail/Poll.h index 61d92b9a..9e5d1498 100644 --- a/tdutils/td/utils/port/detail/Poll.h +++ b/tdutils/td/utils/port/detail/Poll.h @@ -13,6 +13,7 @@ #include "td/utils/common.h" #include "td/utils/port/detail/PollableFd.h" #include "td/utils/port/PollBase.h" +#include "td/utils/port/PollFlags.h" #include diff --git a/tdutils/td/utils/port/detail/PollableFd.h b/tdutils/td/utils/port/detail/PollableFd.h index eb7ec8fd..b31e55db 100644 --- a/tdutils/td/utils/port/detail/PollableFd.h +++ b/tdutils/td/utils/port/detail/PollableFd.h @@ -8,12 +8,14 @@ #include "td/utils/format.h" #include "td/utils/List.h" +#include "td/utils/logging.h" #include "td/utils/Observer.h" #include "td/utils/port/detail/NativeFd.h" #include "td/utils/port/PollFlags.h" #include "td/utils/SpinLock.h" #include +#include namespace td { diff --git a/tdutils/td/utils/port/detail/Select.h b/tdutils/td/utils/port/detail/Select.h index ae303ff4..db947445 100644 --- a/tdutils/td/utils/port/detail/Select.h +++ b/tdutils/td/utils/port/detail/Select.h @@ -13,6 +13,7 @@ #include "td/utils/common.h" #include "td/utils/port/detail/PollableFd.h" #include "td/utils/port/PollBase.h" +#include "td/utils/port/PollFlags.h" #include diff --git a/tdutils/td/utils/port/detail/WineventPoll.cpp b/tdutils/td/utils/port/detail/WineventPoll.cpp index f23cfb33..6839e912 100644 --- a/tdutils/td/utils/port/detail/WineventPoll.cpp +++ b/tdutils/td/utils/port/detail/WineventPoll.cpp @@ -12,7 +12,6 @@ char disable_linker_warning_about_empty_file_wineventpoll_cpp TD_UNUSED; #include "td/utils/common.h" #include "td/utils/logging.h" -#include "td/utils/misc.h" #include "td/utils/port/PollBase.h" #include "td/utils/Status.h" diff --git a/tdutils/td/utils/port/detail/WineventPoll.h b/tdutils/td/utils/port/detail/WineventPoll.h index 3e7a205a..24f00450 100644 --- a/tdutils/td/utils/port/detail/WineventPoll.h +++ b/tdutils/td/utils/port/detail/WineventPoll.h @@ -15,7 +15,9 @@ #include "td/utils/port/detail/NativeFd.h" #include "td/utils/port/detail/PollableFd.h" #include "td/utils/port/PollBase.h" +#include "td/utils/port/PollFlags.h" #include "td/utils/port/thread.h" +#include "td/utils/Status.h" namespace td { namespace detail { diff --git a/tdutils/td/utils/port/path.cpp b/tdutils/td/utils/port/path.cpp index c1583d2c..44c1d622 100644 --- a/tdutils/td/utils/port/path.cpp +++ b/tdutils/td/utils/port/path.cpp @@ -6,6 +6,8 @@ // #include "td/utils/port/path.h" +#include "td/utils/port/detail/PollableFd.h" + #if TD_WINDOWS #include "td/utils/Random.h" #endif diff --git a/tdutils/test/buffer.cpp b/tdutils/test/buffer.cpp index a6346727..cdcb777b 100644 --- a/tdutils/test/buffer.cpp +++ b/tdutils/test/buffer.cpp @@ -7,6 +7,7 @@ #include "td/utils/tests.h" #include "td/utils/buffer.h" +#include "td/utils/Random.h" using namespace td; diff --git a/tdutils/test/port.cpp b/tdutils/test/port.cpp index 99b0a147..95c0d2a2 100644 --- a/tdutils/test/port.cpp +++ b/tdutils/test/port.cpp @@ -5,6 +5,7 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // #include "td/utils/common.h" +#include "td/utils/logging.h" #include "td/utils/port/FileFd.h" #include "td/utils/port/path.h" #include "td/utils/Slice.h" diff --git a/test/http.cpp b/test/http.cpp index 6d79c3ca..ee57c6c7 100644 --- a/test/http.cpp +++ b/test/http.cpp @@ -25,6 +25,7 @@ #include "td/utils/port/detail/PollableFd.h" #include "td/utils/port/FileFd.h" #include "td/utils/port/path.h" +#include "td/utils/port/PollFlags.h" #include "td/utils/port/thread_local.h" #include "td/utils/Random.h" #include "td/utils/Slice.h"