diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-04-07 09:55:57 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-04-07 09:55:57 +0400 |
| commit | 6ee90a64a4249ec4a7eec4915789032e41f75d98 (patch) | |
| tree | 690437a1bab88a5524a64352f7f0f401ae63d9aa | |
| parent | fd19103e568b9feb2cc724f670606a4282ab01d1 (diff) | |
2010-04-07 Gonzalo Paniagua Javier <gonzalo@novell.com>
* threadpool.c: decrement the domain threadpool jobs count.
svn path=/branches/mono-2-6/mono/; revision=154908
| -rw-r--r-- | mono/metadata/ChangeLog | 4 | ||||
| -rw-r--r-- | mono/metadata/threadpool.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index ab0f99a1bff..1baa20ff3ff 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,5 +1,9 @@ 2010-04-07 Gonzalo Paniagua Javier <gonzalo@novell.com> + * threadpool.c: decrement the domain threadpool jobs count. + +2010-04-07 Gonzalo Paniagua Javier <gonzalo@novell.com> + * file-io.c: reset the MonoIOStat structure in case of error. Fixes bug #582667. diff --git a/mono/metadata/threadpool.c b/mono/metadata/threadpool.c index c59048de4d8..e7bc0c48290 100644 --- a/mono/metadata/threadpool.c +++ b/mono/metadata/threadpool.c @@ -1290,6 +1290,7 @@ clear_queue (CRITICAL_SECTION *cs, TPQueue *list, MonoDomain *domain) for (i = list->first_elem; i < list->next_elem; ++i) { MonoObject *obj = mono_array_get (list->array, MonoObject*, i); if (obj->vtable->domain == domain) { + threadpool_jobs_dec (obj); unregister_job ((MonoAsyncResult*)obj); mono_array_set (list->array, MonoObject*, i, NULL); |