Switch GCSample to the canonical GCToOSInterface implementation (#8653)

dotnet · Dec 15, 2016 · 7e9bce2 · 7e9bce2
1 parent 0ba60ef
commit 7e9bce2
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 480 deletions.
diff --git a/src/gc/gcenv.unix.cpp b/src/gc/gcenv.unix.cpp
@@ -6,8 +6,6 @@
 #include "env/gcenv.base.h"
 #include "env/gcenv.os.h"
 
-#error This file should not be compiled!
-
 // Initialize the interface implementation
 // Return:
 //  true if it has succeeded, false if it has failed

diff --git a/src/gc/gcenv.windows.cpp b/src/gc/gcenv.windows.cpp
@@ -12,10 +12,6 @@
 #include "env/gcenv.base.h"
 #include "env/gcenv.os.h"
 
-#ifndef FEATURE_STANDALONE_GC
-#error This file should only be compiled for a standalone GC
-#endif // FEATURE_STANDALONE_GC
-
 GCSystemInfo g_SystemInfo;
 
 typedef BOOL (WINAPI *PGET_PROCESS_MEMORY_INFO)(HANDLE handle, PROCESS_MEMORY_COUNTERS* memCounters, uint32_t cb);
@@ -422,7 +418,7 @@ size_t GCToOSInterface::GetVirtualMemoryLimit()
     MEMORYSTATUSEX memStatus;
     if (::GlobalMemoryStatusEx(&memStatus))
     {
-        return memStatus.ullAvailVirtual;
+        return (size_t)memStatus.ullAvailVirtual;
     }
 
     return 0;

diff --git a/src/gc/sample/CMakeLists.txt b/src/gc/sample/CMakeLists.txt
@@ -22,11 +22,11 @@ set(SOURCES
 
 if(WIN32)
     list(APPEND SOURCES
-        gcenv.windows.cpp)
+        ../gcenv.windows.cpp)
     add_definitions(-DUNICODE=1)
 else()
     list(APPEND SOURCES
-        gcenv.unix.cpp)
+        ../gcenv.unix.cpp)
 endif()
 
 _add_executable(gcsample

diff --git a/src/gc/sample/GCSample.vcxproj b/src/gc/sample/GCSample.vcxproj
@@ -84,10 +84,12 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="gcenv.ee.cpp" />
-    <ClCompile Include="gcenv.windows.cpp" />
     <ClCompile Include="GCSample.cpp" />
     <ClCompile Include="..\gccommon.cpp" />
     <ClCompile Include="..\gceewks.cpp" />
+    <ClCompile Include="..\gcenv.windows.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="..\gcscan.cpp" />
     <ClCompile Include="..\gcwks.cpp" />
     <ClCompile Include="..\handletable.cpp" />
@@ -96,8 +98,7 @@
     <ClCompile Include="..\handletablescan.cpp" />
     <ClCompile Include="..\objecthandle.cpp" />
     <ClCompile Include="..\env\common.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/src/gc/sample/GCSample.vcxproj.filters b/src/gc/sample/GCSample.vcxproj.filters
@@ -59,7 +59,7 @@
     <ClCompile Include="gcenv.ee.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="gcenv.windows.cpp">
+    <ClCompile Include="..\gcenv.windows.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/src/gc/sample/gcenv.ee.cpp b/src/gc/sample/gcenv.ee.cpp
@@ -9,6 +9,12 @@
 #include "gcenv.h"
 #include "gc.h"
 
+MethodTable * g_pFreeObjectMethodTable;
+
+int32_t g_TrapReturningThreads;
+
+bool g_fFinalizerRunOnShutDown;
+
 EEConfig * g_pConfig;
 
 bool CLREventStatic::CreateManualEventNoThrow(bool bInitialState)

diff --git a/src/gc/sample/gcenv.unix.cpp b/src/gc/sample/gcenv.unix.cpp