mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-14 07:19:56 +08:00
This commit was generated by cvs2svn to compensate for changes in r69874,
which included commits to RCS files with non-trunk default branches. From-SVN: r69875
This commit is contained in:
Jeff Sturm
parent
6991c6c926
commit
ff6fe7a177
@ -307,6 +307,7 @@ static void add_back_edges(ptr_t p, word n_words, word gc_descr)
|
||||
}
|
||||
while (currentp < (word *)(p + gc_descr)) {
|
||||
word current = *currentp++;
|
||||
FIXUP_POINTER(current);
|
||||
if (current >= (word)GC_least_plausible_heap_addr &&
|
||||
current <= (word)GC_greatest_plausible_heap_addr) {
|
||||
ptr_t target = GC_base((GC_PTR)current);
|
||||
|
||||
@ -73,3 +73,9 @@ GC on EWS4800
|
||||
--
|
||||
Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
|
||||
|
||||
|
||||
When using the new "configure; make" build process, please
|
||||
run configure with the --disable-shared option. "Make check" does not
|
||||
yet pass with dynamic libraries. Ther reasons for that are not yet
|
||||
understood. (HB, paraphrasing message from Hironori SAKAMOTO.)
|
||||
|
||||
|
||||
@ -51,7 +51,18 @@ _DLL Defined by Visual C++ if dynamic libraries are being built
|
||||
__declspec(dllexport) needs to be added to declarations
|
||||
to support the case in which the collector is in a dll.
|
||||
|
||||
GC_DLL User-settable macro that forces the effect of _DLL.
|
||||
GC_DLL User-settable macro that forces the effect of _DLL. Set
|
||||
by gc.h if _DLL is defined and GC_NOT_DLL is undefined.
|
||||
This is the macro that is tested internally to determine
|
||||
whether the GC is in its own dynamic library. May need
|
||||
to be set by clients before including gc.h. Note that
|
||||
inside the GC implementation it indicates that the
|
||||
collector is in its own dynamic library, should export
|
||||
its symbols, etc. But in clients it indicates that the
|
||||
GC resides in a different DLL, its entry points should
|
||||
be referenced accordingly, and precautions may need to
|
||||
be taken to properly deal with statically allocated
|
||||
variables in the main program. Used only for MS Windows.
|
||||
|
||||
GC_NOT_DLL User-settable macro that overrides _DLL, e.g. if dynamic
|
||||
libraries are used, but the collector is in a static library.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<TITLE> Conservative GC Algorithmic Overview </TITLE>
|
||||
<AUTHOR> Hans-J. Boehm, Silicon Graphics</author>
|
||||
<AUTHOR> Hans-J. Boehm, HP Labs (Much of this was written at SGI)</author>
|
||||
</HEAD>
|
||||
<BODY>
|
||||
<H1> <I>This is under construction</i> </h1>
|
||||
@ -96,20 +96,24 @@ typically on the order of the page size.
|
||||
<P>
|
||||
Large block sizes are rounded up to
|
||||
the next multiple of <TT>HBLKSIZE</tt> and then allocated by
|
||||
<TT>GC_allochblk</tt>. This uses roughly what Paul Wilson has termed
|
||||
a "next fit" algorithm, i.e. first-fit with a rotating pointer.
|
||||
The implementation does check for a better fitting immediately
|
||||
adjacent block, which gives it somewhat better fragmentation characteristics.
|
||||
I'm now convinced it should use a best fit algorithm. The actual
|
||||
<TT>GC_allochblk</tt>. Recent versions of the collector
|
||||
use an approximate best fit algorithm by keeping free lists for
|
||||
several large block sizes.
|
||||
The actual
|
||||
implementation of <TT>GC_allochblk</tt>
|
||||
is significantly complicated by black-listing issues
|
||||
(see below).
|
||||
<P>
|
||||
Small blocks are allocated in blocks of size <TT>HBLKSIZE</tt>.
|
||||
Each block is
|
||||
Small blocks are allocated in chunks of size <TT>HBLKSIZE</tt>.
|
||||
Each chunk is
|
||||
dedicated to only one object size and kind. The allocator maintains
|
||||
separate free lists for each size and kind of object.
|
||||
<P>
|
||||
Once a large block is split for use in smaller objects, it can only
|
||||
be used for objects of that size, unless the collector discovers a completely
|
||||
empty chunk. Completely empty chunks are restored to the appropriate
|
||||
large block free list.
|
||||
<P>
|
||||
In order to avoid allocating blocks for too many distinct object sizes,
|
||||
the collector normally does not directly allocate objects of every possible
|
||||
request size. Instead request are rounded up to one of a smaller number
|
||||
@ -139,27 +143,35 @@ expand the heap. Otherwise, we initiate a garbage collection. This ensures
|
||||
that the amount of garbage collection work per allocated byte remains
|
||||
constant.
|
||||
<P>
|
||||
The above is in fat an oversimplification of the real heap expansion
|
||||
heuristic, which adjusts slightly for root size and certain kinds of
|
||||
fragmentation. In particular, programs with a large root set size and
|
||||
The above is in fact an oversimplification of the real heap expansion
|
||||
and GC triggering heuristic, which adjusts slightly for root size
|
||||
and certain kinds of
|
||||
fragmentation. In particular:
|
||||
<UL>
|
||||
<LI> Programs with a large root set size and
|
||||
little live heap memory will expand the heap to amortize the cost of
|
||||
scanning the roots.
|
||||
<P>
|
||||
Versions 5.x of the collector actually collect more frequently in
|
||||
scanning the roots.
|
||||
<LI> Versions 5.x of the collector actually collect more frequently in
|
||||
nonincremental mode. The large block allocator usually refuses to split
|
||||
large heap blocks once the garbage collection threshold is
|
||||
reached. This often has the effect of collecting well before the
|
||||
heap fills up, thus reducing fragmentation and working set size at the
|
||||
expense of GC time. 6.x will chose an intermediate strategy depending
|
||||
expense of GC time. Versions 6.x choose an intermediate strategy depending
|
||||
on how much large object allocation has taken place in the past.
|
||||
(If the collector is configured to unmap unused pages, versions 6.x
|
||||
will use the 5.x strategy.)
|
||||
use the 5.x strategy.)
|
||||
<LI> In calculating the amount of allocation since the last collection we
|
||||
give partial credit for objects we expect to be explicitly deallocated.
|
||||
Even if all objects are explicitly managed, it is often desirable to collect
|
||||
on rare occasion, since that is our only mechanism for coalescing completely
|
||||
empty chunks.
|
||||
</ul>
|
||||
<P>
|
||||
(It has been suggested that this should be adjusted so that we favor
|
||||
It has been suggested that this should be adjusted so that we favor
|
||||
expansion if the resulting heap still fits into physical memory.
|
||||
In many cases, that would no doubt help. But it is tricky to do this
|
||||
in a way that remains robust if multiple application are contending
|
||||
for a single pool of physical memory.)
|
||||
for a single pool of physical memory.
|
||||
|
||||
<H2>Mark phase</h2>
|
||||
|
||||
@ -204,7 +216,7 @@ changes to
|
||||
<LI> <TT>MS_NONE</tt> indicating that reachable objects are marked.
|
||||
</ol>
|
||||
|
||||
The core mark routine <TT>GC_mark_from_mark_stack</tt>, is called
|
||||
The core mark routine <TT>GC_mark_from</tt>, is called
|
||||
repeatedly by several of the sub-phases when the mark stack starts to fill
|
||||
up. It is also called repeatedly in <TT>MS_ROOTS_PUSHED</tt> state
|
||||
to empty the mark stack.
|
||||
@ -213,6 +225,12 @@ each call, so that it can also be used by the incremental collector.
|
||||
It is fairly carefully tuned, since it usually consumes a large majority
|
||||
of the garbage collection time.
|
||||
<P>
|
||||
The fact that it perform a only a small amount of work per call also
|
||||
allows it to be used as the core routine of the parallel marker. In that
|
||||
case it is normally invoked on thread-private mark stacks instead of the
|
||||
global mark stack. More details can be found in
|
||||
<A HREF="scale.html">scale.html</a>
|
||||
<P>
|
||||
The marker correctly handles mark stack overflows. Whenever the mark stack
|
||||
overflows, the mark state is reset to <TT>MS_INVALID</tt>.
|
||||
Since there are already marked objects in the heap,
|
||||
@ -281,7 +299,8 @@ Unmarked large objects are immediately returned to the large object free list.
|
||||
Each small object page is checked to see if all mark bits are clear.
|
||||
If so, the entire page is returned to the large object free list.
|
||||
Small object pages containing some reachable object are queued for later
|
||||
sweeping.
|
||||
sweeping, unless we determine that the page contains very little free
|
||||
space, in which case it is not examined further.
|
||||
<P>
|
||||
This initial sweep pass touches only block headers, not
|
||||
the blocks themselves. Thus it does not require significant paging, even
|
||||
@ -341,12 +360,16 @@ object itself becomes marked, we have uncovered
|
||||
a cycle involving the object. This usually results in a warning from the
|
||||
collector. Such objects are not finalized, since it may be
|
||||
unsafe to do so. See the more detailed
|
||||
<A HREF="finalization.html"> discussion of finalization semantics</a>.
|
||||
<A HREF="http://www.hpl.hp.com/personal/Hans_Boehm/gc/finalization.html"> discussion of finalization semantics</a>.
|
||||
<P>
|
||||
Any objects remaining unmarked at the end of this process are added to
|
||||
a queue of objects whose finalizers can be run. Depending on collector
|
||||
configuration, finalizers are dequeued and run either implicitly during
|
||||
allocation calls, or explicitly in response to a user request.
|
||||
(Note that the former is unfortunately both the default and not generally safe.
|
||||
If finalizers perform synchronization, it may result in deadlocks.
|
||||
Nontrivial finalizers generally need to perform synchronization, and
|
||||
thus require a different collector configuration.)
|
||||
<P>
|
||||
The collector provides a mechanism for replacing the procedure that is
|
||||
used to mark through objects. This is used both to provide support for
|
||||
@ -354,13 +377,14 @@ Java-style unordered finalization, and to ignore certain kinds of cycles,
|
||||
<I>e.g.</i> those arising from C++ implementations of virtual inheritance.
|
||||
|
||||
<H2>Generational Collection and Dirty Bits</h2>
|
||||
We basically use the parallel and generational GC algorithm described in
|
||||
<A HREF="papers/pldi91.ps.gz">"Mostly Parallel Garbage Collection"</a>,
|
||||
We basically use the concurrent and generational GC algorithm described in
|
||||
<A HREF="http://www.hpl.hp.com/personal/Hans_Boehm/gc/papers/pldi91.ps.Z">"Mostly Parallel Garbage Collection"</a>,
|
||||
by Boehm, Demers, and Shenker.
|
||||
<P>
|
||||
The most significant modification is that
|
||||
the collector always runs in the allocating thread.
|
||||
There is no separate garbage collector thread.
|
||||
the collector always starts running in the allocating thread.
|
||||
There is no separate garbage collector thread. (If parallel GC is
|
||||
enabled, helper threads may also be woken up.)
|
||||
If an allocation attempt either requests a large object, or encounters
|
||||
an empty small object free list, and notices that there is a collection
|
||||
in progress, it immediately performs a small amount of marking work
|
||||
@ -389,50 +413,108 @@ cannot be satisfied from small object free lists. When marking completes,
|
||||
the set of modified pages is retrieved, and we mark once again from
|
||||
marked objects on those pages, this time with the mutator stopped.
|
||||
<P>
|
||||
We keep track of modified pages using one of three distinct mechanisms:
|
||||
We keep track of modified pages using one of several distinct mechanisms:
|
||||
<OL>
|
||||
<LI>
|
||||
Through explicit mutator cooperation. Currently this requires
|
||||
the use of <TT>GC_malloc_stubborn</tt>.
|
||||
the use of <TT>GC_malloc_stubborn</tt>, and is rarely used.
|
||||
<LI>
|
||||
By write-protecting physical pages and catching write faults. This is
|
||||
(<TT>MPROTECT_VDB</tt>) By write-protecting physical pages and
|
||||
catching write faults. This is
|
||||
implemented for many Unix-like systems and for win32. It is not possible
|
||||
in a few environments.
|
||||
<LI>
|
||||
By retrieving dirty bit information from /proc. (Currently only Sun's
|
||||
(<TT>PROC_VDB</tt>) By retrieving dirty bit information from /proc.
|
||||
(Currently only Sun's
|
||||
Solaris supports this. Though this is considerably cleaner, performance
|
||||
may actually be better with mprotect and signals.)
|
||||
<LI>
|
||||
(<TT>PCR_VDB</tt>) By relying on an external dirty bit implementation, in this
|
||||
case the one in Xerox PCR.
|
||||
<LI>
|
||||
(<TT>DEFAULT_VDB</tt>) By treating all pages as dirty. This is the default if
|
||||
none of the other techniques is known to be usable, and
|
||||
<TT>GC_malloc_stubborn</tt> is not used. Practical only for testing, or if
|
||||
the vast majority of objects use <TT>GC_malloc_stubborn</tt>.
|
||||
</ol>
|
||||
|
||||
<H2>Black-listing</h2>
|
||||
|
||||
The collector implements <I>black-listing</i> of pages, as described
|
||||
in
|
||||
<A HREF="http://www.acm.org/pubs/citations/proceedings/pldi/155090/p197-boehm/">
|
||||
Boehm, ``Space Efficient Conservative Collection'', PLDI '93</a>, also available
|
||||
<A HREF="papers/pldi93.ps.Z">here</a>.
|
||||
<P>
|
||||
During the mark phase, the collector tracks ``near misses'', i.e. attempts
|
||||
to follow a ``pointer'' to just outside the garbage-collected heap, or
|
||||
to a currently unallocated page inside the heap. Pages that have been
|
||||
the targets of such near misses are likely to be the targets of
|
||||
misidentified ``pointers'' in the future. To minimize the future
|
||||
damage caused by such misidentifications they will be allocated only to
|
||||
small pointerfree objects.
|
||||
<P>
|
||||
The collector understands two different kinds of black-listing. A
|
||||
page may be black listed for interior pointer references
|
||||
(<TT>GC_add_to_black_list_stack</tt>), if it was the target of a near
|
||||
miss from a location that requires interior pointer recognition,
|
||||
<I>e.g.</i> the stack, or the heap if <TT>GC_all_interior_pointers</tt>
|
||||
is set. In this case, we also avoid allocating large blocks that include
|
||||
this page.
|
||||
<P>
|
||||
If the near miss came from a source that did not require interior
|
||||
pointer recognition, it is black-listed with
|
||||
<TT>GC_add_to_black_list_normal</tt>.
|
||||
A page black-listed in this way may appear inside a large object,
|
||||
so long as it is not the first page of a large object.
|
||||
<P>
|
||||
The <TT>GC_allochblk</tt> routine respects black-listing when assigning
|
||||
a block to a particular object kind and size. It occasionally
|
||||
drops (i.e. allocates and forgets) blocks that are completely black-listed
|
||||
in order to avoid excessively long large block free lists containing
|
||||
only unusable blocks. This would otherwise become an issue
|
||||
if there is low demand for small pointerfree objects.
|
||||
|
||||
<H2>Thread support</h2>
|
||||
We support several different threading models. Unfortunately Pthreads,
|
||||
the only reasonably well standardized thread model, supports too narrow
|
||||
an interface for conservative garbage collection. There appears to be
|
||||
no portable way to allow the collector to coexist with various Pthreads
|
||||
no completely portable way to allow the collector to coexist with various Pthreads
|
||||
implementations. Hence we currently support only a few of the more
|
||||
common Pthreads implementations.
|
||||
<P>
|
||||
In particular, it is very difficult for the collector to stop all other
|
||||
threads in the system and examine the register contents. This is currently
|
||||
accomplished with very different mechanisms for different Pthreads
|
||||
accomplished with very different mechanisms for some Pthreads
|
||||
implementations. The Solaris implementation temporarily disables much
|
||||
of the user-level threads implementation by stopping kernel-level threads
|
||||
("lwp"s). The Irix implementation sends signals to individual Pthreads
|
||||
and has them wait in the signal handler. The Linux implementation
|
||||
is similar in spirit to the Irix one.
|
||||
("lwp"s). The Linux/HPUX/OSF1 and Irix implementations sends signals to
|
||||
individual Pthreads and has them wait in the signal handler.
|
||||
<P>
|
||||
The Irix implementation uses
|
||||
only documented Pthreads calls, but relies on extensions to their semantics,
|
||||
notably the use of mutexes and condition variables from signal
|
||||
handlers. The Linux implementation should be far closer to
|
||||
portable, though impirically it is not completely portable.
|
||||
The Linux and Irix implementations use
|
||||
only documented Pthreads calls, but rely on extensions to their semantics.
|
||||
The Linux implementation <TT>linux_threads.c</tt> relies on only very
|
||||
mild extensions to the pthreads semantics, and already supports a large number
|
||||
of other Unix-like pthreads implementations. Our goal is to make this the
|
||||
only pthread support in the collector.
|
||||
<P>
|
||||
(The Irix implementation is separate only for historical reasons and should
|
||||
clearly be merged. The current Solaris implementation probably performs
|
||||
better in the uniprocessor case, but does not support thread operations in the
|
||||
collector. Hence it cannot support the parallel marker.)
|
||||
<P>
|
||||
All implementations must
|
||||
intercept thread creation and a few other thread-specific calls to allow
|
||||
enumeration of threads and location of thread stacks. This is current
|
||||
accomplished with <TT># define</tt>'s in <TT>gc.h</tt>, or optionally
|
||||
accomplished with <TT># define</tt>'s in <TT>gc.h</tt>
|
||||
(really <TT>gc_pthread_redirects.h</tt>), or optionally
|
||||
by using ld's function call wrapping mechanism under Linux.
|
||||
<P>
|
||||
Comments are appreciated. Please send mail to
|
||||
<A HREF="mailto:boehm@acm.org"><TT>boehm@acm.org</tt></a>
|
||||
<A HREF="mailto:boehm@acm.org"><TT>boehm@acm.org</tt></a> or
|
||||
<A HREF="mailto:Hans.Boehm@hp.com"><TT>Hans.Boehm@hp.com</tt></a>
|
||||
<P>
|
||||
This is a modified copy of a page written while the author was at SGI.
|
||||
The original was <A HREF="http://reality.sgi.com/boehm/gcdescr.html">here</a>.
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<TITLE> Two-Level Tree Structure for Fast Pointer Lookup</TITLE>
|
||||
<AUTHOR> Hans-J. Boehm, Silicon Graphics</author>
|
||||
<AUTHOR> Hans-J. Boehm, Silicon Graphics (now at HP)</author>
|
||||
</HEAD>
|
||||
<BODY>
|
||||
<H1>Two-Level Tree Structure for Fast Pointer Lookup</h1>
|
||||
<P>
|
||||
The conservative garbage collector described
|
||||
<A HREF="gc.html">here</a> uses a 2-level tree
|
||||
<A HREF="http://www.hpl.hp.com/personal/Hans_Boehm/gc/">here</a>
|
||||
uses a 2-level tree
|
||||
data structure to aid in fast pointer identification.
|
||||
This data structure is described in a bit more detail here, since
|
||||
<OL>
|
||||
|
||||
@ -109,7 +109,7 @@ then
|
||||
echo "install: no input file specified"
|
||||
exit 1
|
||||
else
|
||||
true
|
||||
:
|
||||
fi
|
||||
|
||||
if [ x"$dir_arg" != x ]; then
|
||||
@ -120,7 +120,7 @@ if [ x"$dir_arg" != x ]; then
|
||||
instcmd=:
|
||||
chmodcmd=""
|
||||
else
|
||||
instcmd=mkdir
|
||||
instcmd=$mkdirprog
|
||||
fi
|
||||
else
|
||||
|
||||
@ -130,7 +130,7 @@ else
|
||||
|
||||
if [ -f $src -o -d $src ]
|
||||
then
|
||||
true
|
||||
:
|
||||
else
|
||||
echo "install: $src does not exist"
|
||||
exit 1
|
||||
@ -141,7 +141,7 @@ else
|
||||
echo "install: no destination specified"
|
||||
exit 1
|
||||
else
|
||||
true
|
||||
:
|
||||
fi
|
||||
|
||||
# If destination is a directory, append the input filename; if your system
|
||||
@ -151,7 +151,7 @@ else
|
||||
then
|
||||
dst="$dst"/`basename $src`
|
||||
else
|
||||
true
|
||||
:
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -163,8 +163,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
|
||||
|
||||
# Skip lots of stat calls in the usual case.
|
||||
if [ ! -d "$dstdir" ]; then
|
||||
defaultIFS='
|
||||
'
|
||||
defaultIFS='
|
||||
'
|
||||
IFS="${IFS-${defaultIFS}}"
|
||||
|
||||
oIFS="${IFS}"
|
||||
@ -183,7 +183,7 @@ while [ $# -ne 0 ] ; do
|
||||
then
|
||||
$mkdirprog "${pathcomp}"
|
||||
else
|
||||
true
|
||||
:
|
||||
fi
|
||||
|
||||
pathcomp="${pathcomp}/"
|
||||
@ -194,10 +194,10 @@ if [ x"$dir_arg" != x ]
|
||||
then
|
||||
$doit $instcmd $dst &&
|
||||
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
|
||||
else
|
||||
|
||||
# If we're going to rename the final executable, determine the name now.
|
||||
@ -216,7 +216,7 @@ else
|
||||
then
|
||||
dstfile=`basename $dst`
|
||||
else
|
||||
true
|
||||
:
|
||||
fi
|
||||
|
||||
# Make a temp file name in the proper directory.
|
||||
@ -235,10 +235,10 @@ else
|
||||
# ignore errors from any of these, just make sure not to ignore
|
||||
# errors from the above "$doit $instcmd $src $dsttmp" command.
|
||||
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
|
||||
|
||||
# Now rename the file to the real destination.
|
||||
|
||||
|
||||
3398
boehm-gc/libtool.m4
vendored
3398
boehm-gc/libtool.m4
vendored
File diff suppressed because it is too large
Load Diff
@ -2,29 +2,90 @@
|
||||
# mkinstalldirs --- make directory hierarchy
|
||||
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
|
||||
# Created: 1993-05-16
|
||||
# Last modified: 1994-03-25
|
||||
# Public domain
|
||||
|
||||
errstatus=0
|
||||
# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
|
||||
|
||||
for file in ${1+"$@"} ; do
|
||||
errstatus=0
|
||||
dirmode=""
|
||||
|
||||
usage="\
|
||||
Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
|
||||
|
||||
# process command line arguments
|
||||
while test $# -gt 0 ; do
|
||||
case "${1}" in
|
||||
-h | --help | --h* ) # -h for help
|
||||
echo "${usage}" 1>&2; exit 0 ;;
|
||||
-m ) # -m PERM arg
|
||||
shift
|
||||
test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
|
||||
dirmode="${1}"
|
||||
shift ;;
|
||||
-- ) shift; break ;; # stop option processing
|
||||
-* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option
|
||||
* ) break ;; # first non-opt arg
|
||||
esac
|
||||
done
|
||||
|
||||
for file
|
||||
do
|
||||
if test -d "$file"; then
|
||||
shift
|
||||
else
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
case $# in
|
||||
0) exit 0 ;;
|
||||
esac
|
||||
|
||||
case $dirmode in
|
||||
'')
|
||||
if mkdir -p -- . 2>/dev/null; then
|
||||
echo "mkdir -p -- $*"
|
||||
exec mkdir -p -- "$@"
|
||||
fi ;;
|
||||
*)
|
||||
if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
|
||||
echo "mkdir -m $dirmode -p -- $*"
|
||||
exec mkdir -m "$dirmode" -p -- "$@"
|
||||
fi ;;
|
||||
esac
|
||||
|
||||
for file
|
||||
do
|
||||
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
|
||||
shift
|
||||
|
||||
pathcomp=
|
||||
for d in ${1+"$@"} ; do
|
||||
for d
|
||||
do
|
||||
pathcomp="$pathcomp$d"
|
||||
case "$pathcomp" in
|
||||
-* ) pathcomp=./$pathcomp ;;
|
||||
esac
|
||||
|
||||
if test ! -d "$pathcomp"; then
|
||||
echo "mkdir $pathcomp" 1>&2
|
||||
mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
|
||||
fi
|
||||
echo "mkdir $pathcomp"
|
||||
|
||||
if test ! -d "$pathcomp"; then
|
||||
errstatus=$lasterr
|
||||
mkdir "$pathcomp" || lasterr=$?
|
||||
|
||||
if test ! -d "$pathcomp"; then
|
||||
errstatus=$lasterr
|
||||
else
|
||||
if test ! -z "$dirmode"; then
|
||||
echo "chmod $dirmode $pathcomp"
|
||||
|
||||
lasterr=""
|
||||
chmod "$dirmode" "$pathcomp" || lasterr=$?
|
||||
|
||||
if test ! -z "$lasterr"; then
|
||||
errstatus=$lasterr
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
pathcomp="$pathcomp/"
|
||||
@ -33,4 +94,8 @@ done
|
||||
|
||||
exit $errstatus
|
||||
|
||||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 3
|
||||
# End:
|
||||
# mkinstalldirs ends here
|
||||
|
||||
Loading…
Reference in New Issue
Block a user