* [gentoo-commits] gentoo-x86 commit in eclass: multiprocessing.eclass
@ 2012-06-07 4:59 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2012-06-07 4:59 UTC (permalink / raw
To: gentoo-commits
vapier 12/06/07 04:59:41
Added: multiprocessing.eclass
Log:
initial multiprocessing eclass
Revision Changes Path
1.1 eclass/multiprocessing.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.1&content-type=text/plain
Index: multiprocessing.eclass
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.1 2012/06/07 04:59:40 vapier Exp $
# @ECLASS: multiprocessing.eclass
# @MAINTAINER:
# base-system@gentoo.org
# @AUTHOR:
# Brian Harring <ferringb@gentoo.org>
# Mike Frysinger <vapier@gentoo.org>
# @BLURB: parallelization with bash (wtf?)
# @DESCRIPTION:
# The multiprocessing eclass contains a suite of functions that allow ebuilds
# to quickly run things in parallel using shell code.
#
# It has two modes: pre-fork and post-fork. If you don't want to dive into any
# more nuts & bolts, just use the pre-fork mode. For main threads that mostly
# spawn children and then wait for them to finish, use the pre-fork mode. For
# main threads that do a bit of processing themselves, use the post-fork mode.
# You may mix & match them for longer computation loops.
# @EXAMPLE:
#
# @CODE
# # First initialize things:
# multijob_init
#
# # Then hash a bunch of files in parallel:
# for n in {0..20} ; do
# multijob_child_init md5sum data.${n} > data.${n}
# done
#
# # Then wait for all the children to finish:
# multijob_finish
# @CODE
if [[ ${___ECLASS_ONCE_MULTIPROCESSING} != "recur -_+^+_- spank" ]] ; then
___ECLASS_ONCE_MULTIPROCESSING="recur -_+^+_- spank"
# @FUNCTION: makeopts_jobs
# @USAGE: [${MAKEOPTS}]
# @DESCRIPTION:
# Searches the arguments (defaults to ${MAKEOPTS}) and extracts the jobs number
# specified therein. Useful for running non-make tools in parallel too.
# i.e. if the user has MAKEOPTS=-j9, this will echo "9" -- we can't return the
# number as bash normalizes it to [0, 255]. If the flags haven't specified a
# -j flag, then "1" is shown as that is the default `make` uses. Since there's
# no way to represent infinity, we return 999 if the user has -j without a number.
makeopts_jobs() {
[[ $# -eq 0 ]] && set -- ${MAKEOPTS}
# This assumes the first .* will be more greedy than the second .*
# since POSIX doesn't specify a non-greedy match (i.e. ".*?").
local jobs=$(echo " $* " | sed -r -n \
-e 's:.*[[:space:]](-j|--jobs[=[:space:]])[[:space:]]*([0-9]+).*:\2:p' \
-e 's:.*[[:space:]](-j|--jobs)[[:space:]].*:999:p')
echo ${jobs:-1}
}
# @FUNCTION: multijob_init
# @USAGE: [${MAKEOPTS}]
# @DESCRIPTION:
# Setup the environment for executing code in parallel.
# You must call this before any other multijob function.
multijob_init() {
# When something goes wrong, try to wait for all the children so we
# don't leave any zombies around.
has wait ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" wait"
# Setup a pipe for children to write their pids to when they finish.
local pipe="${T}/multijob.pipe"
mkfifo "${pipe}"
redirect_alloc_fd mj_control_fd "${pipe}"
rm -f "${pipe}"
# See how many children we can fork based on the user's settings.
mj_max_jobs=$(makeopts_jobs "$@")
mj_num_jobs=0
}
# @FUNCTION: multijob_child_init
# @USAGE: [--pre|--post] [command to run in background]
# @DESCRIPTION:
# This function has two forms. You can use it to execute a simple command
# in the background (and it takes care of everything else), or you must
# call this first thing in your forked child process.
#
# The --pre/--post options allow you to select the child generation mode.
#
# @CODE
# # 1st form: pass the command line as arguments:
# multijob_child_init ls /dev
# # Or if you want to use pre/post fork modes:
# multijob_child_init --pre ls /dev
# multijob_child_init --post ls /dev
#
# # 2nd form: execute multiple stuff in the background (post fork):
# (
# multijob_child_init
# out=`ls`
# if echo "${out}" | grep foo ; then
# echo "YEAH"
# fi
# ) &
# multijob_post_fork
#
# # 2nd form: execute multiple stuff in the background (pre fork):
# multijob_pre_fork
# (
# multijob_child_init
# out=`ls`
# if echo "${out}" | grep foo ; then
# echo "YEAH"
# fi
# ) &
# @CODE
multijob_child_init() {
local mode="pre"
case $1 in
--pre) mode="pre" ; shift ;;
--post) mode="post"; shift ;;
esac
if [[ $# -eq 0 ]] ; then
trap 'echo ${BASHPID} $? >&'${mj_control_fd} EXIT
trap 'exit 1' INT TERM
else
local ret
[[ ${mode} == "pre" ]] && { multijob_pre_fork; ret=$?; }
( multijob_child_init ; "$@" ) &
[[ ${mode} == "post" ]] && { multijob_post_fork; ret=$?; }
return ${ret}
fi
}
# @FUNCTION: _multijob_fork
# @INTERNAL
# @DESCRIPTION:
# Do the actual book keeping.
_multijob_fork() {
[[ $# -eq 1 ]] || die "incorrect number of arguments"
local ret=0
[[ $1 == "post" ]] && : $(( ++mj_num_jobs ))
if [[ ${mj_num_jobs} -ge ${mj_max_jobs} ]] ; then
multijob_finish_one
ret=$?
fi
[[ $1 == "pre" ]] && : $(( ++mj_num_jobs ))
return ${ret}
}
# @FUNCTION: multijob_pre_fork
# @DESCRIPTION:
# You must call this in the parent process before forking a child process.
# If the parallel limit has been hit, it will wait for one child to finish
# and return its exit status.
multijob_pre_fork() { _multijob_fork pre "$@" ; }
# @FUNCTION: multijob_post_fork
# @DESCRIPTION:
# You must call this in the parent process after forking a child process.
# If the parallel limit has been hit, it will wait for one child to finish
# and return its exit status.
multijob_post_fork() { _multijob_fork post "$@" ; }
# @FUNCTION: multijob_finish_one
# @DESCRIPTION:
# Wait for a single process to exit and return its exit code.
multijob_finish_one() {
[[ $# -eq 0 ]] || die "${FUNCNAME} takes no arguments"
local pid ret
read -r -u ${mj_control_fd} pid ret || die
: $(( --mj_num_jobs ))
return ${ret}
}
# @FUNCTION: multijob_finish
# @DESCRIPTION:
# Wait for all pending processes to exit and return the bitwise or
# of all their exit codes.
multijob_finish() {
local ret=0
while [[ ${mj_num_jobs} -gt 0 ]] ; do
multijob_finish_one
: $(( ret |= $? ))
done
# Let bash clean up its internal child tracking state.
wait
# Do this after reaping all the children.
[[ $# -eq 0 ]] || die "${FUNCNAME} takes no arguments"
return ${ret}
}
# @FUNCTION: redirect_alloc_fd
# @USAGE: <var> <file> [redirection]
# @DESCRIPTION:
# Find a free fd and redirect the specified file via it. Store the new
# fd in the specified variable. Useful for the cases where we don't care
# about the exact fd #.
redirect_alloc_fd() {
local var=$1 file=$2 redir=${3:-"<>"}
if [[ $(( (BASH_VERSINFO[0] << 8) + BASH_VERSINFO[1] )) -ge $(( (4 << 8) + 1 )) ]] ; then
# Newer bash provides this functionality.
eval "exec {${var}}${redir}'${file}'"
else
# Need to provide the functionality ourselves.
local fd=10
while :; do
# Make sure the fd isn't open. It could be a char device,
# or a symlink (possibly broken) to something else.
if [[ ! -e /dev/fd/${fd} ]] && [[ ! -L /dev/fd/${fd} ]] ; then
eval "exec ${fd}${redir}'${file}'" && break
fi
[[ ${fd} -gt 1024 ]] && die 'could not locate a free temp fd !?'
: $(( ++fd ))
done
: $(( ${var} = fd ))
fi
}
fi
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: multiprocessing.eclass
@ 2012-07-30 14:52 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2012-07-30 14:52 UTC (permalink / raw
To: gentoo-commits
vapier 12/07/30 14:52:18
Modified: multiprocessing.eclass
Log:
drop ebuild die hook once we have finished as there is no need to cleanup anymore
Revision Changes Path
1.2 eclass/multiprocessing.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?r1=1.1&r2=1.2
Index: multiprocessing.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multiprocessing.eclass 7 Jun 2012 04:59:40 -0000 1.1
+++ multiprocessing.eclass 30 Jul 2012 14:52:18 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.1 2012/06/07 04:59:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.2 2012/07/30 14:52:18 vapier Exp $
# @ECLASS: multiprocessing.eclass
# @MAINTAINER:
@@ -63,7 +63,7 @@
multijob_init() {
# When something goes wrong, try to wait for all the children so we
# don't leave any zombies around.
- has wait ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" wait"
+ has wait ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" wait "
# Setup a pipe for children to write their pids to when they finish.
local pipe="${T}/multijob.pipe"
@@ -190,6 +190,9 @@
# Do this after reaping all the children.
[[ $# -eq 0 ]] || die "${FUNCNAME} takes no arguments"
+ # No need to hook anymore.
+ EBUILD_DEATH_HOOKS=${EBUILD_DEATH_HOOKS/ wait / }
+
return ${ret}
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: multiprocessing.eclass
@ 2013-10-12 21:12 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2013-10-12 21:12 UTC (permalink / raw
To: gentoo-commits
vapier 13/10/12 21:12:48
Modified: multiprocessing.eclass
Log:
split the FIFO fd into two (one ro and one rw) to avoid POSIX undefined behavior #487056 by Alan Hourihane
Revision Changes Path
1.3 eclass/multiprocessing.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?r1=1.2&r2=1.3
Index: multiprocessing.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multiprocessing.eclass 30 Jul 2012 14:52:18 -0000 1.2
+++ multiprocessing.eclass 12 Oct 2013 21:12:48 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.2 2012/07/30 14:52:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.3 2013/10/12 21:12:48 vapier Exp $
# @ECLASS: multiprocessing.eclass
# @MAINTAINER:
@@ -66,9 +66,12 @@
has wait ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" wait "
# Setup a pipe for children to write their pids to when they finish.
+ # We have to allocate two fd's because POSIX has undefined behavior
+ # when you open a FIFO for simultaneous read/write. #487056
local pipe="${T}/multijob.pipe"
- mkfifo "${pipe}"
- redirect_alloc_fd mj_control_fd "${pipe}"
+ mkfifo -m 600 "${pipe}"
+ redirect_alloc_fd mj_write_fd "${pipe}"
+ redirect_alloc_fd mj_read_fd "${pipe}"
rm -f "${pipe}"
# See how many children we can fork based on the user's settings.
@@ -120,7 +123,7 @@
esac
if [[ $# -eq 0 ]] ; then
- trap 'echo ${BASHPID} $? >&'${mj_control_fd} EXIT
+ trap 'echo ${BASHPID} $? >&'${mj_write_fd} EXIT
trap 'exit 1' INT TERM
else
local ret
@@ -169,7 +172,7 @@
[[ $# -eq 0 ]] || die "${FUNCNAME} takes no arguments"
local pid ret
- read -r -u ${mj_control_fd} pid ret || die
+ read -r -u ${mj_read_fd} pid ret || die
: $(( --mj_num_jobs ))
return ${ret}
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: multiprocessing.eclass
@ 2013-11-28 20:49 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2013-11-28 20:49 UTC (permalink / raw
To: gentoo-commits
vapier 13/11/28 20:49:14
Modified: multiprocessing.eclass
Log:
add a makeopts_loadavg helper to extract --load-average # from $MAKEOPTS #490620 by M.B.
Revision Changes Path
1.4 eclass/multiprocessing.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?r1=1.3&r2=1.4
Index: multiprocessing.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multiprocessing.eclass 12 Oct 2013 21:12:48 -0000 1.3
+++ multiprocessing.eclass 28 Nov 2013 20:49:14 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.3 2013/10/12 21:12:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.4 2013/11/28 20:49:14 vapier Exp $
# @ECLASS: multiprocessing.eclass
# @MAINTAINER:
@@ -55,6 +55,25 @@
echo ${jobs:-1}
}
+# @FUNCTION: makeopts_loadavg
+# @USAGE: [${MAKEOPTS}]
+# @DESCRIPTION:
+# Searches the arguments (defaults to ${MAKEOPTS}) and extracts the value set
+# for load-average. For make and ninja based builds this will mean new jobs are
+# not only limited by the jobs-value, but also by the current load - which might
+# get excessive due to I/O and not just due to CPU load.
+# Be aware that the returned number might be a floating-point number. Test
+# whether your software supports that.
+makeopts_loadavg() {
+ [[ $# -eq 0 ]] && set -- ${MAKEOPTS}
+ # This assumes the first .* will be more greedy than the second .*
+ # since POSIX doesn't specify a non-greedy match (i.e. ".*?").
+ local lavg=$(echo " $* " | sed -r -n \
+ -e 's:.*[[:space:]](-l|--load-average[=[:space:]])[[:space:]]*([0-9]+|[0-9]+\.[0-9]+)[^0-9.]*:\2:p' \
+ -e 's:.*[[:space:]](-l|--load-average)[[:space:]].*:999:p')
+ echo ${lavg:-1}
+}
+
# @FUNCTION: multijob_init
# @USAGE: [${MAKEOPTS}]
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: multiprocessing.eclass
@ 2013-12-03 8:15 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2013-12-03 8:15 UTC (permalink / raw
To: gentoo-commits
vapier 13/12/03 08:15:14
Modified: multiprocessing.eclass
Log:
add a /dev/fd sanity check #479656
Revision Changes Path
1.5 eclass/multiprocessing.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?r1=1.4&r2=1.5
Index: multiprocessing.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- multiprocessing.eclass 28 Nov 2013 20:49:14 -0000 1.4
+++ multiprocessing.eclass 3 Dec 2013 08:15:14 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.4 2013/11/28 20:49:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.5 2013/12/03 08:15:14 vapier Exp $
# @ECLASS: multiprocessing.eclass
# @MAINTAINER:
@@ -227,6 +227,13 @@
redirect_alloc_fd() {
local var=$1 file=$2 redir=${3:-"<>"}
+ # Make sure /dev/fd is sane. #479656
+ if [[ ! -L /dev/fd ]] ; then
+ eerror "You're missing a /dev/fd symlink to /proc/self/fd."
+ eerror "Please fix the symlink and check your boot scripts (udev/etc...)."
+ die "/dev/fd is broken"
+ fi
+
if [[ $(( (BASH_VERSINFO[0] << 8) + BASH_VERSINFO[1] )) -ge $(( (4 << 8) + 1 )) ]] ; then
# Newer bash provides this functionality.
eval "exec {${var}}${redir}'${file}'"
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: multiprocessing.eclass
@ 2013-12-07 9:14 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2013-12-07 9:14 UTC (permalink / raw
To: gentoo-commits
vapier 13/12/07 09:14:15
Modified: multiprocessing.eclass
Log:
use $CBUILD rather than uname for host detection #479656
Revision Changes Path
1.7 eclass/multiprocessing.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?r1=1.6&r2=1.7
Index: multiprocessing.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- multiprocessing.eclass 6 Dec 2013 03:04:01 -0000 1.6
+++ multiprocessing.eclass 7 Dec 2013 09:14:15 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.6 2013/12/06 03:04:01 jcallen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.7 2013/12/07 09:14:15 vapier Exp $
# @ECLASS: multiprocessing.eclass
# @MAINTAINER:
@@ -228,7 +228,7 @@
local var=$1 file=$2 redir=${3:-"<>"}
# Make sure /dev/fd is sane on Linux hosts. #479656
- if [[ ! -L /dev/fd && $(uname) == Linux ]] ; then
+ if [[ ! -L /dev/fd && ${CBUILD} == *linux* ]] ; then
eerror "You're missing a /dev/fd symlink to /proc/self/fd."
eerror "Please fix the symlink and check your boot scripts (udev/etc...)."
die "/dev/fd is broken"
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: multiprocessing.eclass
@ 2013-12-21 9:40 Mike Frysinger (vapier)
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2013-12-21 9:40 UTC (permalink / raw
To: gentoo-commits
vapier 13/12/21 09:40:38
Modified: multiprocessing.eclass
Log:
add support for bash-3.2 which lacks $BASHPID as pointed out by Ryan Hill
Revision Changes Path
1.8 eclass/multiprocessing.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?r1=1.7&r2=1.8
Index: multiprocessing.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- multiprocessing.eclass 7 Dec 2013 09:14:15 -0000 1.7
+++ multiprocessing.eclass 21 Dec 2013 09:40:37 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.7 2013/12/07 09:14:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.8 2013/12/21 09:40:37 vapier Exp $
# @ECLASS: multiprocessing.eclass
# @MAINTAINER:
@@ -36,6 +36,23 @@
if [[ ${___ECLASS_ONCE_MULTIPROCESSING} != "recur -_+^+_- spank" ]] ; then
___ECLASS_ONCE_MULTIPROCESSING="recur -_+^+_- spank"
+# @FUNCTION: bashpid
+# @DESCRIPTION:
+# Return the process id of the current sub shell. This is to support bash
+# versions older than 4.0 that lack $BASHPID support natively. Simply do:
+# echo ${BASHPID:-$(bashpid)}
+#
+# Note: Using this func in any other way than the one above is not supported.
+bashpid() {
+ # Running bashpid plainly will return incorrect results. This func must
+ # be run in a subshell of the current subshell to get the right pid.
+ # i.e. This will show the wrong value:
+ # bashpid
+ # But this will show the right value:
+ # (bashpid)
+ sh -c 'echo ${PPID}'
+}
+
# @FUNCTION: makeopts_jobs
# @USAGE: [${MAKEOPTS}]
# @DESCRIPTION:
@@ -142,7 +159,7 @@
esac
if [[ $# -eq 0 ]] ; then
- trap 'echo ${BASHPID} $? >&'${mj_write_fd} EXIT
+ trap 'echo ${BASHPID:-$(bashpid)} $? >&'${mj_write_fd} EXIT
trap 'exit 1' INT TERM
else
local ret
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-12-21 9:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-07 9:14 [gentoo-commits] gentoo-x86 commit in eclass: multiprocessing.eclass Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2013-12-21 9:40 Mike Frysinger (vapier)
2013-12-03 8:15 Mike Frysinger (vapier)
2013-11-28 20:49 Mike Frysinger (vapier)
2013-10-12 21:12 Mike Frysinger (vapier)
2012-07-30 14:52 Mike Frysinger (vapier)
2012-06-07 4:59 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox