From: Gabriele 'Matrix' Gristina <gm4tr1x@users.noreply.github.com>
Date: Wed, 10 Feb 2016 21:31:43 +0000 (+0100)
Subject: Revert "Use per-device timer resolution in total_time calculations"
X-Git-Tag: v3.00-beta~303^2
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=20ee62e196932d0364adc59ebc48f1cb293c2470;p=hashcat.git

Revert "Use per-device timer resolution in total_time calculations"
---

diff --git a/include/types.h b/include/types.h
index 5f93826..5ce1d04 100644
--- a/include/types.h
+++ b/include/types.h
@@ -876,7 +876,6 @@ struct __hc_device_param
   u64     device_maxmem_alloc;
   u64     device_global_mem;
   u32     device_maxclock_frequency;
-  u64     device_timer_resolution;
 
   uint    vector_width;
 
diff --git a/src/oclHashcat.c b/src/oclHashcat.c
index 3b0190d..3446559 100644
--- a/src/oclHashcat.c
+++ b/src/oclHashcat.c
@@ -797,7 +797,7 @@ void status_display_automat ()
     hc_clGetEventProfilingInfo (data.ocl, device_param->event, CL_PROFILING_COMMAND_START, sizeof (time_start), &time_start, NULL);
     hc_clGetEventProfilingInfo (data.ocl, device_param->event, CL_PROFILING_COMMAND_END,   sizeof (time_end),   &time_end,   NULL);
 
-    const double total_time = ((double)(time_end - time_start) * (double)(device_param->device_timer_resolution)) / 1000000.0;
+    const double total_time = (time_end - time_start) / 1000000.0;
 
     fprintf (out, "%f\t", total_time);
   }
@@ -12531,14 +12531,6 @@ int main (int argc, char **argv)
 
         device_param->device_maxclock_frequency = device_maxclock_frequency;
 
-        // device_timer_resolution
-
-        cl_ulong device_timer_resolution;
-
-        hc_clGetDeviceInfo (data.ocl, device_param->device, CL_DEVICE_PROFILING_TIMER_RESOLUTION, sizeof (device_timer_resolution), &device_timer_resolution, NULL);
-
-        device_param->device_timer_resolution = device_timer_resolution;
-
         // skipped
 
         const u32 skipped1 = ((devices_filter      & (1 << device_id)) == 0);