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

Commit 92a97843 authored by Soichiro Fujii's avatar Soichiro Fujii Committed by Gerrit Code Review
Browse files

Merge changes Iadce8bd7,I4ee818dd into main 

* changes:
  libprefetch: check `ro.prefetch_boot.enabled` internally
  libprefetch: Increase default fd count to 1024
parents dcf5858c 8e650d38

init/libprefetch/prefetch/prefetch.rc

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ service prefetch_record /system/bin/prefetch record --duration ${ro.prefetch_boo 
    disabled

    oneshot



service prefetch_replay /system/bin/prefetch replay --io-depth ${ro.prefetch_boot.io_depth:-2} --max-fds ${ro.prefetch_boot.max_fds:-128}

service prefetch_replay /system/bin/prefetch replay --io-depth ${ro.prefetch_boot.io_depth:-2} --max-fds ${ro.prefetch_boot.max_fds:-1024}

    user root

    group root system

    disabled

init/libprefetch/prefetch/src/arch/android.rs

+14 −0
Original line number Diff line number Diff line
@@ -12,6 +12,12 @@ use rustutils::system_properties::PropertyWatcher; 


const PREFETCH_RECORD_PROPERTY_STOP: &str = "prefetch_boot.record_stop";



fn is_prefetch_enabled() -> Result<bool, Error> {

    rustutils::system_properties::read_bool("ro.prefetch_boot.enabled", false).map_err(|e| {

        Error::Custom { error: format!("Failed to read ro.prefetch_boot.enabled: {}", e) }

    })

}



fn wait_for_property_true(

    property_name: &str,

    timeout: Option<Duration>,
@@ -31,6 +37,10 @@ pub fn wait_for_record_stop() { 
/// Checks if we can perform replay phase.

/// Ensure that the pack file exists and is up-to-date, returns false otherwise.

pub fn can_perform_replay(pack_path: &Path, fingerprint_path: &Path) -> Result<bool, Error> {

    if !is_prefetch_enabled()? {

        return Ok(false);

    }



    if !pack_path.exists() || !fingerprint_path.exists() {

        return Ok(false);

    }
@@ -54,6 +64,10 @@ pub fn ensure_record_is_ready( 
    pack_path: &Path,

    fingerprint_path: &Path,

) -> Result<bool, Error> {

    if !is_prefetch_enabled()? {

        return Ok(false);

    }



    if !ready_path.exists() {

        File::create(ready_path)

            .map_err(|_| Error::Custom { error: "File Creation failed".to_string() })?;