* src/vm/vm.cpp (usage): Made function static. Also removed legacy C functions.

[cacao.git] / src / vm / rt-timing.h

diff --git a/src/vm/rt-timing.h b/src/vm/rt-timing.h
index 432f656ee8b103d8edd2946bebcd214798438f62..0c18ac0a5f0d6098aea182cb6c58c7a8518de562 100644 (file)
--- a/src/vm/rt-timing.h
+++ b/src/vm/rt-timing.h
@@ -1,9 +1,7 @@
 /* src/vm/rt-timing.h - POSIX real-time timing utilities
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,16 +20,9 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Edwin Steiner
-
-   Changes:
-
-   $Id$
-
 */
 
+
 #ifndef _RT_TIMING_H
 #define _RT_TIMING_H
 
@@ -39,13 +30,15 @@
 
 #if defined(ENABLE_RT_TIMING)
 
+#include <time.h>
+
 #include "vm/types.h"
 
-#include <time.h>
+#include "mm/memory.hpp"
 
-#include "mm/memory.h"
 #include "vm/global.h"
 
+
 #define RT_TIMING_GET_TIME(ts) \
        rt_timing_gettime(&(ts));
 
@@ -106,7 +99,22 @@
 #define RT_TIMING_NEW_OBJECT       46
 #define RT_TIMING_NEW_ARRAY        47
 
-#define RT_TIMING_N                48
+#define RT_TIMING_GC_ALLOC         48
+#define RT_TIMING_GC_SUSPEND       49
+#define RT_TIMING_GC_ROOTSET1      50
+#define RT_TIMING_GC_MARK          51
+#define RT_TIMING_GC_COMPACT       52
+#define RT_TIMING_GC_ROOTSET2      53
+#define RT_TIMING_GC_TOTAL         54
+
+#define RT_TIMING_REPLACE          55
+
+#define RT_TIMING_1                56
+#define RT_TIMING_2                57
+#define RT_TIMING_3                58
+#define RT_TIMING_4                59
+
+#define RT_TIMING_N                60
 
 void rt_timing_gettime(struct timespec *ts);