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

Commit 2e210e46 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

logpersist: incorporate size and buffer tunables 

- Add hidden -n and -b flags that propagate to the underlying
  logcat command. Publish aliases in help as --size and --buffer.
- Add --clear for start command so it clears before starting
- shell script bloating up to deal with option validation and
  provide ERROR: and WARNING: advice.

ToDo:

- Deprecate shell script and replace with Eng and Userdebug
  only Developer Options, before it becomes too powerful
  or bloated to force us to rewrite an expendable like this
  into C++.

Bug: 28120456
Change-Id: I0dff8acaa1e5c929454760cfa2801924956bc25d
parent 643bc369

logcat/logcatd.rc

+2 −2
Original line number Original line Diff line number Diff line
@@ -2,10 +2,10 @@ on property:persist.logd.logpersistd=logcatd 
    # all exec/services are called with umask(077), so no gain beyond 0700

    # all exec/services are called with umask(077), so no gain beyond 0700

    mkdir /data/misc/logd 0700 logd log

    mkdir /data/misc/logd 0700 logd log

    # logd for write to /data/misc/logd, log group for read from pstore (-L)

    # logd for write to /data/misc/logd, log group for read from pstore (-L)

    exec - logd log -- /system/bin/logcat -L -b all -v threadtime -v usec -v printable -D -f /data/misc/logd/logcat -r 1024 -n 256

    exec - logd log -- /system/bin/logcat -L -b ${persist.logd.logpersistd.buffer:-all} -v threadtime -v usec -v printable -D -f /data/misc/logd/logcat -r 1024 -n ${persist.logd.logpersistd.size:-256}

    start logcatd

    start logcatd





service logcatd /system/bin/logcat -b all -v threadtime -v usec -v printable -D -f /data/misc/logd/logcat -r 1024 -n 256

service logcatd /system/bin/logcat -b ${persist.logd.logpersistd.buffer:-all} -v threadtime -v usec -v printable -D -f /data/misc/logd/logcat -r 1024 -n ${persist.logd.logpersistd.size:-256}

    class late_start

    class late_start

    disabled

    disabled

    # logd for write to /data/misc/logd, log group for read from log daemon

    # logd for write to /data/misc/logd, log group for read from log daemon

logcat/logpersist

+112 −14
Original line number Original line Diff line number Diff line 
#! /system/bin/sh

#! /system/bin/sh

# logpersist cat start and stop handlers

# logpersist cat, start and stop handlers

progname="${0##*/}"

progname="${0##*/}"

case `getprop ro.debuggable` in

case `getprop ro.debuggable` in

1) ;;

1) ;;
@@ -7,36 +7,134 @@ case `getprop ro.debuggable` in 
   exit 1

   exit 1

   ;;

   ;;

esac

esac



data=/data/misc/logd

data=/data/misc/logd

property=persist.logd.logpersistd

property=persist.logd.logpersistd

service=logcatd

service=logcatd

if [ X"${1}" = X"-h" -o X"${1}" = X"--help" ]; then

size_default=256

buffer_default=all

args="${@}"



size=${size_default}

buffer=${buffer_default}

clear=false

while [ ${#} -gt 0 ]; do

  case ${1} in

    -c|--clear) clear=true ;;

    --size=*) size="${1#--size=}" ;;

    --rotate-count=*) size="${1#--rotate-count=}" ;;

    -n|--size|--rotate-count) size="${2}" ; shift ;;

    --buffer=*) buffer="${1#--buffer=}" ;;

    -b|--buffer) buffer="${2}" ; shift ;;

    -h|--help|*)

      LEAD_SPACE_="`echo ${progname%.*} | tr '[ -~]' ' '`"

      echo "${progname%.*}.cat             - dump current ${service%d} logs"

      echo "${progname%.*}.cat             - dump current ${service%d} logs"

  echo "${progname%.*}.start          - start ${service} service"

      echo "${progname%.*}.start [--size=<size_in_kb>] [--buffer=<buffers>] [--clear]"

      echo "${LEAD_SPACE_}                 - start ${service} service"

      echo "${progname%.*}.stop [--clear]  - stop ${service} service"

      echo "${progname%.*}.stop [--clear]  - stop ${service} service"

  exit 0

      case ${1} in

        -h|--help) exit 0 ;;

        *) echo ERROR: bad argument ${@} >&2 ; exit 1 ;;

      esac

      ;;

  esac

  shift

done



if [ -z "${size}" -o "${size_default}" = "${size}" ]; then

  unset size

