Merge branch 'feature-concurrent-sweep'

diff --combined man/mono.1
index a3ab46153f59aa7bf5c3687bfb1a8019ec63f9c0,7cd68eaef4add3d6cf223f5625812c422cef23cf..fc49f3b90653115d573561dd3f39bf3fe6b2fd96
--- 1/man/mono.1
--- 2/man/mono.1
+++ b/man/mono.1
@@@ -1129,9 -1129,16 +1129,16 @@@ to 100 percent.  A value of 0 turns eva
  .TP
  \fB(no-)lazy-sweep\fR
  Enables or disables lazy sweep for the Mark&Sweep collector.  If
- enabled, the sweep phase of the garbage collection is done piecemeal
- whenever the need arises, typically during nursery collections.  Lazy
- sweeping is enabled by default.
+ enabled, the sweeping of individual major heap blocks is done
+ piecemeal whenever the need arises, typically during nursery
+ collections.  Lazy sweeping is enabled by default.
+ .TP
+ \fB(no-)concurrent-sweep\fR
+ Enables or disables concurrent sweep for the Mark&Sweep collector.  If
+ enabled, the iteration of all major blocks to determine which ones can
+ be freed and which ones have to be kept and swept, is done
+ concurrently with the running program.  Concurrent sweeping is enabled
+ by default.
  .TP
  \fBstack-mark=\fImark-mode\fR
  Specifies how application threads should be scanned. Options are
@@@ -1462,12 -1469,6 +1469,12 @@@ include "clearlooks", "nice" and "win32
  .Sp
  The default is "win32".  
  .TP
 +\fBMONO_THREAPOOL\fR
 +This environment variable can be used to choose the implementation of
 +the ThreadPool used at runtime.  By default this uses the long term
 +Mono threadpool implementation.   But a new "microsoft" value switches
 +the threadpool implementation to Microsoft's CoreCLR/ReferenceSource implementation.
 +.TP
  \fBMONO_TLS_SESSION_CACHE_TIMEOUT\fR
  The time, in seconds, that the SSL/TLS session cache will keep it's entry to
  avoid a new negotiation between the client and a server. Negotiation are very

diff --combined mono/metadata/Makefile.am
index 8b22bbb646166414191708275b70ea0173f866b6,0cbcf73f826fe2d00c8e2c518b5309b6588e36ce..1241a7a079e60d46d531e556a58f8ddd0bde10d0
--- 1/mono/metadata/Makefile.am
--- 2/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@@ -291,6 -291,8 +291,8 @@@ sgen_sources = 
        sgen-layout-stats.h     \
        sgen-qsort.c    \
        sgen-qsort.h    \
+       sgen-thread-pool.c      \
+       sgen-thread-pool.h      \
        sgen-tagged-pointer.h
  
  libmonoruntime_la_SOURCES = $(common_sources) $(gc_dependent_sources) $(null_gc_sources) $(boehm_sources)
@@@ -365,5 -367,5 +367,5 @@@ endi
  endif
  endif
  
 -EXTRA_DIST = make-bundle.pl sample-bundle $(win32_sources) $(unix_sources) $(null_sources) runtime.h \
 +EXTRA_DIST = $(win32_sources) $(unix_sources) $(null_sources) runtime.h \
                tpool-poll.c tpool-epoll.c tpool-kqueue.c