2012-04-17 07:22:14 +00:00
|
|
|
#!/bin/sh
|
|
|
|
# $FreeBSD$
|
|
|
|
#
|
|
|
|
# Usage: cd /usr/src/contrib/jemalloc
|
|
|
|
# ./FREEBSD-upgrade <command> [args]
|
|
|
|
#
|
|
|
|
# At least the following ports are required when importing jemalloc:
|
|
|
|
# - devel/autoconf
|
|
|
|
# - devel/git
|
|
|
|
# - devel/gmake
|
|
|
|
# - textproc/docbook-xsl
|
2013-01-24 03:33:15 +00:00
|
|
|
# - textproc/libxslt
|
2012-04-17 07:22:14 +00:00
|
|
|
#
|
|
|
|
# The normal workflow for importing a new release is:
|
|
|
|
#
|
|
|
|
# cd /usr/src/contrib/jemalloc
|
|
|
|
#
|
|
|
|
# Merge local changes that were made since the previous import:
|
|
|
|
#
|
|
|
|
# ./FREEBSD-upgrade merge-changes
|
|
|
|
# ./FREEBSD-upgrade rediff
|
|
|
|
#
|
|
|
|
# Extract latest jemalloc release.
|
|
|
|
#
|
2017-06-15 07:15:05 +00:00
|
|
|
# ./FREEBSD-upgrade extract <rev>
|
2012-04-17 07:22:14 +00:00
|
|
|
#
|
|
|
|
# Fix patch conflicts as necessary, then regenerate diffs to update line
|
|
|
|
# offsets:
|
|
|
|
#
|
|
|
|
# ./FREEBSD-upgrade rediff
|
2017-06-15 07:15:05 +00:00
|
|
|
# ./FREEBSD-upgrade extract <rev>
|
2012-04-17 07:22:14 +00:00
|
|
|
#
|
|
|
|
# Do multiple buildworld/installworld rounds. If problems arise and patches
|
|
|
|
# are needed, edit the code in ${work} as necessary, then:
|
|
|
|
#
|
|
|
|
# ./FREEBSD-upgrade rediff
|
2017-06-15 07:15:05 +00:00
|
|
|
# ./FREEBSD-upgrade extract <rev>
|
2012-04-17 07:22:14 +00:00
|
|
|
#
|
|
|
|
# The rediff/extract order is important because rediff saves the local
|
|
|
|
# changes, then extract blows away the work tree and re-creates it with the
|
|
|
|
# diffs applied.
|
|
|
|
#
|
|
|
|
# Finally, to clean up:
|
|
|
|
#
|
|
|
|
# ./FREEBSD-upgrade clean
|
|
|
|
|
|
|
|
set -e
|
2017-06-15 07:15:05 +00:00
|
|
|
set -x
|
2012-04-17 07:22:14 +00:00
|
|
|
|
|
|
|
if [ ! -x "FREEBSD-upgrade" ] ; then
|
|
|
|
echo "Run from within src/contrib/jemalloc/" >&2
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2017-06-15 07:15:05 +00:00
|
|
|
if [ "x${JEMALLOC_REPO}" = "x" ] ; then
|
|
|
|
JEMALLOC_REPO=https://github.com/jemalloc/jemalloc.git
|
|
|
|
fi
|
|
|
|
|
2012-04-17 07:22:14 +00:00
|
|
|
src=`pwd`
|
2017-06-15 07:15:05 +00:00
|
|
|
|
|
|
|
jemalloc_tmp="jemalloc.tmp"
|
|
|
|
tmpdir="${src}/../${jemalloc_tmp}"
|
|
|
|
bare_repo="${tmpdir}/jemalloc_bare.git"
|
|
|
|
work="jemalloc_work.git"
|
|
|
|
work_repo="${tmpdir}/${work}"
|
|
|
|
namespace_repo="${tmpdir}/jemalloc_namespace.git"
|
2012-04-17 07:22:14 +00:00
|
|
|
changes="${src}/FREEBSD-changes"
|
|
|
|
|
2017-06-15 07:15:05 +00:00
|
|
|
do_fetch() {
|
2012-04-17 07:22:14 +00:00
|
|
|
local rev=$1
|
2017-06-15 07:15:05 +00:00
|
|
|
if [ ! -d "${bare_repo}" ] ; then
|
|
|
|
mkdir -p "${bare_repo}"
|
|
|
|
git clone --bare ${JEMALLOC_REPO} ${bare_repo}
|
|
|
|
fi
|
2012-04-17 07:22:14 +00:00
|
|
|
(
|
2017-06-15 07:15:05 +00:00
|
|
|
cd ${bare_repo}
|
|
|
|
git fetch origin ${rev}
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
do_extract_helper() {
|
|
|
|
local rev=$1
|
|
|
|
local repo=$2
|
|
|
|
do_fetch ${rev}
|
|
|
|
rm -rf ${repo}
|
|
|
|
git clone ${bare_repo} ${repo}
|
|
|
|
(
|
|
|
|
cd ${repo}
|
2012-04-17 07:22:14 +00:00
|
|
|
if [ "x${rev}" != "x" ] ; then
|
|
|
|
# Use optional rev argument to check out a revision other than HEAD on
|
|
|
|
# master.
|
|
|
|
git checkout ${rev}
|
|
|
|
fi
|
2017-06-15 07:15:05 +00:00
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
do_autogen() {
|
|
|
|
./autogen.sh --enable-xmalloc --enable-utrace \
|
|
|
|
--with-xslroot=/usr/local/share/xsl/docbook --with-private-namespace=__ \
|
|
|
|
--with-lg-page-sizes=12,13,14,16
|
|
|
|
}
|
|
|
|
|
|
|
|
do_extract_diff() {
|
|
|
|
local rev=$1
|
|
|
|
local repo=$2
|
|
|
|
do_extract_helper ${rev} ${repo}
|
|
|
|
(
|
|
|
|
cd ${repo}
|
2012-04-17 07:22:14 +00:00
|
|
|
# Apply diffs before generating files.
|
|
|
|
patch -p1 < "${src}/FREEBSD-diffs"
|
|
|
|
find . -name '*.orig' -delete
|
2017-06-15 07:15:05 +00:00
|
|
|
# Generate files.
|
|
|
|
do_autogen
|
2012-04-17 07:22:14 +00:00
|
|
|
gmake dist
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2017-06-15 07:15:05 +00:00
|
|
|
do_extract_namespace() {
|
|
|
|
local rev=$1
|
|
|
|
local repo=$2
|
|
|
|
do_extract_helper ${rev} ${repo}
|
|
|
|
(
|
|
|
|
cd ${repo}
|
|
|
|
# Generate files.
|
|
|
|
do_autogen
|
|
|
|
gmake include/jemalloc/internal/private_namespace.h
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
do_extract() {
|
|
|
|
local rev=$1
|
|
|
|
do_fetch ${rev}
|
|
|
|
do_extract_diff ${rev} ${work_repo}
|
|
|
|
do_extract_namespace ${rev} ${namespace_repo}
|
|
|
|
}
|
|
|
|
|
2012-04-17 07:22:14 +00:00
|
|
|
do_diff() {
|
2015-08-18 00:21:25 +00:00
|
|
|
(
|
2017-06-15 07:15:05 +00:00
|
|
|
cd ${work_repo}
|
2015-08-18 00:21:25 +00:00
|
|
|
find . -name '*.orig' -delete
|
|
|
|
find . -name '*.rej' -delete
|
|
|
|
git add -A
|
|
|
|
git diff --cached
|
|
|
|
) > FREEBSD-diffs
|
2012-04-17 07:22:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
command=$1
|
|
|
|
shift
|
|
|
|
case "${command}" in
|
|
|
|
merge-changes) # Merge local changes that were made since the previous import.
|
|
|
|
rev=`cat VERSION |tr 'g' ' ' |awk '{print $2}'`
|
|
|
|
# Extract code corresponding to most recent import.
|
|
|
|
do_extract ${rev}
|
|
|
|
# Compute local differences to the upstream+patches and apply them.
|
|
|
|
(
|
2017-06-15 07:15:05 +00:00
|
|
|
cd ${tmpdir}
|
|
|
|
diff -ru -X ${src}/FREEBSD-Xlist ${work} ../jemalloc > ${changes} || true
|
2012-04-17 07:22:14 +00:00
|
|
|
)
|
|
|
|
(
|
2017-06-15 07:15:05 +00:00
|
|
|
cd ${work_repo}
|
|
|
|
patch -p1 < ${changes} || true
|
2012-04-17 07:22:14 +00:00
|
|
|
find . -name '*.orig' -delete
|
|
|
|
)
|
|
|
|
# Update diff.
|
|
|
|
do_diff
|
|
|
|
;;
|
|
|
|
extract) # Extract upstream sources, apply patches, copy to contrib/jemalloc.
|
|
|
|
rev=$1
|
|
|
|
do_extract ${rev}
|
|
|
|
# Delete existing files so that cruft doesn't silently remain.
|
|
|
|
rm -rf ChangeLog COPYING VERSION doc include src
|
|
|
|
# Copy files over.
|
2017-06-15 07:15:05 +00:00
|
|
|
tar cf - -C ${work_repo} -X FREEBSD-Xlist . |tar xvf -
|
|
|
|
internal_dir="include/jemalloc/internal"
|
|
|
|
grep -v ' isthreaded ' \
|
|
|
|
"${namespace_repo}/${internal_dir}/private_namespace.h" \
|
|
|
|
> "${internal_dir}/private_namespace.h"
|
2012-04-17 07:22:14 +00:00
|
|
|
;;
|
|
|
|
rediff) # Regenerate diffs based on working tree.
|
|
|
|
do_diff
|
|
|
|
;;
|
|
|
|
clean) # Remove working tree and temporary files.
|
2017-06-15 07:15:05 +00:00
|
|
|
rm -rf ${tmpdir} ${changes}
|
2012-04-17 07:22:14 +00:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo "Unsupported command: \"${command}\"" >&2
|
|
|
|
exit 1
|
|
|
|
;;
|
|
|
|
esac
|