From d796550ea1e4011d2a6bc8e99a048915c0177cd4 Mon Sep 17 00:00:00 2001 From: AYA Date: Wed, 31 Jul 2024 11:17:35 +0200 Subject: [PATCH 1/4] adding parallel execution to restyle-diff --- scripts/helpers/restyle-diff.sh | 75 +++++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 18 deletions(-) diff --git a/scripts/helpers/restyle-diff.sh b/scripts/helpers/restyle-diff.sh index 5cc9ffa6b081fc..237a4326dd64c7 100755 --- a/scripts/helpers/restyle-diff.sh +++ b/scripts/helpers/restyle-diff.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Copyright (c) 2020 Project CHIP Authors +# Copyright (c) 2024 Project CHIP Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,10 +21,11 @@ # you've written is kosher to CI # # Usage: -# restyle-diff.sh [-d] [ref] +# restyle-diff.sh [-d] [-p] [ref] # # if unspecified, ref defaults to upstream/master (or master) # -d sets container's log level to DEBUG, if unspecified the default log level will remain (info level) +# -p pulls the Docker image before running the restyle paths # here=${0%/*} @@ -45,33 +46,67 @@ docker_run() { } restyle-paths() { - image=restyled/restyler:edge + batch_size=4 + batch=() for path in "$@"; do - ( - docker_run --tty --interactive --rm \ - --env LOG_LEVEL \ - --env LOG_DESTINATION \ - --env LOG_FORMAT \ - --env LOG_COLOR \ - --env HOST_DIRECTORY="$PWD" \ - --env UNRESTRICTED=1 \ - --volume "$PWD":/code \ - --volume /tmp:/tmp \ - --volume /var/run/docker.sock:/var/run/docker.sock \ - --entrypoint restyle-path \ - "$image" "$path" - ) + batch+=("$path") + if [[ ${#batch[@]} -eq $batch_size ]]; then + for p in "${batch[@]}"; do + ( + docker_run \ + --env LOG_LEVEL \ + --env LOG_DESTINATION \ + --env LOG_FORMAT \ + --env LOG_COLOR \ + --env HOST_DIRECTORY="$PWD" \ + --env UNRESTRICTED=1 \ + --volume "$PWD":/code \ + --volume /tmp:/tmp \ + --volume /var/run/docker.sock:/var/run/docker.sock \ + --entrypoint restyle-path \ + "$image" "$p" + ) & + done + wait + batch=() + fi done + + if [[ ${#batch[@]} -gt 0 ]]; then + for p in "${batch[@]}"; do + ( + docker_run \ + --env LOG_LEVEL \ + --env LOG_DESTINATION \ + --env LOG_FORMAT \ + --env LOG_COLOR \ + --env HOST_DIRECTORY="$PWD" \ + --env UNRESTRICTED=1 \ + --volume "$PWD":/code \ + --volume /tmp:/tmp \ + --volume /var/run/docker.sock:/var/run/docker.sock \ + --entrypoint restyle-path \ + "$image" "$p" + ) & + done + wait + fi } +pull_image=0 + while [[ $# -gt 0 ]]; do case "$1" in -d) export LOG_LEVEL="DEBUG" shift ;; + -p) + pull_image=1 + shift + ;; *) ref="$1" shift @@ -81,7 +116,11 @@ done if [[ -z "$ref" ]]; then ref="master" - git remote | grep -qxF upstream && ref="upstream/master" + git remote | grep -qxF upstream && ref="upstream/master" && git fetch upstream +fi + +if [[ $pull_image -eq 1 ]]; then + docker pull restyled/restyler:edge fi mapfile -t paths < <(git diff --ignore-submodules --name-only --merge-base "$ref") From 195843d1b8f7574363aec7d1ef5a857c4427b3b2 Mon Sep 17 00:00:00 2001 From: AYA Date: Wed, 31 Jul 2024 16:58:11 +0200 Subject: [PATCH 2/4] using xargs to call restyle-paths --- scripts/helpers/restyle-diff.sh | 105 +++++++++++--------------------- 1 file changed, 34 insertions(+), 71 deletions(-) diff --git a/scripts/helpers/restyle-diff.sh b/scripts/helpers/restyle-diff.sh index 237a4326dd64c7..253090c4075d27 100755 --- a/scripts/helpers/restyle-diff.sh +++ b/scripts/helpers/restyle-diff.sh @@ -32,85 +32,47 @@ here=${0%/*} set -e +MAX_ARGS=256 +pull_image=0 + CHIP_ROOT=$(cd "$here/../.." && pwd) cd "$CHIP_ROOT" -docker_run() { - if [ -t 0 ]; then - exec docker run --tty "$@" - - else - exec docker run "$@" - - fi -} - restyle-paths() { image=restyled/restyler:edge - batch_size=4 - batch=() - - for path in "$@"; do - batch+=("$path") - if [[ ${#batch[@]} -eq $batch_size ]]; then - for p in "${batch[@]}"; do - ( - docker_run \ - --env LOG_LEVEL \ - --env LOG_DESTINATION \ - --env LOG_FORMAT \ - --env LOG_COLOR \ - --env HOST_DIRECTORY="$PWD" \ - --env UNRESTRICTED=1 \ - --volume "$PWD":/code \ - --volume /tmp:/tmp \ - --volume /var/run/docker.sock:/var/run/docker.sock \ - --entrypoint restyle-path \ - "$image" "$p" - ) & - done - wait - batch=() - fi - done - - if [[ ${#batch[@]} -gt 0 ]]; then - for p in "${batch[@]}"; do - ( - docker_run \ - --env LOG_LEVEL \ - --env LOG_DESTINATION \ - --env LOG_FORMAT \ - --env LOG_COLOR \ - --env HOST_DIRECTORY="$PWD" \ - --env UNRESTRICTED=1 \ - --volume "$PWD":/code \ - --volume /tmp:/tmp \ - --volume /var/run/docker.sock:/var/run/docker.sock \ - --entrypoint restyle-path \ - "$image" "$p" - ) & - done - wait - fi + ( + docker run \ + --env LOG_LEVEL \ + --env LOG_DESTINATION \ + --env LOG_FORMAT \ + --env LOG_COLOR \ + --env HOST_DIRECTORY="$PWD" \ + --env UNRESTRICTED=1 \ + --volume "$PWD":/code \ + --volume /tmp:/tmp \ + --volume /var/run/docker.sock:/var/run/docker.sock \ + --entrypoint restyle-path \ + "$image" "$@" + ) } -pull_image=0 +#This was added to be able to use xargs to call the function restyle-paths +export -f restyle-paths while [[ $# -gt 0 ]]; do case "$1" in - -d) - export LOG_LEVEL="DEBUG" - shift - ;; - -p) - pull_image=1 - shift - ;; - *) - ref="$1" - shift - ;; + -d) + export LOG_LEVEL="DEBUG" + shift + ;; + -p) + pull_image=1 + shift + ;; + *) + ref="$1" + shift + ;; esac done @@ -123,5 +85,6 @@ if [[ $pull_image -eq 1 ]]; then docker pull restyled/restyler:edge fi -mapfile -t paths < <(git diff --ignore-submodules --name-only --merge-base "$ref") -restyle-paths "${paths[@]}" +paths=$(git diff --ignore-submodules --name-only --merge-base "$ref") + +echo "$paths" | xargs -n $MAX_ARGS bash -c 'restyle-paths "$@"' From e6afd0eebae58c93fe5e250c4cc0f911d83813c4 Mon Sep 17 00:00:00 2001 From: AYA Date: Wed, 31 Jul 2024 16:59:59 +0200 Subject: [PATCH 3/4] fixing Copyright year --- scripts/helpers/restyle-diff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/helpers/restyle-diff.sh b/scripts/helpers/restyle-diff.sh index 253090c4075d27..751836bccdd027 100755 --- a/scripts/helpers/restyle-diff.sh +++ b/scripts/helpers/restyle-diff.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Copyright (c) 2024 Project CHIP Authors +# Copyright (c) 2020-2024 Project CHIP Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 256c9c5bca5a38eba2ee4bcbdb111213728c9e41 Mon Sep 17 00:00:00 2001 From: AYA Date: Wed, 31 Jul 2024 17:04:45 +0200 Subject: [PATCH 4/4] restyle the restyler --- scripts/helpers/restyle-diff.sh | 54 ++++++++++++++++----------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/scripts/helpers/restyle-diff.sh b/scripts/helpers/restyle-diff.sh index 751836bccdd027..5f37c69762e281 100755 --- a/scripts/helpers/restyle-diff.sh +++ b/scripts/helpers/restyle-diff.sh @@ -40,20 +40,20 @@ cd "$CHIP_ROOT" restyle-paths() { image=restyled/restyler:edge - ( - docker run \ - --env LOG_LEVEL \ - --env LOG_DESTINATION \ - --env LOG_FORMAT \ - --env LOG_COLOR \ - --env HOST_DIRECTORY="$PWD" \ - --env UNRESTRICTED=1 \ - --volume "$PWD":/code \ - --volume /tmp:/tmp \ - --volume /var/run/docker.sock:/var/run/docker.sock \ - --entrypoint restyle-path \ - "$image" "$@" - ) + + docker run \ + --env LOG_LEVEL \ + --env LOG_DESTINATION \ + --env LOG_FORMAT \ + --env LOG_COLOR \ + --env HOST_DIRECTORY="$PWD" \ + --env UNRESTRICTED=1 \ + --volume "$PWD":/code \ + --volume /tmp:/tmp \ + --volume /var/run/docker.sock:/var/run/docker.sock \ + --entrypoint restyle-path \ + "$image" "$@" + } #This was added to be able to use xargs to call the function restyle-paths @@ -61,18 +61,18 @@ export -f restyle-paths while [[ $# -gt 0 ]]; do case "$1" in - -d) - export LOG_LEVEL="DEBUG" - shift - ;; - -p) - pull_image=1 - shift - ;; - *) - ref="$1" - shift - ;; + -d) + export LOG_LEVEL="DEBUG" + shift + ;; + -p) + pull_image=1 + shift + ;; + *) + ref="$1" + shift + ;; esac done @@ -87,4 +87,4 @@ fi paths=$(git diff --ignore-submodules --name-only --merge-base "$ref") -echo "$paths" | xargs -n $MAX_ARGS bash -c 'restyle-paths "$@"' +echo "$paths" | xargs -n "$MAX_ARGS" bash -c 'restyle-paths "$@"'