diff options
Diffstat (limited to 'vsprojects')
-rw-r--r-- | vsprojects/buildtests_c.sln | 108 | ||||
-rw-r--r-- | vsprojects/vcxproj/grpc/grpc.vcxproj | 14 | ||||
-rw-r--r-- | vsprojects/vcxproj/grpc/grpc.vcxproj.filters | 30 | ||||
-rw-r--r-- | vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj | 14 | ||||
-rw-r--r-- | vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters | 30 | ||||
-rw-r--r-- | vsprojects/vcxproj/test/timer_heap_test/timer_heap_test.vcxproj (renamed from vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj) | 8 | ||||
-rw-r--r-- | vsprojects/vcxproj/test/timer_heap_test/timer_heap_test.vcxproj.filters (renamed from vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj.filters) | 8 | ||||
-rw-r--r-- | vsprojects/vcxproj/test/timer_list_test/timer_list_test.vcxproj (renamed from vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj) | 8 | ||||
-rw-r--r-- | vsprojects/vcxproj/test/timer_list_test/timer_list_test.vcxproj.filters (renamed from vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj.filters) | 8 |
9 files changed, 114 insertions, 114 deletions
diff --git a/vsprojects/buildtests_c.sln b/vsprojects/buildtests_c.sln index 24b51d460d..141fe8a16d 100644 --- a/vsprojects/buildtests_c.sln +++ b/vsprojects/buildtests_c.sln @@ -575,28 +575,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bad_client_test", "vcxproj\ {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alarm_heap_test", "vcxproj\test\alarm_heap_test\alarm_heap_test.vcxproj", "{B1746F03-DFBD-83E6-9886-2BB0F9D70B57}" - ProjectSection(myProperties) = preProject - lib = "False" - EndProjectSection - ProjectSection(ProjectDependencies) = postProject - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alarm_list_test", "vcxproj\test\alarm_list_test\alarm_list_test.vcxproj", "{E6F27D86-476F-CB60-AC56-ED3A210C0E96}" - ProjectSection(myProperties) = preProject - lib = "False" - EndProjectSection - ProjectSection(ProjectDependencies) = postProject - {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} - {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} - {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037} - {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alpn_test", "vcxproj\test\alpn_test\alpn_test.vcxproj", "{5BAAE7EA-A972-DD80-F190-29B9E3110BB3}" ProjectSection(myProperties) = preProject lib = "False" @@ -1204,6 +1182,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timeout_encoding_test", "vc {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timer_heap_test", "vcxproj\test\timer_heap_test\timer_heap_test.vcxproj", "{A2110C60-E75A-F76E-205E-1836F86C4D53}" + ProjectSection(myProperties) = preProject + lib = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} + {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} + {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037} + {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timer_list_test", "vcxproj\test\timer_list_test\timer_list_test.vcxproj", "{C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}" + ProjectSection(myProperties) = preProject + lib = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} = {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B} + {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} + {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037} + {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timers_test", "vcxproj\test\timers_test\timers_test.vcxproj", "{FFE98236-3F4D-2CBA-29FB-D0A7467D2FA5}" ProjectSection(myProperties) = preProject lib = "False" @@ -8765,38 +8765,6 @@ Global {BA67B418-B699-E41A-9CC4-0279C49481A5}.Release-DLL|Win32.Build.0 = Release|Win32 {BA67B418-B699-E41A-9CC4-0279C49481A5}.Release-DLL|x64.ActiveCfg = Release|x64 {BA67B418-B699-E41A-9CC4-0279C49481A5}.Release-DLL|x64.Build.0 = Release|x64 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Debug|Win32.ActiveCfg = Debug|Win32 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Debug|x64.ActiveCfg = Debug|x64 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Release|Win32.ActiveCfg = Release|Win32 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Release|x64.ActiveCfg = Release|x64 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Debug|Win32.Build.0 = Debug|Win32 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Debug|x64.Build.0 = Debug|x64 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Release|Win32.Build.0 = Release|Win32 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Release|x64.Build.0 = Release|x64 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Debug-DLL|Win32.Build.0 = Debug|Win32 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Debug-DLL|x64.ActiveCfg = Debug|x64 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Debug-DLL|x64.Build.0 = Debug|x64 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Release-DLL|Win32.ActiveCfg = Release|Win32 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Release-DLL|Win32.Build.0 = Release|Win32 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Release-DLL|x64.ActiveCfg = Release|x64 - {B1746F03-DFBD-83E6-9886-2BB0F9D70B57}.Release-DLL|x64.Build.0 = Release|x64 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Debug|Win32.ActiveCfg = Debug|Win32 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Debug|x64.ActiveCfg = Debug|x64 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Release|Win32.ActiveCfg = Release|Win32 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Release|x64.ActiveCfg = Release|x64 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Debug|Win32.Build.0 = Debug|Win32 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Debug|x64.Build.0 = Debug|x64 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Release|Win32.Build.0 = Release|Win32 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Release|x64.Build.0 = Release|x64 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Debug-DLL|Win32.Build.0 = Debug|Win32 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Debug-DLL|x64.ActiveCfg = Debug|x64 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Debug-DLL|x64.Build.0 = Debug|x64 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Release-DLL|Win32.ActiveCfg = Release|Win32 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Release-DLL|Win32.Build.0 = Release|Win32 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Release-DLL|x64.ActiveCfg = Release|x64 - {E6F27D86-476F-CB60-AC56-ED3A210C0E96}.Release-DLL|x64.Build.0 = Release|x64 {5BAAE7EA-A972-DD80-F190-29B9E3110BB3}.Debug|Win32.ActiveCfg = Debug|Win32 {5BAAE7EA-A972-DD80-F190-29B9E3110BB3}.Debug|x64.ActiveCfg = Debug|x64 {5BAAE7EA-A972-DD80-F190-29B9E3110BB3}.Release|Win32.ActiveCfg = Release|Win32 @@ -9741,6 +9709,38 @@ Global {EA073C36-A527-F749-AD4A-243A38B9BFF5}.Release-DLL|Win32.Build.0 = Release|Win32 {EA073C36-A527-F749-AD4A-243A38B9BFF5}.Release-DLL|x64.ActiveCfg = Release|x64 {EA073C36-A527-F749-AD4A-243A38B9BFF5}.Release-DLL|x64.Build.0 = Release|x64 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Debug|Win32.ActiveCfg = Debug|Win32 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Debug|x64.ActiveCfg = Debug|x64 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Release|Win32.ActiveCfg = Release|Win32 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Release|x64.ActiveCfg = Release|x64 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Debug|Win32.Build.0 = Debug|Win32 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Debug|x64.Build.0 = Debug|x64 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Release|Win32.Build.0 = Release|Win32 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Release|x64.Build.0 = Release|x64 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Debug-DLL|Win32.Build.0 = Debug|Win32 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Debug-DLL|x64.ActiveCfg = Debug|x64 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Debug-DLL|x64.Build.0 = Debug|x64 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Release-DLL|Win32.ActiveCfg = Release|Win32 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Release-DLL|Win32.Build.0 = Release|Win32 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Release-DLL|x64.ActiveCfg = Release|x64 + {A2110C60-E75A-F76E-205E-1836F86C4D53}.Release-DLL|x64.Build.0 = Release|x64 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Debug|Win32.ActiveCfg = Debug|Win32 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Debug|x64.ActiveCfg = Debug|x64 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Release|Win32.ActiveCfg = Release|Win32 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Release|x64.ActiveCfg = Release|x64 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Debug|Win32.Build.0 = Debug|Win32 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Debug|x64.Build.0 = Debug|x64 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Release|Win32.Build.0 = Release|Win32 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Release|x64.Build.0 = Release|x64 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Debug-DLL|Win32.ActiveCfg = Debug|Win32 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Debug-DLL|Win32.Build.0 = Debug|Win32 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Debug-DLL|x64.ActiveCfg = Debug|x64 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Debug-DLL|x64.Build.0 = Debug|x64 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Release-DLL|Win32.ActiveCfg = Release|Win32 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Release-DLL|Win32.Build.0 = Release|Win32 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Release-DLL|x64.ActiveCfg = Release|x64 + {C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}.Release-DLL|x64.Build.0 = Release|x64 {FFE98236-3F4D-2CBA-29FB-D0A7467D2FA5}.Debug|Win32.ActiveCfg = Debug|Win32 {FFE98236-3F4D-2CBA-29FB-D0A7467D2FA5}.Debug|x64.ActiveCfg = Debug|x64 {FFE98236-3F4D-2CBA-29FB-D0A7467D2FA5}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index 23bcd0c443..8d7e2012ff 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -298,9 +298,6 @@ <ClInclude Include="..\..\..\src\core\httpcli\format_request.h" /> <ClInclude Include="..\..\..\src\core\httpcli\httpcli.h" /> <ClInclude Include="..\..\..\src\core\httpcli\parser.h" /> - <ClInclude Include="..\..\..\src\core\iomgr\alarm.h" /> - <ClInclude Include="..\..\..\src\core\iomgr\alarm_heap.h" /> - <ClInclude Include="..\..\..\src\core\iomgr\alarm_internal.h" /> <ClInclude Include="..\..\..\src\core\iomgr\closure.h" /> <ClInclude Include="..\..\..\src\core\iomgr\endpoint.h" /> <ClInclude Include="..\..\..\src\core\iomgr\endpoint_pair.h" /> @@ -328,6 +325,9 @@ <ClInclude Include="..\..\..\src\core\iomgr\tcp_server.h" /> <ClInclude Include="..\..\..\src\core\iomgr\tcp_windows.h" /> <ClInclude Include="..\..\..\src\core\iomgr\time_averaged_stats.h" /> + <ClInclude Include="..\..\..\src\core\iomgr\timer.h" /> + <ClInclude Include="..\..\..\src\core\iomgr\timer_heap.h" /> + <ClInclude Include="..\..\..\src\core\iomgr\timer_internal.h" /> <ClInclude Include="..\..\..\src\core\iomgr\udp_server.h" /> <ClInclude Include="..\..\..\src\core\iomgr\wakeup_fd_pipe.h" /> <ClInclude Include="..\..\..\src\core\iomgr\wakeup_fd_posix.h" /> @@ -489,10 +489,6 @@ </ClCompile> <ClCompile Include="..\..\..\src\core\httpcli\parser.c"> </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\alarm.c"> - </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\alarm_heap.c"> - </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\closure.c"> </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\endpoint.c"> @@ -553,6 +549,10 @@ </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\time_averaged_stats.c"> </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\timer.c"> + </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\timer_heap.c"> + </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\udp_server.c"> </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\wakeup_fd_eventfd.c"> diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index 1cfccf0e19..315af27b28 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -163,12 +163,6 @@ <ClCompile Include="..\..\..\src\core\httpcli\parser.c"> <Filter>src\core\httpcli</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\alarm.c"> - <Filter>src\core\iomgr</Filter> - </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\alarm_heap.c"> - <Filter>src\core\iomgr</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\closure.c"> <Filter>src\core\iomgr</Filter> </ClCompile> @@ -259,6 +253,12 @@ <ClCompile Include="..\..\..\src\core\iomgr\time_averaged_stats.c"> <Filter>src\core\iomgr</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\timer.c"> + <Filter>src\core\iomgr</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\timer_heap.c"> + <Filter>src\core\iomgr</Filter> + </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\udp_server.c"> <Filter>src\core\iomgr</Filter> </ClCompile> @@ -599,15 +599,6 @@ <ClInclude Include="..\..\..\src\core\httpcli\parser.h"> <Filter>src\core\httpcli</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\core\iomgr\alarm.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\core\iomgr\alarm_heap.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\core\iomgr\alarm_internal.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\core\iomgr\closure.h"> <Filter>src\core\iomgr</Filter> </ClInclude> @@ -689,6 +680,15 @@ <ClInclude Include="..\..\..\src\core\iomgr\time_averaged_stats.h"> <Filter>src\core\iomgr</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\core\iomgr\timer.h"> + <Filter>src\core\iomgr</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\core\iomgr\timer_heap.h"> + <Filter>src\core\iomgr</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\core\iomgr\timer_internal.h"> + <Filter>src\core\iomgr</Filter> + </ClInclude> <ClInclude Include="..\..\..\src\core\iomgr\udp_server.h"> <Filter>src\core\iomgr</Filter> </ClInclude> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index e308a03fda..08d18f4798 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -277,9 +277,6 @@ <ClInclude Include="..\..\..\src\core\httpcli\format_request.h" /> <ClInclude Include="..\..\..\src\core\httpcli\httpcli.h" /> <ClInclude Include="..\..\..\src\core\httpcli\parser.h" /> - <ClInclude Include="..\..\..\src\core\iomgr\alarm.h" /> - <ClInclude Include="..\..\..\src\core\iomgr\alarm_heap.h" /> - <ClInclude Include="..\..\..\src\core\iomgr\alarm_internal.h" /> <ClInclude Include="..\..\..\src\core\iomgr\closure.h" /> <ClInclude Include="..\..\..\src\core\iomgr\endpoint.h" /> <ClInclude Include="..\..\..\src\core\iomgr\endpoint_pair.h" /> @@ -307,6 +304,9 @@ <ClInclude Include="..\..\..\src\core\iomgr\tcp_server.h" /> <ClInclude Include="..\..\..\src\core\iomgr\tcp_windows.h" /> <ClInclude Include="..\..\..\src\core\iomgr\time_averaged_stats.h" /> + <ClInclude Include="..\..\..\src\core\iomgr\timer.h" /> + <ClInclude Include="..\..\..\src\core\iomgr\timer_heap.h" /> + <ClInclude Include="..\..\..\src\core\iomgr\timer_internal.h" /> <ClInclude Include="..\..\..\src\core\iomgr\udp_server.h" /> <ClInclude Include="..\..\..\src\core\iomgr\wakeup_fd_pipe.h" /> <ClInclude Include="..\..\..\src\core\iomgr\wakeup_fd_posix.h" /> @@ -428,10 +428,6 @@ </ClCompile> <ClCompile Include="..\..\..\src\core\httpcli\parser.c"> </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\alarm.c"> - </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\alarm_heap.c"> - </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\closure.c"> </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\endpoint.c"> @@ -492,6 +488,10 @@ </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\time_averaged_stats.c"> </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\timer.c"> + </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\timer_heap.c"> + </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\udp_server.c"> </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\wakeup_fd_eventfd.c"> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 370d1f6fb2..daec33d233 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -103,12 +103,6 @@ <ClCompile Include="..\..\..\src\core\httpcli\parser.c"> <Filter>src\core\httpcli</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\alarm.c"> - <Filter>src\core\iomgr</Filter> - </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\alarm_heap.c"> - <Filter>src\core\iomgr</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\closure.c"> <Filter>src\core\iomgr</Filter> </ClCompile> @@ -199,6 +193,12 @@ <ClCompile Include="..\..\..\src\core\iomgr\time_averaged_stats.c"> <Filter>src\core\iomgr</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\timer.c"> + <Filter>src\core\iomgr</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\timer_heap.c"> + <Filter>src\core\iomgr</Filter> + </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\udp_server.c"> <Filter>src\core\iomgr</Filter> </ClCompile> @@ -497,15 +497,6 @@ <ClInclude Include="..\..\..\src\core\httpcli\parser.h"> <Filter>src\core\httpcli</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\core\iomgr\alarm.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\core\iomgr\alarm_heap.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\core\iomgr\alarm_internal.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\core\iomgr\closure.h"> <Filter>src\core\iomgr</Filter> </ClInclude> @@ -587,6 +578,15 @@ <ClInclude Include="..\..\..\src\core\iomgr\time_averaged_stats.h"> <Filter>src\core\iomgr</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\core\iomgr\timer.h"> + <Filter>src\core\iomgr</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\core\iomgr\timer_heap.h"> + <Filter>src\core\iomgr</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\core\iomgr\timer_internal.h"> + <Filter>src\core\iomgr</Filter> + </ClInclude> <ClInclude Include="..\..\..\src\core\iomgr\udp_server.h"> <Filter>src\core\iomgr</Filter> </ClInclude> diff --git a/vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj b/vsprojects/vcxproj/test/timer_heap_test/timer_heap_test.vcxproj index f3c0cfd3c2..8b84a528a0 100644 --- a/vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj +++ b/vsprojects/vcxproj/test/timer_heap_test/timer_heap_test.vcxproj @@ -20,7 +20,7 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{B1746F03-DFBD-83E6-9886-2BB0F9D70B57}</ProjectGuid> + <ProjectGuid>{A2110C60-E75A-F76E-205E-1836F86C4D53}</ProjectGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration"> @@ -55,13 +55,13 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)'=='Debug'"> - <TargetName>alarm_heap_test</TargetName> + <TargetName>timer_heap_test</TargetName> <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> - <TargetName>alarm_heap_test</TargetName> + <TargetName>timer_heap_test</TargetName> <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> @@ -143,7 +143,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\..\test\core\iomgr\alarm_heap_test.c"> + <ClCompile Include="..\..\..\..\test\core\iomgr\timer_heap_test.c"> </ClCompile> </ItemGroup> <ItemGroup> diff --git a/vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj.filters b/vsprojects/vcxproj/test/timer_heap_test/timer_heap_test.vcxproj.filters index 74604fa744..6a22addffa 100644 --- a/vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj.filters +++ b/vsprojects/vcxproj/test/timer_heap_test/timer_heap_test.vcxproj.filters @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="..\..\..\..\test\core\iomgr\alarm_heap_test.c"> + <ClCompile Include="..\..\..\..\test\core\iomgr\timer_heap_test.c"> <Filter>test\core\iomgr</Filter> </ClCompile> </ItemGroup> <ItemGroup> <Filter Include="test"> - <UniqueIdentifier>{39c80086-e80b-b26f-6db8-7057b2bd93b3}</UniqueIdentifier> + <UniqueIdentifier>{c7789d63-cb31-a5ba-a830-4a6223e5561c}</UniqueIdentifier> </Filter> <Filter Include="test\core"> - <UniqueIdentifier>{c551e414-1de0-a7c1-a69b-3ba69c55e5d4}</UniqueIdentifier> + <UniqueIdentifier>{320a9cb8-0041-acb0-79d5-6cff8f1fdeba}</UniqueIdentifier> </Filter> <Filter Include="test\core\iomgr"> - <UniqueIdentifier>{1330dfd2-f26b-7973-17c9-97c8809e9b74}</UniqueIdentifier> + <UniqueIdentifier>{df867a7c-861e-6482-a5b2-35a8ca345a6a}</UniqueIdentifier> </Filter> </ItemGroup> </Project> diff --git a/vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj b/vsprojects/vcxproj/test/timer_list_test/timer_list_test.vcxproj index cce21d4c71..4f00b62803 100644 --- a/vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj +++ b/vsprojects/vcxproj/test/timer_list_test/timer_list_test.vcxproj @@ -20,7 +20,7 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{E6F27D86-476F-CB60-AC56-ED3A210C0E96}</ProjectGuid> + <ProjectGuid>{C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}</ProjectGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration"> @@ -55,13 +55,13 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)'=='Debug'"> - <TargetName>alarm_list_test</TargetName> + <TargetName>timer_list_test</TargetName> <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> - <TargetName>alarm_list_test</TargetName> + <TargetName>timer_list_test</TargetName> <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> @@ -143,7 +143,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\..\test\core\iomgr\alarm_list_test.c"> + <ClCompile Include="..\..\..\..\test\core\iomgr\timer_list_test.c"> </ClCompile> </ItemGroup> <ItemGroup> diff --git a/vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj.filters b/vsprojects/vcxproj/test/timer_list_test/timer_list_test.vcxproj.filters index cc4cbf7c83..8973e5a9bd 100644 --- a/vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj.filters +++ b/vsprojects/vcxproj/test/timer_list_test/timer_list_test.vcxproj.filters @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="..\..\..\..\test\core\iomgr\alarm_list_test.c"> + <ClCompile Include="..\..\..\..\test\core\iomgr\timer_list_test.c"> <Filter>test\core\iomgr</Filter> </ClCompile> </ItemGroup> <ItemGroup> <Filter Include="test"> - <UniqueIdentifier>{5599c85d-915e-7ef2-1b2c-061b82987e1d}</UniqueIdentifier> + <UniqueIdentifier>{ce536631-1d52-1c3c-8eed-efe2f4bae6ed}</UniqueIdentifier> </Filter> <Filter Include="test\core"> - <UniqueIdentifier>{46744e86-73cb-67b0-cddb-72655b2ded40}</UniqueIdentifier> + <UniqueIdentifier>{b877a050-4172-3910-dede-77628e0ef150}</UniqueIdentifier> </Filter> <Filter Include="test\core\iomgr"> - <UniqueIdentifier>{26291b48-8dd4-079f-bbfa-a07190367bd7}</UniqueIdentifier> + <UniqueIdentifier>{087dd179-d26d-8e56-707b-6059afbfd70a}</UniqueIdentifier> </Filter> </ItemGroup> </Project> |