diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2016-05-25 21:39:21 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2016-05-25 21:59:43 +0200 |
| commit | 69497d35c0e35a1f9b789d016e9eb4946b8f0fab (patch) | |
| tree | 378ee53e9738d0532396345cbd90488a254de3a7 | |
| parent | d67cd2220a291b54718f731052be4a9397f67077 (diff) | |
opj_decompress: use clock_gettime() instead of getrusage() so as to get the time spent, and not to the total CPU time
| -rw-r--r-- | src/bin/jp2/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/bin/jp2/opj_decompress.c | 24 |
2 files changed, 18 insertions, 9 deletions
diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt index dc013c21..ad7bce71 100644 --- a/src/bin/jp2/CMakeLists.txt +++ b/src/bin/jp2/CMakeLists.txt @@ -57,6 +57,9 @@ foreach(exe opj_decompress opj_compress opj_dump) # On unix you need to link to the math library: if(UNIX) target_link_libraries(${exe} m) + IF("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") + target_link_libraries(${exe} rt) + endif() endif() # Install exe install(TARGETS ${exe} diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c index 0e02c56b..57fe554b 100644 --- a/src/bin/jp2/opj_decompress.c +++ b/src/bin/jp2/opj_decompress.c @@ -43,6 +43,7 @@ #include <string.h> #include <stdlib.h> #include <math.h> +#include <time.h> #ifdef _WIN32 #include "windirent.h" @@ -907,17 +908,22 @@ OPJ_FLOAT64 opj_clock(void) { /* t is the high resolution performance counter (see MSDN) */ QueryPerformanceCounter ( & t ) ; return freq.QuadPart ? (t.QuadPart / (OPJ_FLOAT64)freq.QuadPart) : 0; +#elif defined(__linux) + struct timespec ts; + clock_gettime(CLOCK_REALTIME, &ts); + return( ts.tv_sec + ts.tv_nsec * 1e-9 ); #else - /* Unix or Linux: use resource usage */ - struct rusage t; - OPJ_FLOAT64 procTime; - /* (1) Get the rusage data structure at this moment (man getrusage) */ - getrusage(0,&t); - /* (2) What is the elapsed time ? - CPU time = User time + System time */ + /* Unix : use resource usage */ + /* FIXME: this counts the total CPU time, instead of the user perceived time */ + struct rusage t; + OPJ_FLOAT64 procTime; + /* (1) Get the rusage data structure at this moment (man getrusage) */ + getrusage(0,&t); + /* (2) What is the elapsed time ? - CPU time = User time + System time */ /* (2a) Get the seconds */ - procTime = (OPJ_FLOAT64)(t.ru_utime.tv_sec + t.ru_stime.tv_sec); - /* (2b) More precisely! Get the microseconds part ! */ - return ( procTime + (OPJ_FLOAT64)(t.ru_utime.tv_usec + t.ru_stime.tv_usec) * 1e-6 ) ; + procTime = (OPJ_FLOAT64)(t.ru_utime.tv_sec + t.ru_stime.tv_sec); + /* (2b) More precisely! Get the microseconds part ! */ + return ( procTime + (OPJ_FLOAT64)(t.ru_utime.tv_usec + t.ru_stime.tv_usec) * 1e-6 ) ; #endif } |