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

Commit a2fd28ee authored by Josh Gao's avatar Josh Gao Committed by Gerrit Code Review
Browse files

Merge changes I8b3e8a3b,I4976abef,I31dadb9c 

* changes:
  tombstoned: silence spurious error messages.
  Actually don't start tombstoned until /data is mounted.
  debuggerd_handler: add SIGSYS to the list of handled signals.
parents d965fbfc 8498016b

debuggerd/include/debuggerd/handler.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ static void __attribute__((__unused__)) debuggerd_register_handlers(struct sigac 
#if defined(SIGSTKFLT)

#if defined(SIGSTKFLT)

  sigaction(SIGSTKFLT, action, nullptr);

  sigaction(SIGSTKFLT, action, nullptr);

#endif

#endif

  sigaction(SIGSYS, action, nullptr);

  sigaction(SIGTRAP, action, nullptr);

  sigaction(SIGTRAP, action, nullptr);

  sigaction(DEBUGGER_SIGNAL, action, nullptr);

  sigaction(DEBUGGER_SIGNAL, action, nullptr);

}

}

debuggerd/tombstoned/tombstoned.cpp

+7 −1
Original line number Original line Diff line number Diff line
@@ -85,7 +85,13 @@ static void find_oldest_tombstone() { 
    std::string path = android::base::StringPrintf("%stombstone_%02zu", kTombstoneDirectory, i);

    std::string path = android::base::StringPrintf("%stombstone_%02zu", kTombstoneDirectory, i);

    struct stat st;

    struct stat st;

    if (stat(path.c_str(), &st) != 0) {

    if (stat(path.c_str(), &st) != 0) {

      if (errno == ENOENT) {

        oldest_tombstone = i;

        break;

      } else {

        PLOG(ERROR) << "failed to stat " << path;

        PLOG(ERROR) << "failed to stat " << path;

        continue;

      }

    }

    }





    if (st.st_mtime < oldest_time) {

    if (st.st_mtime < oldest_time) {

debuggerd/tombstoned/tombstoned.rc

+3 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,9 @@ service tombstoned /system/bin/tombstoned 
    user tombstoned

    user tombstoned

    group system

    group system





    # Don't start tombstoned until after the real /data is mounted.

    class late_start



    socket tombstoned_crash seqpacket 0666 system system

    socket tombstoned_crash seqpacket 0666 system system

    socket tombstoned_intercept seqpacket 0666 system system

    socket tombstoned_intercept seqpacket 0666 system system

    writepid /dev/cpuset/system-background/tasks
 
    writepid /dev/cpuset/system-background/tasks

rootdir/init.rc

+0 −3
Original line number Original line Diff line number Diff line
@@ -359,9 +359,6 @@ on post-fs-data 
    start vold

    start vold

    installkey /data

    installkey /data





    # start tombstoned to record early-boot crashes.

    start tombstoned



    # Start bootcharting as soon as possible after the data partition is

    # Start bootcharting as soon as possible after the data partition is

    # mounted to collect more data.

    # mounted to collect more data.

    mkdir /data/bootchart 0755 shell shell

    mkdir /data/bootchart 0755 shell shell