Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a40c8a1 authored by Josh Gao's avatar Josh Gao
Browse files

adb: switch reconnect_queue to std::set. 

We can't remove from the middle of a priority_queue, which a followup
commit wants to do, so switch to std::set, with the side benefit of
making operator< point the right direction.

Test: mma
Test: ./test_adb.py
Change-Id: I784c1dcc91f0a9cf760e9fa1710202e37e85432b
parent 043fbec6

adb/transport.cpp

+13 −11
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <deque>

#include <list>

#include <mutex>

#include <queue>

#include <set>

#include <thread>



#include <android-base/logging.h>
@@ -108,9 +108,11 @@ class ReconnectHandler { 
        size_t attempts_left;



        bool operator<(const ReconnectAttempt& rhs) const {

            // std::priority_queue returns the largest element first, so we want attempts that have

            // less time remaining (i.e. smaller time_points) to compare greater.

            return reconnect_time > rhs.reconnect_time;

            if (reconnect_time == rhs.reconnect_time) {

                return reinterpret_cast<uintptr_t>(transport) <

                       reinterpret_cast<uintptr_t>(rhs.transport);

            }

            return reconnect_time < rhs.reconnect_time;

        }

    };
@@ -123,7 +125,7 @@ class ReconnectHandler { 
    bool running_ GUARDED_BY(reconnect_mutex_) = true;

    std::thread handler_thread_;

    std::condition_variable reconnect_cv_;

    std::priority_queue<ReconnectAttempt> reconnect_queue_ GUARDED_BY(reconnect_mutex_);

    std::set<ReconnectAttempt> reconnect_queue_ GUARDED_BY(reconnect_mutex_);



    DISALLOW_COPY_AND_ASSIGN(ReconnectHandler);

};
@@ -145,8 +147,8 @@ void ReconnectHandler::Stop() { 
    // Drain the queue to free all resources.

    std::lock_guard<std::mutex> lock(reconnect_mutex_);

    while (!reconnect_queue_.empty()) {

        ReconnectAttempt attempt = reconnect_queue_.top();

        reconnect_queue_.pop();

        ReconnectAttempt attempt = *reconnect_queue_.begin();

        reconnect_queue_.erase(reconnect_queue_.begin());

        remove_transport(attempt.transport);

    }

}
@@ -176,7 +178,7 @@ void ReconnectHandler::Run() { 
                //        system_clock as its clock, so we're probably hosed if the clock changes,

                //        even if we use steady_clock throughout. This problem goes away once we

                //        switch to libc++.

                reconnect_cv_.wait_until(lock, reconnect_queue_.top().reconnect_time);

                reconnect_cv_.wait_until(lock, reconnect_queue_.begin()->reconnect_time);

            } else {

                reconnect_cv_.wait(lock);

            }
@@ -187,12 +189,12 @@ void ReconnectHandler::Run() { 
            // Go back to sleep in case |reconnect_cv_| woke up spuriously and we still

            // have more time to wait for the current attempt.

            auto now = std::chrono::steady_clock::now();

            if (reconnect_queue_.top().reconnect_time > now) {

            if (reconnect_queue_.begin()->reconnect_time > now) {

                continue;

            }



            attempt = reconnect_queue_.top();

            reconnect_queue_.pop();

            attempt = *reconnect_queue_.begin();

            reconnect_queue_.erase(reconnect_queue_.begin());

            if (attempt.transport->kicked()) {

                D("transport %s was kicked. giving up on it.", attempt.transport->serial.c_str());

                remove_transport(attempt.transport);