projects
/
bpgallery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d78be00
)
Add simple MAXTHREADS variable for low memory machines
author
Brett Parker
<iDunno@sommitrealweird.co.uk>
Sun, 1 Dec 2019 12:46:56 +0000
(12:46 +0000)
committer
Brett Parker
<iDunno@sommitrealweird.co.uk>
Sun, 1 Dec 2019 12:46:56 +0000
(12:46 +0000)
bpgallery.sh
patch
|
blob
|
history
diff --git
a/bpgallery.sh
b/bpgallery.sh
index c2a38700d543e06dba49e8e252807426641d4bc6..e3110fdcf2cec20b0faf7505174ad9171c73d315 100755
(executable)
--- a/
bpgallery.sh
+++ b/
bpgallery.sh
@@
-377,6
+377,16
@@
else
WCCOMMAND="$WCCOMMAND -l"
fi
WCCOMMAND="$WCCOMMAND -l"
fi
+if [[ -z $MAXTHREADS ]]; then
+ # if there's more than 2G of memory, then do 4 threads, otherwise, just 1
+ __total_memory=$(free -t -g | sed -ne '2 { s#Mem:[[:space:]]*\([0-9]*\)[[:space:]]*.*$#\1#; p; }')
+ if [[ $__total_memory -ge 2 ]]; then
+ MAXTHREADS=4
+ else
+ MAXTHREADS=1
+ fi
+fi
+
if [[ -z $WIDTH ]]; then
WIDTH=100
fi
if [[ -z $WIDTH ]]; then
WIDTH=100
fi
@@
-631,7
+641,7
@@
function generate_resized_images() {
$ECHOCOMMAND -n -e "\000"
fi
done | \
$ECHOCOMMAND -n -e "\000"
fi
done | \
- $XARGSCOMMAND -0 --verbose --max-procs=
4
-I {} $CONVERTTOOL -resize $1 '{}' $2/'{}' 2>&1 | \
+ $XARGSCOMMAND -0 --verbose --max-procs=
$MAXTHREADS
-I {} $CONVERTTOOL -resize $1 '{}' $2/'{}' 2>&1 | \
while read throwout; do
$ECHOCOMMAND done: $currentimage/$imagestoupdate images
currentimage=$((currentimage+1))
while read throwout; do
$ECHOCOMMAND done: $currentimage/$imagestoupdate images
currentimage=$((currentimage+1))