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

Commit 4d8e3eaf authored by Nikita Ioffe's avatar Nikita Ioffe
Browse files

Don't retrigger bootstat during userspace reboot. 

Userspace reboot can be treated as extension of runtime restart: instead
of restarting just system_server, it restarts all post-data services.

Test: adb reboot userspace
Test: checked bootstat didn't run again.
Test: system/core/bootstat/boot_reason_test.sh
Bug: 135984674
Change-Id: Ieda4b201f9b9294a3a54b7f0118ee769f5dd2065
parent cb1a8e7f

bootstat/boot_reason_test.sh

+10 −10
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
# - watch adb logcat -b all -d -s bootstat

# - watch adb logcat -b all -d | audit2allow

# - wait until screen is up, boot has completed, can mean wait for

#   sys.boot_completed=1 and sys.logbootcomplete=1 to be true

#   sys.boot_completed=1 and sys.bootstat.first_boot_completed=1 to be true

#

# All test frames, and nothing else, must be function names prefixed and

# specifiged with the pattern 'test_<test>() {' as this is also how the
@@ -230,13 +230,13 @@ wait_for_screen() { 
      if [ -n "`get_property sys.boot.reason`" ]

      then

        vals=`get_property |

              sed -n 's/[[]sys[.]\(boot_completed\|logbootcomplete\)[]]: [[]\([01]\)[]]$/\1=\2/p'`

        if [ "${vals}" = "`echo boot_completed=1 ; echo logbootcomplete=1`" ]

              sed -n 's/[[]sys[.]\(boot_completed\|bootstat.first_boot_completed\)[]]: [[]\([01]\)[]]$/\1=\2/p'`

        if [ "${vals}" = "`echo boot_completed=1 ; echo bootstat.first_boot_completed=1`" ]

        then

          sleep 1

          break

        fi

        if [ "${vals}" = "`echo logbootcomplete=1 ; echo boot_completed=1`" ]

        if [ "${vals}" = "`echo bootstat.first_boot_completed=1 ; echo boot_completed=1`" ]

        then

          sleep 1

          break
@@ -384,15 +384,15 @@ init : processing action (post-fs-data) from (/system/etc/init/bootstat.rc 
init    : processing action (boot) from (/system/etc/init/bootstat.rc

init    : processing action (ro.boot.bootreason=*) from (/system/etc/init/bootstat.rc

init    : processing action (ro.boot.bootreason=* && post-fs) from (/system/etc/init/bootstat.rc

init    : processing action (zygote-start) from (/system/etc/init/bootstat.rc

init    : processing action (sys.boot_completed=1 && sys.logbootcomplete=1) from (/system/etc/init/bootstat.rc

init    : processing action (sys.bootstat.first_zygote_start=0 && zygote-start) from (/system/etc/init/bootstat.rc

init    : processing action (sys.boot_completed=1 && sys.bootstat.first_boot_completed=0) from (/system/etc/init/bootstat.rc

 (/system/bin/bootstat --record_boot_complete --record_boot_reason --record_time_since_factory_reset -l)'

 (/system/bin/bootstat --set_system_boot_reason --record_boot_complete --record_boot_reason --record_time_since_factory_reset -l)'

 (/system/bin/bootstat -r post_decrypt_time_elapsed)'

init    : Command 'exec - system log -- /system/bin/bootstat --record_boot_complete' action=sys.boot_completed=1 && sys.logbootcomplete=1 (/system/etc/init/bootstat.rc:

init    : Command 'exec - system log -- /system/bin/bootstat --record_boot_reason' action=sys.boot_completed=1 && sys.logbootcomplete=1 (/system/etc/init/bootstat.rc:

init    : Command 'exec - system log -- /system/bin/bootstat --record_time_since_factory_reset' action=sys.boot_completed=1 && sys.logbootcomplete=1 (/system/etc/init/bootstat.rc:

init    : Command 'exec_background - system log -- /system/bin/bootstat --set_system_boot_reason --record_boot_complete --record_boot_reason --record_time_since_factory_reset -l' action=sys.boot_completed=1 && sys.logbootcomplete=1 (/system/etc/init/bootstat.rc

init    : Command 'exec - system log -- /system/bin/bootstat --record_boot_complete' action=sys.boot_completed=1 && sys.bootstat.first_boot_completed=0 (/system/etc/init/bootstat.rc:

init    : Command 'exec - system log -- /system/bin/bootstat --record_boot_reason' action=sys.boot_completed=1 && sys.bootstat.first_boot_completed=0 (/system/etc/init/bootstat.rc:

init    : Command 'exec - system log -- /system/bin/bootstat --record_time_since_factory_reset' action=sys.boot_completed=1 && sys.bootstat.first_boot_completed=0 (/system/etc/init/bootstat.rc:

init    : Command 'exec_background - system log -- /system/bin/bootstat --set_system_boot_reason --record_boot_complete --record_boot_reason --record_time_since_factory_reset -l' action=sys.boot_completed=1 && sys.bootstat.first_boot_completed=0 (/system/etc/init/bootstat.rc

 (/system/bin/bootstat --record_boot_complete)'...

 (/system/bin/bootstat --record_boot_complete)' (pid${SPACE}

 (/system/bin/bootstat --record_boot_reason)'...

bootstat/bootstat.rc

+18 −18
Original line number Diff line number Diff line
@@ -50,34 +50,34 @@ on post-fs-data 
on post-fs-data && property:init.svc.bootanim=running && property:ro.crypto.type=block

    exec_background - system log -- /system/bin/bootstat -r post_decrypt_time_elapsed



# sys.logbootcomplete is a signal to enable the bootstat logging mechanism.

# This signaling is necessary to prevent logging boot metrics after a runtime

# restart (e.g., adb shell stop && adb shell start).  /proc/uptime is not reset

# during a runtime restart, which leads to false boot time metrics being reported.

# Initialize bootstat state machine.

#

# The 'on boot' event occurs once per hard boot (device power on), which

# switches the flag on. If the device performs a runtime restart, the flag is

# switched off and cannot be switched on until the device hard boots again.



# Enable bootstat logging on boot.

on boot

    setprop sys.logbootcomplete 1



# Disable further bootstat logging on a runtime restart. A runtime restart is

# signaled by the zygote stopping.

on property:init.svc.zygote=stopping

    setprop sys.logbootcomplete 0

# sys.bootstat.first_boot_completed: responsible for making sure that record_boot_complete happens

# only once per device hard reboot. Possible values:

#

#   sys.bootstat.first_boot_completed=0 - first boot completed trigger wasn't processed yet.

#   sys.bootstat.first_boot_completed=1 - first boot completed trigger was processed and

#                                         record_boot_complete was called. Subsequent boot completed

#                                         triggers (e.g. due to userspace reboot) won't retrigger

#                                         record_boot_complete

#

# IMPORTANT, ro.persistent_properties.ready=1 trigger is used here to ensure that we initialize

# state machine only once, which as result ensures that bootstat --set_system_boot_reason and

# bootstat --record_boot_complete will be called only once per full reboot.

on property:ro.persistent_properties.ready=true

  setprop sys.bootstat.first_boot_completed 0



# Set boot reason

on zygote-start

on property:ro.persistent_properties.ready=true

    # Converts bootloader boot reason and persist.sys.boot.reason to system boot reason

    # Need go after persist peroperties are loaded which is right before zygote-start trigger

    exec_background - system log -- /system/bin/bootstat --set_system_boot_reason



# Record boot complete metrics.

on property:sys.boot_completed=1 && property:sys.logbootcomplete=1

on property:sys.boot_completed=1 && property:sys.bootstat.first_boot_completed=0

    # Record boot_complete and related stats (decryption, etc).

    # Record the boot reason.

    # Record time since factory reset.

    # Log all boot events.

    exec_background - system log -- /system/bin/bootstat --record_boot_complete --record_boot_reason --record_time_since_factory_reset -l

    setprop sys.bootstat.first_boot_completed 1