ADDED src/natools-time_statistics-fine_timer_difference.adb Index: src/natools-time_statistics-fine_timer_difference.adb ================================================================== --- src/natools-time_statistics-fine_timer_difference.adb +++ src/natools-time_statistics-fine_timer_difference.adb @@ -0,0 +1,29 @@ +------------------------------------------------------------------------------ +-- Copyright (c) 2014, Natacha Porté -- +-- -- +-- Permission to use, copy, modify, and distribute this software for any -- +-- purpose with or without fee is hereby granted, provided that the above -- +-- copyright notice and this permission notice appear in all copies. -- +-- -- +-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -- +-- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -- +-- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -- +-- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -- +-- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -- +-- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -- +-- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- +------------------------------------------------------------------------------ + +------------------------------------------------------------------------------ +-- Natools.Time_Statistics.Fine_Timer_Difference provides a difference -- +-- function between real-time moments as a Duration value. -- +------------------------------------------------------------------------------ + +with Ada.Real_Time; + +function Natools.Time_Statistics.Fine_Timer_Difference + (Left, Right : Ada.Real_Time.Time) + return Duration is +begin + return Ada.Real_Time.To_Duration (Ada.Real_Time."-" (Left, Right)); +end Natools.Time_Statistics.Fine_Timer_Difference; ADDED src/natools-time_statistics-fine_timer_difference.ads Index: src/natools-time_statistics-fine_timer_difference.ads ================================================================== --- src/natools-time_statistics-fine_timer_difference.ads +++ src/natools-time_statistics-fine_timer_difference.ads @@ -0,0 +1,26 @@ +------------------------------------------------------------------------------ +-- Copyright (c) 2014, Natacha Porté -- +-- -- +-- Permission to use, copy, modify, and distribute this software for any -- +-- purpose with or without fee is hereby granted, provided that the above -- +-- copyright notice and this permission notice appear in all copies. -- +-- -- +-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -- +-- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -- +-- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -- +-- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -- +-- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -- +-- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -- +-- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- +------------------------------------------------------------------------------ + +------------------------------------------------------------------------------ +-- Natools.Time_Statistics.Fine_Timer_Difference provides a difference -- +-- function between real-time moments as a Duration value. -- +------------------------------------------------------------------------------ + +with Ada.Real_Time; + +function Natools.Time_Statistics.Fine_Timer_Difference + (Left, Right : Ada.Real_Time.Time) + return Duration; ADDED src/natools-time_statistics-fine_timers.ads Index: src/natools-time_statistics-fine_timers.ads ================================================================== --- src/natools-time_statistics-fine_timers.ads +++ src/natools-time_statistics-fine_timers.ads @@ -0,0 +1,25 @@ +------------------------------------------------------------------------------ +-- Copyright (c) 2014, Natacha Porté -- +-- -- +-- Permission to use, copy, modify, and distribute this software for any -- +-- purpose with or without fee is hereby granted, provided that the above -- +-- copyright notice and this permission notice appear in all copies. -- +-- -- +-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -- +-- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -- +-- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -- +-- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -- +-- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -- +-- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -- +-- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- +------------------------------------------------------------------------------ + +with Ada.Real_Time; +with Natools.Time_Statistics.Fine_Timer_Difference; +with Natools.Time_Statistics.Generic_Timers; + +package Natools.Time_Statistics.Fine_Timers + is new Natools.Time_Statistics.Generic_Timers + (Ada.Real_Time.Time, + Ada.Real_Time.Clock, + Natools.Time_Statistics.Fine_Timer_Difference); Index: tests/natools-time_statistics-tests.adb ================================================================== --- tests/natools-time_statistics-tests.adb +++ tests/natools-time_statistics-tests.adb @@ -13,18 +13,66 @@ -- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -- -- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- ------------------------------------------------------------------------------ with Natools.Time_Statistics.Coarse_Timers; +with Natools.Time_Statistics.Fine_Timers; +with Natools.Time_Statistics.Generic_Timers; package body Natools.Time_Statistics.Tests is + generic + with package Timers is new Generic_Timers (<>); + Total_Length : in Duration; + procedure Test_Timer (Test : in out NT.Test); + + + ------------------------------ + -- Local Helper Subprograms -- + ------------------------------ + procedure Check is new NT.Generic_Check (Natural, "=", Natural'Image, False); procedure Check is new NT.Generic_Check (Duration, "=", Duration'Image, False); + + + procedure Test_Timer (Test : in out NT.Test) is + Stats : aliased Summary; + begin + declare + Actual_Auto : Timers.Auto_Timer (Stats'Access); + Aborted_Auto : Timers.Auto_Timer (Stats'Access); + Manual : Timers.Manual_Timer (Stats'Access); + + pragma Unreferenced (Actual_Auto); + begin + Manual.Start; + Check (Test, 0, Stats.Sample_Count); + + delay Total_Length / 2; + + Aborted_Auto.Cancel; + Manual.Stop; + Check (Test, 1, Stats.Sample_Count, "Sample count"); + Manual.Start; + + delay Total_Length / 2; + + Manual.Cancel; + Check (Test, 1, Stats.Sample_Count, "Sample count"); + end; + + Check (Test, 2, Stats.Sample_Count, "Sample count"); + end Test_Timer; + + + procedure Coarse_Timer is new Test_Timer (Coarse_Timers, 0.2); + + procedure Fine_Timer is new Test_Timer (Fine_Timers, 0.2); + ------------------------- -- Complete Test Suite -- ------------------------- @@ -31,10 +79,11 @@ procedure All_Tests (Report : in out NT.Reporter'Class) is begin Summary_Accumulator (Report); Coarse_Timer (Report); + Fine_Timer (Report); end All_Tests; ----------------------- @@ -41,44 +90,25 @@ -- Inidividual Tests -- ----------------------- procedure Coarse_Timer (Report : in out NT.Reporter'Class) is Test : NT.Test := Report.Item ("Coarse timer standard use"); - Total_Length : constant Duration := 0.2; - begin - declare - Stats : aliased Summary; - begin - declare - Actual_Auto : Coarse_Timers.Auto_Timer (Stats'Access); - Aborted_Auto : Coarse_Timers.Auto_Timer (Stats'Access); - Manual : Coarse_Timers.Manual_Timer (Stats'Access); - - pragma Unreferenced (Actual_Auto); - begin - Manual.Start; - Check (Test, 0, Stats.Sample_Count); - - delay Total_Length / 2; - - Aborted_Auto.Cancel; - Manual.Stop; - Check (Test, 1, Stats.Sample_Count, "Sample count"); - Manual.Start; - - delay Total_Length / 2; - - Manual.Cancel; - Check (Test, 1, Stats.Sample_Count, "Sample count"); - end; - - Check (Test, 2, Stats.Sample_Count, "Sample count"); - end; + begin + Coarse_Timer (Test); exception when Error : others => Test.Report_Exception (Error); end Coarse_Timer; + + procedure Fine_Timer (Report : in out NT.Reporter'Class) is + Test : NT.Test := Report.Item ("Fine timer standard use"); + begin + Fine_Timer (Test); + exception + when Error : others => Test.Report_Exception (Error); + end Fine_Timer; + procedure Summary_Accumulator (Report : in out NT.Reporter'Class) is Test : NT.Test := Report.Item ("Summary accumulator"); begin declare Index: tests/natools-time_statistics-tests.ads ================================================================== --- tests/natools-time_statistics-tests.ads +++ tests/natools-time_statistics-tests.ads @@ -27,7 +27,8 @@ procedure All_Tests (Report : in out NT.Reporter'Class); procedure Summary_Accumulator (Report : in out NT.Reporter'Class); procedure Coarse_Timer (Report : in out NT.Reporter'Class); + procedure Fine_Timer (Report : in out NT.Reporter'Class); end Natools.Time_Statistics.Tests;