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

Commit c45ead81 authored by Rhed Jao's avatar Rhed Jao Committed by Android (Google) Code Review
Browse files

Merge "Deletes temporary files from thread pool when report is cancel"

parents d4e171f2 0daac91e

cmds/dumpstate/DumpPool.cpp

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ void DumpPool::waitForTask(const std::string& task_name, const std::string& titl 
    }

}



void DumpPool::deleteTempFiles() {

    deleteTempFiles(tmp_root_);

}



void DumpPool::setLogDuration(bool log_duration) {

    log_duration_ = log_duration;

}

cmds/dumpstate/DumpPool.h

+5 −0
Original line number Diff line number Diff line
@@ -134,6 +134,11 @@ class DumpPool { 
     */

    void waitForTask(const std::string& task_name, const std::string& title, int out_fd);



    /*

     * Deletes temporary files created by DumpPool.

     */

    void deleteTempFiles();



    static const std::string PREFIX_TMPFILE_NAME;



  private:

cmds/dumpstate/dumpstate.cpp

+9 −0
Original line number Diff line number Diff line
@@ -2688,6 +2688,15 @@ void Dumpstate::Cancel() { 
    }

    tombstone_data_.clear();

    anr_data_.clear();



    // Instead of shutdown the pool, we delete temporary files directly since

    // shutdown blocking the call.

    if (dump_pool_) {

        dump_pool_->deleteTempFiles();

    }

    if (zip_entry_tasks_) {

        zip_entry_tasks_->run(/*do_cancel =*/ true);

    }

}



/*