From 3b73edbaa5633739f0a2c36b8f7dda744edcf854 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 4 Jul 2019 11:00:13 +0200
Subject: [PATCH] xbps-src: improve bulk_sortdeps().

./xbps-src sort-dependencies $(./xbps-src show-build-deps xbps)

0.202s vs 0.514s
---
 common/xbps-src/shutils/bulk.sh | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 2d1d612c966..3a44dd1539e 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -1,24 +1,29 @@
 # vim: set ts=4 sw=4 et:
 
 bulk_sortdeps() {
-    local _pkgs _pkg pkgs pkg found f x tmpf
+    local pkgs="$@"
+    local pkg _pkg
+    local NPROCS=$(($(nproc)*2))
+    local NRUNNING=0
 
-    pkgs="$@"
     tmpf=$(mktemp) || exit 1
 
-    # Now make the real dependency graph of all pkgs to build.
-    # Perform a topological sort of all pkgs but only with build dependencies
-    # that are found in previous step.
+    # Perform a topological sort of all build dependencies.
+    if [ $NRUNNING -eq $NPROCS ]; then
+        NRUNNING=0
+        wait
+    fi
+
     for pkg in ${pkgs}; do
-        _pkgs="$(./xbps-src show-build-deps $pkg 2>/dev/null)"
-        found=0
-        for x in ${_pkgs}; do
-            for f in ${pkgs}; do
-                [[ $f == $x ]] && found=1 && echo "${pkg} ${f}" >> $tmpf
+        # async/parallel execution
+        (
+            for _pkg in $(./xbps-src show-build-deps $pkg 2>/dev/null); do
+                echo "$pkg $_pkg" >> $tmpf
             done
-        done
-        [[ $found -eq 0 ]] && echo "${pkg} ${pkg}" >> $tmpf
+            echo "$pkg $pkg" >> $tmpf
+        ) &
     done
+    wait
     tsort $tmpf|tac
     rm -f $tmpf
 }
@@ -30,7 +35,7 @@ bulk_build() {
         export XBPS_ARCH=${XBPS_TARGET_MACHINE}
     fi
     if ! command -v xbps-checkvers &>/dev/null; then
-        msg_error "xbps-src: cannot find xbps-checkvers(8) command!\n"
+        msg_error "xbps-src: cannot find xbps-checkvers(1) command!\n"
     fi
 
     bulk_sortdeps "$(xbps-checkvers -f '%n' ${1} --distdir=$XBPS_DISTDIR)"