Merge pull request #2802 from BrzVlad/feature-evacuation-opt2

[mono.git] / mono / metadata / sgen-os-posix.c

diff --git a/mono/metadata/sgen-os-posix.c b/mono/metadata/sgen-os-posix.c
index 29ce34f917c0bd0b805a7247bddd6d8ad441fec0..dc9d29ff1395ad81be62b1a63edde30f691135dc 100644 (file)
--- a/mono/metadata/sgen-os-posix.c
+++ b/mono/metadata/sgen-os-posix.c
@@ -9,18 +9,7 @@
  * Copyright 2010 Novell, Inc (http://www.novell.com)
  * Copyright (C) 2012 Xamarin Inc
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License 2.0 as published by the Free Software Foundation;
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License 2.0 along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
 #include "config.h"
@@ -197,14 +186,13 @@ int
 sgen_thread_handshake (BOOL suspend)
 {
        int count, result;
-       SgenThreadInfo *info;
        int signum = suspend ? suspend_signal_num : restart_signal_num;
 
        MonoNativeThreadId me = mono_native_thread_id_get ();
 
        count = 0;
        mono_thread_info_current ()->client_info.suspend_done = TRUE;
-       FOREACH_THREAD_SAFE (info) {
+       FOREACH_THREAD (info) {
                if (mono_native_thread_id_equals (mono_thread_info_get_tid (info), me)) {
                        continue;
                }
@@ -219,7 +207,7 @@ sgen_thread_handshake (BOOL suspend)
                } else {
                        info->client_info.skip = 1;
                }
-       } END_FOREACH_THREAD_SAFE
+       } FOREACH_THREAD_END
 
        sgen_wait_for_suspend_ack (count);