fi

if [ -n "${size}" ] &&

  ! ( [ 0 -lt "${size}" ] && [ 2048 -ge "${size}" ] ) >/dev/null 2>&1; then

  echo ERROR: Invalid --size ${size} >&2

  exit 1

fi

if [ -z "${buffer}" -o "${buffer_default}" = "${buffer}" ]; then

  unset buffer

fi

fi

if [ -n "${buffer}" ] && ! logcat -b ${buffer} -g >/dev/null 2>&1; then

  echo ERROR: Invalid --buffer ${buffer} >&2

  exit 1

fi



case ${progname} in

case ${progname} in

*.cat)

*.cat)

  su 1036 ls "${data}" |

  if [ -n "${size}${buffer}" -o "true" = "${clear}" ]; then

    echo WARNING: Can not use --clear, --size or --buffer with ${progname%.*}.cat >&2

  fi

  su logd ls "${data}" |

  tr -d '\r' |

  tr -d '\r' |

  sort -ru |

  sort -ru |

  sed "s#^#${data}/#" |

  sed "s#^#${data}/#" |

  su 1036 xargs cat

  su logd xargs cat

  ;;

  ;;

*.start)

*.start)

  su 0 setprop ${property} ${service}

  current_buffer="`getprop ${property}.buffer`"

  current_size="`getprop ${property}.size`"

  if [ "${service}" = "`getprop ${property}`" ]; then

    if [ "true" = "${clear}" ]; then

      su root stop ${service}

      su root setprop ${property} ""

      # 20ms done, guarantees content stop before rm

      sleep 1

    elif [ "${buffer}|${size}" != "${current_buffer}|${current_size}" ]; then

      echo   "ERROR: Changing existing collection parameters from" >&2

      if [ "${buffer}" != "${current_buffer}" ]; then

        a=${current_buffer}

        b=${buffer}

        if [ -z "${a}" ]; then a="${default_buffer}"; fi

        if [ -z "${b}" ]; then b="${default_buffer}"; fi

        echo "           --buffer ${a} to ${b}" >&2

      fi

      if [ "${size}" != "${current_size}" ]; then

        a=${current_size}

        b=${size}

        if [ -z "${a}" ]; then a="${default_size}"; fi

        if [ -z "${b}" ]; then b="${default_size}"; fi

        echo "           --size ${a} to ${b}" >&2

      fi

      echo   "       Are you sure you want to do this?" >&2

      echo   "       Suggest add --clear to erase data and restart with new settings." >&2

      echo   "       To blindly override and retain data, ${progname%.*}.stop first." >&2

      exit 1

    fi

  fi

  if [ "true" = "${clear}" ]; then

    su logd,misc rm -rf "${data}"

  fi

  if [ -n "${buffer}${current_buffer}" ]; then

    su root setprop ${property}.buffer "${buffer}"

  fi

  if [ -n "${size}${current_size}" ]; then

    su root setprop ${property}.size "${size}"

  fi

  # ${service}.rc does the heavy lifting with the following trigger

  su root setprop ${property} ${service}

  getprop ${property}

  getprop ${property}

  # 20ms done, to permit process feedback check

  sleep 1

  sleep 1

  # also generate an error return code if not found running, bonus

  ps -t | grep "${data##*/}.*${service%d}"

  ps -t | grep "${data##*/}.*${service%d}"

  ;;

  ;;

*.stop)

*.stop)

  su 0 stop ${service}

  if [ -n "${size}${buffer}" ]; then

  su 0 setprop ${property} ""

    echo "WARNING: Can not use --size or --buffer with ${progname%.*}.stop" >&2

  [ X"${1}" != X"-c" -a X"${1}" != X"--clear" ] ||

  fi

  ( sleep 1 ; su 1036,9998 rm -rf "${data}" )

  su root stop ${service}

  su root setprop ${property} ""

  if [ -n "`getprop ${property}.buffer`" ]; then

    su root setprop ${property}.buffer ""

  fi

  if [ -n "`getprop ${property}.size`" ]; then

    su root setprop ${property}.size ""

  fi

  if [ "true" = "${clear}" ]; then

    # 20ms done, guarantees content stop before rm

    sleep 1

    su logd,misc rm -rf "${data}"

  fi

  ;;

  ;;

*)

*)

  echo "Unexpected command ${0##*/} ${@}" >&2

  echo "ERROR: Unexpected command ${0##*/} ${args}" >&2

  exit 1

  exit 1

esac
 
esac