Moved getcputime() into statistics.*

diff --git a/src/toolbox/logging.c b/src/toolbox/logging.c
index fb4bdf93af5f6d74f3459b617d6f6f23cb494ac8..2318e6fb490d836f5fb8f260ef2b7e0e2dc165c8 100644 (file)
--- a/src/toolbox/logging.c
+++ b/src/toolbox/logging.c
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: logging.c 1107 2004-05-28 12:18:44Z twisti $
+   $Id: logging.c 1245 2004-06-30 20:15:25Z twisti $
 
 */
 
@@ -36,8 +36,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/time.h>
-#include <sys/resource.h>
 
 #include "global.h"
 #include "tables.h"
@@ -251,25 +249,6 @@ void panic(char *txt)
 }
 
 
-/********************** Function: getcputime ********************************
-
-       Returns the used CPU time in microseconds
-       
-****************************************************************************/
-
-s8 getcputime()
-{
-       struct rusage ru;
-       int sec, usec;
-
-       getrusage(RUSAGE_SELF, &ru);
-       sec = ru.ru_utime.tv_sec + ru.ru_stime.tv_sec;
-       usec = ru.ru_utime.tv_usec + ru.ru_stime.tv_usec;
-
-       return sec * 1000000 + usec;
-}
-
-
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where

diff --git a/src/toolbox/logging.h b/src/toolbox/logging.h
index b5fffacc76fa425088530a0c5ea883d95af6f1f5..bde9f78b9f1fbb8f90719ffeeec554e596b49a06 100644 (file)
--- a/src/toolbox/logging.h
+++ b/src/toolbox/logging.h
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: logging.h 1086 2004-05-26 21:22:05Z twisti $
+   $Id: logging.h 1245 2004-06-30 20:15:25Z twisti $
 
 */
 
@@ -65,8 +65,6 @@ void panic(char *txt);
 
 FILE *get_logfile(); /* return the current logfile */
 
-s8 getcputime();
-
 #endif /* _LOGGING_H */
 
 

diff --git a/toolbox/logging.c b/toolbox/logging.c
index fb4bdf93af5f6d74f3459b617d6f6f23cb494ac8..2318e6fb490d836f5fb8f260ef2b7e0e2dc165c8 100644 (file)
--- a/toolbox/logging.c
+++ b/toolbox/logging.c
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: logging.c 1107 2004-05-28 12:18:44Z twisti $
+   $Id: logging.c 1245 2004-06-30 20:15:25Z twisti $
 
 */
 
@@ -36,8 +36,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/time.h>
-#include <sys/resource.h>
 
 #include "global.h"
 #include "tables.h"
@@ -251,25 +249,6 @@ void panic(char *txt)
 }
 
 
-/********************** Function: getcputime ********************************
-
-       Returns the used CPU time in microseconds
-       
-****************************************************************************/
-
-s8 getcputime()
-{
-       struct rusage ru;
-       int sec, usec;
-
-       getrusage(RUSAGE_SELF, &ru);
-       sec = ru.ru_utime.tv_sec + ru.ru_stime.tv_sec;
-       usec = ru.ru_utime.tv_usec + ru.ru_stime.tv_usec;
-
-       return sec * 1000000 + usec;
-}
-
-
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where

diff --git a/toolbox/logging.h b/toolbox/logging.h
index b5fffacc76fa425088530a0c5ea883d95af6f1f5..bde9f78b9f1fbb8f90719ffeeec554e596b49a06 100644 (file)
--- a/toolbox/logging.h
+++ b/toolbox/logging.h
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: logging.h 1086 2004-05-26 21:22:05Z twisti $
+   $Id: logging.h 1245 2004-06-30 20:15:25Z twisti $
 
 */
 
@@ -65,8 +65,6 @@ void panic(char *txt);
 
 FILE *get_logfile(); /* return the current logfile */
 
-s8 getcputime();
-
 #endif /* _LOGGING_H */