Attachment 1447910 Details for Bug 1586159 – Patch 3: parallelize "extracting debug info" step

[patch] Patch 3: parallelize "extracting debug info" step

3.diff (text/plain), 2.92 KB, created by Denys Vlasenko on 2018-06-05 15:35:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denys Vlasenko

Created: 2018-06-05 15:35:48 UTC

Size: 2.92 KB

patch

obsolete

>--- find-debuginfo2.sh	2018-06-05 17:03:54.904264159 +0200
>+++ find-debuginfo3.sh	2018-06-05 17:14:58.023787229 +0200
>@@ -288,6 +288,7 @@
> $strict || strict_error=WARNING
> 
> # Strip ELF binaries
>+worker_count=0
> find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*.debug" -type f \
>      		     $ -perm -0100 -or -perm -0010 -or -perm -0001 $ \
> 		     -print |
>@@ -339,43 +340,59 @@
>     $strict && exit 2
>   fi
> 
>-  # Add .gdb_index if requested.
>-  if $include_gdb_index; then
>-    gdb-add-index "$f"
>-  fi
>-
>-  # A binary already copied into /usr/lib/debug doesn't get stripped,
>-  # just has its file names collected and adjusted.
>-  case "$dn" in
>-  /usr/lib/debug/*)
>-    continue ;;
>-  esac
>-
>-  mkdir -p "${debugdn}"
>-  if test -w "$f"; then
>-    strip_to_debug "${debugfn}" "$f"
>-  else
>-    chmod u+w "$f"
>-    strip_to_debug "${debugfn}" "$f"
>-    chmod u-w "$f"
>-  fi
>-
>-  # strip -g implies we have full symtab, don't add mini symtab in that case.
>-  # It only makes sense to add a minisymtab for executables and shared
>-  # libraries. Other executable ELF files (like kernel modules) don't need it.
>-  if [ "$include_minidebug" = "true" -a "$strip_g" = "false" ]; then
>-    skip_mini=true
>-    case "$(file -bi "$f")" in
>-      application/x-sharedlib*) skip_mini=false ;;
>-      application/x-executable*) skip_mini=false ;;
>+  # Start a new worker
>+  (
>+    # Add .gdb_index if requested.
>+    if $include_gdb_index; then
>+      gdb-add-index "$f"
>+    fi
>+
>+    # A binary already copied into /usr/lib/debug doesn't get stripped,
>+    # just has its file names collected and adjusted.
>+    case "$dn" in
>+    /usr/lib/debug/*)
>+      exit 0 ;;
>     esac
>-    $skip_mini || add_minidebug "${debugfn}" "$f"
>-  fi
> 
>-  echo "./${f#$RPM_BUILD_ROOT}" >> "$ELFBINSFILE"
>+    mkdir -p "${debugdn}"
>+    if test -w "$f"; then
>+      strip_to_debug "${debugfn}" "$f"
>+    else
>+      chmod u+w "$f"
>+      strip_to_debug "${debugfn}" "$f"
>+      chmod u-w "$f"
>+    fi
>+
>+    # strip -g implies we have full symtab, don't add mini symtab in that case.
>+    # It only makes sense to add a minisymtab for executables and shared
>+    # libraries. Other executable ELF files (like kernel modules) don't need it.
>+    if [ "$include_minidebug" = "true" -a "$strip_g" = "false" ]; then
>+      skip_mini=true
>+      case "$(file -bi "$f")" in
>+        application/x-sharedlib*) skip_mini=false ;;
>+        application/x-executable*) skip_mini=false ;;
>+      esac
>+      $skip_mini || add_minidebug "${debugfn}" "$f"
>+    fi
>+
>+    echo "./${f#$RPM_BUILD_ROOT}" >> "$ELFBINSFILE"
>+  ) &
>+
>+  worker_count=$((worker_count+1))
>+  # Crude way to cap the level of parallalism.
>+  # Unfortunately, there is no way to wait for just one worker.
>+  if test $worker_count = 32; then
>+    wait
>+    worker_count=0;
>+  fi
> 
> done || exit
> 
>+if test $worker_count != 0; then
>+  wait
>+fi
>+
>+
> # Invoke the DWARF Compressor utility.
> if $run_dwz \
>    && [ -d "${RPM_BUILD_ROOT}/usr/lib/debug" ]; then

Actions: View | Diff

Attachments on bug 1586159: 1447908 | 1447909 | 1447910 | 1451564 | 1453429 | 1546491