X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensors%2Fresource.c;h=80c85943c03f74957443da277e78259d19d8d12a;hb=4272becc415bc659ea14650793559dcf15372a8b;hp=fa525625cbe31707046168f8093fa336e7bbf057;hpb=289794ba2dcbe6234e25e5d00531b26baee342b7;p=matches%2FMCTX3420.git diff --git a/server/sensors/resource.c b/server/sensors/resource.c index fa52562..80c8594 100644 --- a/server/sensors/resource.c +++ b/server/sensors/resource.c @@ -17,10 +17,10 @@ bool Resource_Read(int id, double * value) switch (id) { case RESOURCE_CPU_USER: - *value = TIMEVAL_TO_DOUBLE(usage.ru_utime); + *value = usage.ru_utime.tv_sec + 1e-6*usage.ru_utime.tv_usec; break; case RESOURCE_CPU_SYS: - *value = TIMEVAL_TO_DOUBLE(usage.ru_stime); + *value = usage.ru_stime.tv_sec + 1e-6*usage.ru_stime.tv_usec; break; default: Log(LOGWARN, "Unknown id %d", id);