mono-threads.c - Use the environment variable (if set) to determine the abort time

libmonoutils.vcxproj - Add new logging source code files to the project

diff --git a/mono/utils/mono-threads.c b/mono/utils/mono-threads.c
index 7f49e0ffd9cf293d0c3e353b6bad7e91eee2dd59..3d479a07fe12a502ff5563410fd79ea5e83a1f31 100644 (file)
--- a/mono/utils/mono-threads.c
+++ b/mono/utils/mono-threads.c
@@ -231,14 +231,14 @@ mono_threads_wait_pending_operations (void)
                for (i = 0; i < pending_suspends; ++i) {
                        THREADS_SUSPEND_DEBUG ("[INITIATOR-WAIT-WAITING]\n");
                        InterlockedIncrement (&waits_done);
-                       if (!mono_os_sem_timedwait (&suspend_semaphore, SLEEP_DURATION_BEFORE_ABORT, MONO_SEM_FLAGS_NONE))
+                       if (!mono_os_sem_timedwait (&suspend_semaphore, sleepAbortDuration, MONO_SEM_FLAGS_NONE))
                                continue;
                        mono_stopwatch_stop (&suspension_time);
 
                        dump_threads ();
 
                        MOSTLY_ASYNC_SAFE_PRINTF ("WAITING for %d threads, got %d suspended\n", (int)pending_suspends, i);
-                       g_error ("suspend_thread suspend took %d ms, which is more than the allowed %d ms", (int)mono_stopwatch_elapsed_ms (&suspension_time), SLEEP_DURATION_BEFORE_ABORT);
+                       g_error ("suspend_thread suspend took %d ms, which is more than the allowed %d ms", (int)mono_stopwatch_elapsed_ms (&suspension_time), sleepAbortDuration);
                }
                mono_stopwatch_stop (&suspension_time);
                THREADS_SUSPEND_DEBUG ("Suspending %d threads took %d ms.\n", (int)pending_suspends, (int)mono_stopwatch_elapsed_ms (&suspension_time));

diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj
index 5daad9472621c95d4b94c98809d6f0ab2a74ff50..906e7815a2b9327f373364ea2d86c747102d1369 100644 (file)
--- a/msvc/libmonoutils.vcxproj
+++ b/msvc/libmonoutils.vcxproj
@@ -110,6 +110,9 @@
     <ClInclude Include="..\mono\utils\mono-dl.h" />\r
     <ClInclude Include="..\mono\utils\mono-error-internals.h" />\r
     <ClInclude Include="..\mono\utils\mono-error.h" />\r
+    <ClInclude Include="..\mono\utils\mono-log-windows.c" />\r
+    <ClInclude Include="..\mono\utils\mono-log-common.c" />\r
+    <ClInclude Include="..\mono\utils\mono-log-posix.c" />\r
     <ClInclude Include="..\mono\utils\mono-internal-hash.h" />\r
     <ClInclude Include="..\mono\utils\mono-io-portability.h" />\r
     <ClInclude Include="..\mono\utils\mono-linked-list-set.h" />\r