Mercurial > octave
diff src/DLD-FUNCTIONS/getrusage.cc @ 10240:fa7b5751730c
use gnulib time, sys_time, and sys_times modules
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 02 Feb 2010 00:53:31 -0500 |
parents | 0522a65bcd56 |
children | 89f4d7e294cc |
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/getrusage.cc Tue Feb 02 00:51:52 2010 -0500 +++ b/src/DLD-FUNCTIONS/getrusage.cc Tue Feb 02 00:53:31 2010 -0500 @@ -25,28 +25,24 @@ #include <config.h> #endif -#include "systime.h" - +#include <sys/time.h> +#include <sys/times.h> #include <sys/types.h> #ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> #endif -#if defined (__WIN32__) -#include <windows.h> -#ifdef min -#undef min -#undef max -#endif -#endif - -#if defined (HAVE_TIMES) && defined (HAVE_SYS_TIMES_H) - #if defined (HAVE_SYS_PARAM_H) #include <sys/param.h> #endif -#include <sys/times.h> + +#include "defun-dld.h" +#include "oct-map.h" +#include "sysdep.h" +#include "ov.h" +#include "oct-obj.h" +#include "utils.h" #if !defined (HZ) #if defined (CLK_TCK) @@ -58,15 +54,6 @@ #endif #endif -#endif - -#include "defun-dld.h" -#include "oct-map.h" -#include "sysdep.h" -#include "ov.h" -#include "oct-obj.h" -#include "utils.h" - #ifndef RUSAGE_SELF #define RUSAGE_SELF 0 #endif @@ -172,7 +159,6 @@ #endif #else -#if defined (HAVE_TIMES) && defined (HAVE_SYS_TIMES_H) struct tms t; @@ -198,32 +184,6 @@ tv_tmp.assign ("usec", static_cast<double> (fraction * 1e6 / HZ)); m.assign ("stime", octave_value (tv_tmp)); -#elif defined (__WIN32__) - HANDLE hProcess = GetCurrentProcess (); - FILETIME ftCreation, ftExit, ftUser, ftKernel; - GetProcessTimes (hProcess, &ftCreation, &ftExit, &ftKernel, &ftUser); - - int64_t itmp = *(reinterpret_cast<int64_t *> (&ftUser)); - tv_tmp.assign ("sec", static_cast<double> (itmp / 10000000U)); - tv_tmp.assign ("usec", static_cast<double> (itmp % 10000000U) / 10.); - m.assign ("utime", octave_value (tv_tmp)); - - itmp = *(reinterpret_cast<int64_t *> (&ftKernel)); - tv_tmp.assign ("sec", static_cast<double> (itmp / 10000000U)); - tv_tmp.assign ("usec", static_cast<double> (itmp % 10000000U) / 10.); - m.assign ("stime", octave_value (tv_tmp)); -#else - - tv_tmp.assign ("sec", 0); - tv_tmp.assign ("usec", 0); - m.assign ("utime", octave_value (tv_tmp)); - - tv_tmp.assign ("sec", 0); - tv_tmp.assign ("usec", 0); - m.assign ("stime", octave_value (tv_tmp)); - -#endif - double tmp = lo_ieee_nan_value (); m.assign ("maxrss", tmp);