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

Commit db40a578 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 089d3c93: am e09c8a06: am e1f17ebb: Merge "Fixing debuggerd header output." 

* commit '089d3c93':
  Fixing debuggerd header output.
parents c603720a 089d3c93

debuggerd/tombstone.cpp

+2 −3
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static void dump_thread_info(log_t* log, pid_t pid, pid_t tid) { 
    fclose(fp);

  }



  _LOG(log, logtype::THREAD, "pid: %d, tid: %d, name: %s  >>> %s <<<\n", pid, tid,

  _LOG(log, logtype::HEADER, "pid: %d, tid: %d, name: %s  >>> %s <<<\n", pid, tid,

       threadname ? threadname : "UNKNOWN", procname ? procname : "UNKNOWN");

}
@@ -429,11 +429,10 @@ static bool dump_sibling_thread_report( 
      continue;

    }



    log->current_tid = new_tid;

    _LOG(log, logtype::THREAD, "--- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---\n");

    dump_thread_info(log, pid, new_tid);



    log->current_tid = new_tid;



    UniquePtr<Backtrace> backtrace(Backtrace::Create(pid, new_tid, map));

    if (backtrace->Unwind(0)) {

      dump_thread(backtrace.get(), log, total_sleep_time_usec);