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

Almost compiles

Browse Source 
GitOrigin-RevId: aad536022caddba0446a761e7ab1f3b4ac64f53b
This commit is contained in:
Arseny Smirnov 2018-08-14 10:42:40 +03:00
parent 093651fb22
commit 8a28e4b461
28 changed files with 66 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
benchmark/bench_http_server_cheat.cpp
View File

@ -39,8 +39,7 @@ class HelloWorld : public Actor {
size_t write_pos_{0}; size_t write_pos_{0};
void start_up() override { void start_up() override {
socket_fd_.get_fd().set_observer(this); subscribe(socket_fd_.get_poll_info().extract_pollable_fd(this));
subscribe(socket_fd_.get_fd());
HttpHeaderCreator hc; HttpHeaderCreator hc;
Slice content = "hello world"; Slice content = "hello world";
//auto content = BufferSlice("hello world"); //auto content = BufferSlice("hello world");
@ -56,7 +55,7 @@ class HelloWorld : public Actor {
void loop() override { void loop() override {
auto status = do_loop(); auto status = do_loop();
if (status.is_error()) { if (status.is_error()) {
unsubscribe(socket_fd_.get_fd()); unsubscribe(socket_fd_.get_poll_info().get_pollable_fd_ref());
stop(); stop();
LOG(ERROR) << "CLOSE: " << status; LOG(ERROR) << "CLOSE: " << status;
} }

3
benchmark/bench_http_server_fast.cpp
View File

@ -31,8 +31,7 @@ class HttpEchoConnection : public Actor {
HttpReader reader_; HttpReader reader_;
HttpQuery query_; HttpQuery query_;
void start_up() override { void start_up() override {
fd_.get_fd().set_observer(this); subscribe(fd_.get_poll_info().extract_pollable_fd(this));
subscribe(fd_.get_fd());
reader_.init(&fd_.input_buffer(), 1024 * 1024, 0); reader_.init(&fd_.input_buffer(), 1024 * 1024, 0);
} }

6
td/mtproto/HandshakeActor.cpp
View File

@ -32,8 +32,7 @@ void HandshakeActor::close() {
} }
void HandshakeActor::start_up() { void HandshakeActor::start_up() {
connection_->get_pollable().set_observer(this); subscribe(connection_->get_poll_info().extract_pollable_fd(this));
subscribe(connection_->get_pollable());
set_timeout_in(timeout_); set_timeout_in(timeout_);
yield(); yield();
} }
@ -59,8 +58,7 @@ void HandshakeActor::return_connection(Status status) {
if (status.is_error()) { if (status.is_error()) {
status = Status::Error(status.code(), PSLICE() << status.message() << " : " << raw_connection->debug_str_); status = Status::Error(status.code(), PSLICE() << status.message() << " : " << raw_connection->debug_str_);
} }
unsubscribe(raw_connection->get_pollable()); unsubscribe(raw_connection->get_poll_info().get_pollable_fd_ref());
raw_connection->get_pollable().set_observer(nullptr);
if (raw_connection_promise_) { if (raw_connection_promise_) {
if (status.is_error()) { if (status.is_error()) {
if (raw_connection->stats_callback()) { if (raw_connection->stats_callback()) {

4
td/mtproto/HandshakeConnection.h
View File

@ -32,8 +32,8 @@ class HandshakeConnection
handshake_->resume(this); handshake_->resume(this);
} }
Fd &get_pollable() { PollableFdInfo &get_poll_info() {
return raw_connection_->get_pollable(); return raw_connection_->get_poll_info();
} }
std::unique_ptr<RawConnection> move_as_raw_connection() { std::unique_ptr<RawConnection> move_as_raw_connection() {

4
td/mtproto/PingConnection.h
View File

@ -28,8 +28,8 @@ class PingConnection : private RawConnection::Callback {
: raw_connection_(std::move(raw_connection)), ping_count_(ping_count) { : raw_connection_(std::move(raw_connection)), ping_count_(ping_count) {
} }
Fd &get_pollable() { PollableFdInfo &get_poll_info() {
return raw_connection_->get_pollable(); return raw_connection_->get_poll_info();
} }
std::unique_ptr<RawConnection> move_as_raw_connection() { std::unique_ptr<RawConnection> move_as_raw_connection() {

4
td/mtproto/RawConnection.h
View File

@ -63,8 +63,8 @@ class RawConnection {
uint64 quick_ack_token = 0); uint64 quick_ack_token = 0);
uint64 send_no_crypto(const Storer &storer); uint64 send_no_crypto(const Storer &storer);
Fd &get_pollable() { PollableFdInfo &get_poll_info() {
return socket_fd_.get_fd(); return socket_fd_.get_poll_info();
} }
StatsCallback *stats_callback() { StatsCallback *stats_callback() {
return stats_callback_.get(); return stats_callback_.get();

4
td/mtproto/SessionConnection.cpp
View File

@ -667,8 +667,8 @@ SessionConnection::SessionConnection(Mode mode, std::unique_ptr<RawConnection> r
created_at_ = Time::now(); created_at_ = Time::now();
} }
Fd &SessionConnection::get_pollable() { PollableFdInfo &SessionConnection::get_poll_info() {
return raw_connection_->get_pollable(); return raw_connection_->get_poll_info();
} }
Status SessionConnection::init() { Status SessionConnection::init() {

2
td/mtproto/SessionConnection.h
View File

@ -69,7 +69,7 @@ class SessionConnection
SessionConnection(Mode mode, std::unique_ptr<RawConnection> raw_connection, AuthData *auth_data, SessionConnection(Mode mode, std::unique_ptr<RawConnection> raw_connection, AuthData *auth_data,
DhCallback *dh_callback); DhCallback *dh_callback);
Fd &get_pollable(); PollableFdInfo &get_poll_info();
// Interface // Interface
Result<uint64> TD_WARN_UNUSED_RESULT send_query(BufferSlice buffer, bool gzip_flag, int64 message_id = 0, Result<uint64> TD_WARN_UNUSED_RESULT send_query(BufferSlice buffer, bool gzip_flag, int64 message_id = 0,

10
td/telegram/Client.cpp
View File

@ -127,8 +127,7 @@ class TdProxy : public Actor {
void start_up() override { void start_up() override {
auto &fd = input_queue_->reader_get_event_fd(); auto &fd = input_queue_->reader_get_event_fd();
fd.get_fd().set_observer(this); ::td::subscribe(fd.get_poll_info().extract_pollable_fd(this), PollFlags::Read());
::td::subscribe(fd.get_fd(), Fd::Read);
class Callback : public TdCallback { class Callback : public TdCallback {
public: public:
@ -190,8 +189,7 @@ class TdProxy : public Actor {
void tear_down() override { void tear_down() override {
auto &fd = input_queue_->reader_get_event_fd(); auto &fd = input_queue_->reader_get_event_fd();
::td::unsubscribe(fd.get_fd()); ::td::unsubscribe(fd.get_poll_info().get_pollable_fd_ref());
fd.get_fd().set_observer(nullptr);
} }
}; };
@ -227,6 +225,8 @@ class Client::Impl final {
~Impl() { ~Impl() {
input_queue_->writer_put({0, nullptr}); input_queue_->writer_put({0, nullptr});
scheduler_thread_.join(); scheduler_thread_.join();
auto &event_fd = output_queue_->reader_get_event_fd();
poll_.unsubscribe(event_fd.get_poll_info().get_pollable_fd_ref());
} }
private: private:
@ -256,7 +256,7 @@ class Client::Impl final {
poll_.init(); poll_.init();
auto &event_fd = output_queue_->reader_get_event_fd(); auto &event_fd = output_queue_->reader_get_event_fd();
poll_.subscribe(event_fd.get_fd(), Fd::Read); poll_.subscribe(event_fd.get_poll_info().extract_pollable_fd(nullptr), PollFlags::Read());
} }
Response receive_unlocked(double timeout) { Response receive_unlocked(double timeout) {

2
td/telegram/cli.cpp
View File

@ -264,7 +264,7 @@ class CliClient final : public Actor {
} }
void update_users(const td_api::users &users) { void update_users(const td_api::users &users) {
Logger log{*log_interface, VERBOSITY_NAME(PLAIN)}; Logger log{*log_interface, LogOptions::plain(), VERBOSITY_NAME(PLAIN)};
for (auto &user_id : users.user_ids_) { for (auto &user_id : users.user_ids_) {
if (user_id == 0) { if (user_id == 0) {
continue; continue;

2
td/telegram/files/FileHashUploader.cpp
View File

@ -85,7 +85,7 @@ Status FileHashUploader::loop_sha() {
} }
resource_state_.start_use(limit); resource_state_.start_use(limit);
fd_.update_flags(Fd::Flag::Read); fd_.get_poll_info().add_flags(PollFlags::Read());
TRY_RESULT(read_size, fd_.flush_read(static_cast<size_t>(limit))); TRY_RESULT(read_size, fd_.flush_read(static_cast<size_t>(limit)));
if (read_size != static_cast<size_t>(limit)) { if (read_size != static_cast<size_t>(limit)) {
return Status::Error("unexpected end of file"); return Status::Error("unexpected end of file");

6
td/telegram/net/ConnectionCreator.cpp
View File

@ -100,8 +100,7 @@ class PingActor : public Actor {
ActorShared<> parent_; ActorShared<> parent_;
void start_up() override { void start_up() override {
ping_connection_->get_pollable().set_observer(this); subscribe(ping_connection_->get_poll_info().extract_pollable_fd(this));
subscribe(ping_connection_->get_pollable());
set_timeout_in(10); set_timeout_in(10);
yield(); yield();
} }
@ -138,8 +137,7 @@ class PingActor : public Actor {
CHECK(!promise_); CHECK(!promise_);
return; return;
} }
unsubscribe(raw_connection->get_pollable()); unsubscribe(raw_connection->get_poll_info().get_pollable_fd_ref());
raw_connection->get_pollable().set_observer(nullptr);
if (promise_) { if (promise_) {
if (status.is_error()) { if (status.is_error()) {
if (raw_connection->stats_callback()) { if (raw_connection->stats_callback()) {

5
td/telegram/net/Session.cpp
View File

@ -392,7 +392,7 @@ void Session::on_server_time_difference_updated() {
} }
void Session::on_before_close() { void Session::on_before_close() {
unsubscribe_before_close(current_info_->connection->get_pollable()); unsubscribe_before_close(current_info_->connection->get_poll_info().get_pollable_fd_ref());
} }
void Session::on_closed(Status status) { void Session::on_closed(Status status) {
@ -955,8 +955,7 @@ void Session::connection_open_finish(ConnectionInfo *info,
info->connection->set_online(connection_online_flag_); info->connection->set_online(connection_online_flag_);
} }
info->connection->set_name(name); info->connection->set_name(name);
info->connection->get_pollable().set_observer(this); subscribe(info->connection->get_poll_info().extract_pollable_fd(this));
subscribe(info->connection->get_pollable());
info->mode = mode_; info->mode = mode_;
info->state = ConnectionInfo::State::Ready; info->state = ConnectionInfo::State::Ready;
info->created_at = Time::now_cached(); info->created_at = Time::now_cached();

12
tdactor/td/actor/impl/Scheduler-decl.h
View File

@ -107,9 +107,9 @@ class Scheduler {
} }
void before_tail_send(const ActorId<> &actor_id); void before_tail_send(const ActorId<> &actor_id);
void subscribe(const Fd &fd, Fd::Flags flags = Fd::Write | Fd::Read); void subscribe(PollableFd fd, PollFlags flags = PollFlags::ReadWrite());
void unsubscribe(const Fd &fd); void unsubscribe(PollableFdRef fd);
void unsubscribe_before_close(const Fd &fd); void unsubscribe_before_close(PollableFdRef fd);
void yield_actor(Actor *actor); void yield_actor(Actor *actor);
void stop_actor(Actor *actor); void stop_actor(Actor *actor);
@ -239,9 +239,9 @@ class Scheduler {
}; };
/*** Interface to current scheduler ***/ /*** Interface to current scheduler ***/
void subscribe(const Fd &fd, Fd::Flags flags = Fd::Write | Fd::Read); void subscribe(PollableFd fd, PollFlags flags = PollFlags::ReadWrite());
void unsubscribe(const Fd &fd); void unsubscribe(PollableFdRef fd);
void unsubscribe_before_close(const Fd &fd); void unsubscribe_before_close(PollableFdRef fd);
template <class ActorT, class... Args> template <class ActorT, class... Args>
TD_WARN_UNUSED_RESULT ActorOwn<ActorT> create_actor(Slice name, Args &&... args); TD_WARN_UNUSED_RESULT ActorOwn<ActorT> create_actor(Slice name, Args &&... args);

7
tdactor/td/actor/impl/Scheduler.cpp
View File

@ -58,8 +58,7 @@ void Scheduler::ServiceActor::start_up() {
} }
auto &fd = inbound_->reader_get_event_fd(); auto &fd = inbound_->reader_get_event_fd();
fd.get_fd().set_observer(this); ::td::subscribe(fd.get_poll_info().extract_pollable_fd(this), PollFlags::Read());
::td::subscribe(fd.get_fd(), Fd::Read);
yield(); yield();
#endif #endif
} }
@ -184,7 +183,7 @@ void Scheduler::init(int32 id, std::vector<std::shared_ptr<MpscPollableQueue<Eve
#if !TD_THREAD_UNSUPPORTED && !TD_EVENTFD_UNSUPPORTED #if !TD_THREAD_UNSUPPORTED && !TD_EVENTFD_UNSUPPORTED
event_fd_.init(); event_fd_.init();
subscribe(event_fd_.get_fd(), Fd::Read); subscribe(event_fd_.get_poll_info().extract_pollable_fd(nullptr), PollFlags::Read());
#endif #endif
if (!outbound.empty()) { if (!outbound.empty()) {
@ -426,7 +425,7 @@ void Scheduler::run_poll(double timeout) {
poll_.run(static_cast<int32>(timeout * 1000 + 1)); poll_.run(static_cast<int32>(timeout * 1000 + 1));
#if !TD_THREAD_UNSUPPORTED && !TD_EVENTFD_UNSUPPORTED #if !TD_THREAD_UNSUPPORTED && !TD_EVENTFD_UNSUPPORTED
if (can_read(event_fd_.get_fd())) { if (event_fd_.get_poll_info().get_flags().can_read()) {
std::atomic_thread_fence(std::memory_order_acquire); std::atomic_thread_fence(std::memory_order_acquire);
event_fd_.acquire(); event_fd_.acquire();
} }

24
tdactor/td/actor/impl/Scheduler.h
View File

@ -254,16 +254,16 @@ void Scheduler::send(ActorRef actor_ref, Event &&event) {
[&]() { return std::move(event); }); [&]() { return std::move(event); });
} }
inline void Scheduler::subscribe(const Fd &fd, Fd::Flags flags) { inline void Scheduler::subscribe(PollableFd fd, PollFlags flags) {
poll_.subscribe(fd, flags); poll_.subscribe(std::move(fd), flags);
} }
inline void Scheduler::unsubscribe(const Fd &fd) { inline void Scheduler::unsubscribe(PollableFdRef fd) {
poll_.unsubscribe(fd); poll_.unsubscribe(std::move(fd));
} }
inline void Scheduler::unsubscribe_before_close(const Fd &fd) { inline void Scheduler::unsubscribe_before_close(PollableFdRef fd) {
poll_.unsubscribe_before_close(fd); poll_.unsubscribe_before_close(std::move(fd));
} }
inline void Scheduler::yield_actor(Actor *actor) { inline void Scheduler::yield_actor(Actor *actor) {
@ -353,16 +353,16 @@ inline void Scheduler::run(double timeout) {
} }
/*** Interface to current scheduler ***/ /*** Interface to current scheduler ***/
inline void subscribe(const Fd &fd, Fd::Flags flags) { inline void subscribe(PollableFd fd, PollFlags flags) {
Scheduler::instance()->subscribe(fd, flags); Scheduler::instance()->subscribe(std::move(fd), flags);
} }
inline void unsubscribe(const Fd &fd) { inline void unsubscribe(PollableFdRef fd) {
Scheduler::instance()->unsubscribe(fd); Scheduler::instance()->unsubscribe(std::move(fd));
} }
inline void unsubscribe_before_close(const Fd &fd) { inline void unsubscribe_before_close(PollableFdRef fd) {
Scheduler::instance()->unsubscribe_before_close(fd); Scheduler::instance()->unsubscribe_before_close(std::move(fd));
} }
template <class ActorT, class... Args> template <class ActorT, class... Args>

2
tdactor/test/actors_simple.cpp
View File

@ -281,7 +281,7 @@ class OpenClose final : public Actor {
CHECK(r_file_fd.is_ok()) << r_file_fd.error(); CHECK(r_file_fd.is_ok()) << r_file_fd.error();
auto file_fd = r_file_fd.move_as_ok(); auto file_fd = r_file_fd.move_as_ok();
// LOG(ERROR) << file_fd.get_native_fd(); // LOG(ERROR) << file_fd.get_native_fd();
file_fd.get_fd().set_observer(observer); file_fd.get_poll_info().extract_pollable_fd(observer);
file_fd.close(); file_fd.close();
cnt_--; cnt_--;
yield(); yield();

2
tddb/td/db/binlog/Binlog.cpp
View File

@ -483,7 +483,7 @@ Status Binlog::load_binlog(const Callback &callback, const Callback &debug_callb
update_read_encryption(); update_read_encryption();
fd_.update_flags(Fd::Flag::Read); fd_.get_poll_info().add_flags(PollFlags::Read());
info_.wrong_password = false; info_.wrong_password = false;
while (true) { while (true) {
BinlogEvent event; BinlogEvent event;

7
tdnet/td/net/HttpConnectionBase.cpp
View File

@ -41,8 +41,7 @@ void HttpConnectionBase::live_event() {
} }
void HttpConnectionBase::start_up() { void HttpConnectionBase::start_up() {
fd_.get_fd().set_observer(this); subscribe(fd_.get_poll_info().extract_pollable_fd(this));
subscribe(fd_.get_fd());
reader_.init(read_sink_.get_output(), max_post_size_, max_files_); reader_.init(read_sink_.get_output(), max_post_size_, max_files_);
if (state_ == State::Read) { if (state_ == State::Read) {
current_query_ = make_unique<HttpQuery>(); current_query_ = make_unique<HttpQuery>();
@ -51,7 +50,7 @@ void HttpConnectionBase::start_up() {
yield(); yield();
} }
void HttpConnectionBase::tear_down() { void HttpConnectionBase::tear_down() {
unsubscribe_before_close(fd_.get_fd()); unsubscribe_before_close(fd_.get_poll_info().get_pollable_fd_ref());
fd_.close(); fd_.close();
} }
@ -141,7 +140,7 @@ void HttpConnectionBase::loop() {
} }
Status pending_error; Status pending_error;
if (fd_.get_fd().has_pending_error()) { if (fd_.get_poll_info().get_flags().has_pending_error()) {
pending_error = fd_.get_pending_error(); pending_error = fd_.get_pending_error();
} }
if (pending_error.is_ok() && write_sink_.status().is_error()) { if (pending_error.is_ok() && write_sink_.status().is_error()) {

5
tdnet/td/net/TcpListener.cpp
View File

@ -26,14 +26,13 @@ void TcpListener::start_up() {
return; return;
} }
server_fd_ = r_socket.move_as_ok(); server_fd_ = r_socket.move_as_ok();
server_fd_.get_fd().set_observer(this); subscribe(server_fd_.get_poll_info().extract_pollable_fd(this));
subscribe(server_fd_.get_fd());
} }
void TcpListener::tear_down() { void TcpListener::tear_down() {
LOG(ERROR) << "TcpListener closed"; LOG(ERROR) << "TcpListener closed";
if (!server_fd_.empty()) { if (!server_fd_.empty()) {
unsubscribe_before_close(server_fd_.get_fd()); unsubscribe_before_close(server_fd_.get_poll_info().get_pollable_fd_ref());
server_fd_.close(); server_fd_.close();
} }
} }

6
tdnet/td/net/TransparentProxy.cpp
View File

@ -35,8 +35,7 @@ void TransparentProxy::on_error(Status status) {
void TransparentProxy::tear_down() { void TransparentProxy::tear_down() {
VLOG(proxy) << "Finish to connect to proxy"; VLOG(proxy) << "Finish to connect to proxy";
unsubscribe(fd_.get_fd()); unsubscribe(fd_.get_poll_info().get_pollable_fd_ref());
fd_.get_fd().set_observer(nullptr);
if (callback_) { if (callback_) {
if (!fd_.input_buffer().empty()) { if (!fd_.input_buffer().empty()) {
LOG(ERROR) << "Have " << fd_.input_buffer().size() << " unread bytes"; LOG(ERROR) << "Have " << fd_.input_buffer().size() << " unread bytes";
@ -54,8 +53,7 @@ void TransparentProxy::hangup() {
void TransparentProxy::start_up() { void TransparentProxy::start_up() {
VLOG(proxy) << "Begin to connect to proxy"; VLOG(proxy) << "Begin to connect to proxy";
fd_.get_fd().set_observer(this); subscribe(fd_.get_poll_info().extract_pollable_fd(this));
subscribe(fd_.get_fd());
set_timeout_in(10); set_timeout_in(10);
if (can_write(fd_)) { if (can_write(fd_)) {
loop(); loop();

2
tdutils/td/utils/BufferedFd.h
View File

@ -9,7 +9,7 @@
#include "td/utils/buffer.h" #include "td/utils/buffer.h"
#include "td/utils/format.h" #include "td/utils/format.h"
#include "td/utils/logging.h" #include "td/utils/logging.h"
#include "td/utils/port/Fd.h" #include "td/utils/port/detail/PollableFd.h"
#include "td/utils/Slice.h" #include "td/utils/Slice.h"
#include "td/utils/Status.h" #include "td/utils/Status.h"

8
tdutils/td/utils/Closure.h
View File

@ -107,10 +107,10 @@ class DelayedClosure {
explicit DelayedClosure(FunctionT func, ArgsT... args) : args(func, std::forward<ArgsT>(args)...) { explicit DelayedClosure(FunctionT func, ArgsT... args) : args(func, std::forward<ArgsT>(args)...) {
} }
//template <class F> template <class F>
//void for_each(const F &f) { void for_each(const F &f) {
//tuple_for_each(args, f); tuple_for_each(args, f);
//} }
private: private:
using ArgsStorageT = std::tuple<FunctionT, typename std::decay<ArgsT>::type...>; using ArgsStorageT = std::tuple<FunctionT, typename std::decay<ArgsT>::type...>;

2
tdutils/td/utils/MpscPollableQueue.h
View File

@ -86,7 +86,7 @@ class MpscPollableQueue {
while ((res = reader_wait_nonblock()) == 0) { while ((res = reader_wait_nonblock()) == 0) {
// TODO: reader_flush? // TODO: reader_flush?
pollfd fd; pollfd fd;
fd.fd = reader_get_event_fd().get_fd().get_native_fd(); fd.fd = reader_get_event_fd().get_poll_info().native_fd().fd();
fd.events = POLLIN; fd.events = POLLIN;
poll(&fd, 1, -1); poll(&fd, 1, -1);
} }

2
tdutils/td/utils/queue.h
View File

@ -401,7 +401,7 @@ class PollQueue : public QueueT {
while ((res = reader_wait_nonblock()) == 0) { while ((res = reader_wait_nonblock()) == 0) {
// TODO: reader_flush? // TODO: reader_flush?
pollfd fd; pollfd fd;
fd.fd = reader_get_event_fd().get_fd().get_native_fd(); fd.fd = reader_get_event_fd().get_poll_info().native_fd().fd();
fd.events = POLLIN; fd.events = POLLIN;
poll(&fd, 1, -1); poll(&fd, 1, -1);
} }

2
test/http.cpp
View File

@ -285,7 +285,7 @@ TEST(Http, aes_file_encryption) {
source >> aes_encode >> sink; source >> aes_encode >> sink;
fd.set_input_writer(&input_writer); fd.set_input_writer(&input_writer);
fd.update_flags(Fd::Flag::Read); fd.get_poll_info().add_flags(PollFlags::Read());
while (can_read(fd)) { while (can_read(fd)) {
fd.flush_read(4096).ensure(); fd.flush_read(4096).ensure();
source.wakeup(); source.wakeup();

5
test/mtproto.cpp
View File

@ -95,13 +95,12 @@ class TestPingActor : public Actor {
mtproto::TransportType{mtproto::TransportType::Tcp, 0, ""}, nullptr), mtproto::TransportType{mtproto::TransportType::Tcp, 0, ""}, nullptr),
3); 3);
ping_connection_->get_pollable().set_observer(this); subscribe(ping_connection_->get_poll_info().extract_pollable_fd(this));
subscribe(ping_connection_->get_pollable());
set_timeout_in(10); set_timeout_in(10);
yield(); yield();
} }
void tear_down() override { void tear_down() override {
unsubscribe_before_close(ping_connection_->get_pollable()); unsubscribe_before_close(ping_connection_->get_poll_info().get_pollable_fd_ref());
ping_connection_->close(); ping_connection_->close();
Scheduler::instance()->finish(); Scheduler::instance()->finish();
} }

12
test/tdclient.cpp
View File

@ -41,16 +41,6 @@ static void check_td_error(T &result) {
CHECK(result->get_id() != td_api::error::ID) << to_string(result); CHECK(result->get_id() != td_api::error::ID) << to_string(result);
} }
static void rmrf(CSlice path) {
td::walk_path(path, [](CSlice path, bool is_dir) {
if (is_dir) {
td::rmdir(path).ignore();
} else {
td::unlink(path).ignore();
}
});
}
class TestClient : public Actor { class TestClient : public Actor {
public: public:
explicit TestClient(string name) : name_(std::move(name)) { explicit TestClient(string name) : name_(std::move(name)) {
@ -143,7 +133,7 @@ class TestClient : public Actor {
} }
void start_up() override { void start_up() override {
rmrf(name_); rmrf(name_).ignore();
set_context(std::make_shared<td::ActorContext>()); set_context(std::make_shared<td::ActorContext>());
set_tag(name_); set_tag(name_);
LOG(INFO) << "START UP!"; LOG(INFO) << "START UP!";