* Removed all Id tags.

[cacao.git] / src / toolbox / logging.c

diff --git a/src/toolbox/logging.c b/src/toolbox/logging.c
index 6c9b411da9e65920b1578a8cfdd43cd4999c517c..de04b1e573aee75d7623e6fe8254701a5b1c4cb8 100644 (file)
--- a/src/toolbox/logging.c
+++ b/src/toolbox/logging.c
@@ -1,6 +1,6 @@
 /* src/toolbox/logging.c - contains logging functions
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   Copyright (C) 1996-2005, 2006, 2007 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
@@ -22,22 +22,12 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Reinhard Grafl
-
-   Changes: Christian Thalinger
-                       Edwin Steiner
-
-   $Id: logging.c 4921 2006-05-15 14:24:36Z twisti $
-
 */
 
 
 #include "config.h"
 
 #include <stdio.h>
-#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -47,10 +37,9 @@
 #include "toolbox/logging.h"
 #include "toolbox/util.h"
 #include "vm/global.h"
-#include "vm/statistics.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/threads.h"
+#if defined(ENABLE_STATISTICS)
+# include "vmcore/statistics.h"
 #endif
 
 
@@ -78,16 +67,41 @@ void log_init(const char *fname)
 
 *******************************************************************************/
 
+/* ATTENTION: Don't include threads-common.h, because we can't
+   bootstrap this file in that case (missing java_lang_Thread.h).
+   Instead we declare threads_get_current_threadobject differently: */
+
+/* #if defined(ENABLE_THREADS) */
+/* # include "threads/threads-common.h" */
+/* #endif */
+
+extern ptrint threads_get_current_tid(void);
+
+
 void log_start(void)
 {
-       if (logfile) {
 #if defined(ENABLE_THREADS)
-               fprintf(logfile, "[%p] ", (void *) THREADOBJECT);
+       ptrint tid;
+
+       tid = threads_get_current_tid();
 #endif
 
-       } else {
+       if (logfile) {
 #if defined(ENABLE_THREADS)
-               fprintf(stdout, "LOG: [%p] ", (void *) THREADOBJECT);
+# if SIZEOF_VOID_P == 8
+               fprintf(logfile, "[0x%016lx] ", tid );
+# else
+               fprintf(logfile, "[0x%08x] ", tid);
+# endif
+#endif
+       }
+       else {
+#if defined(ENABLE_THREADS)
+# if SIZEOF_VOID_P == 8
+               fprintf(stdout, "LOG: [0x%016lx] ", tid);
+# else
+               fprintf(stdout, "LOG: [0x%08x] ", tid);
+# endif
 #else
                fputs("LOG: ", stdout);
 #endif
@@ -101,7 +115,7 @@ void log_start(void)
 
 *******************************************************************************/
 
-static void log_vprint(const char *text, va_list ap)
+void log_vprint(const char *text, va_list ap)
 {
        if (logfile)
                vfprintf(logfile, text, ap);
@@ -156,11 +170,11 @@ void log_println(const char *text, ...)
 void log_finish(void)
 {
        if (logfile) {
+               fputs("\n", logfile);
                fflush(logfile);
-
-       } else {
+       }
+       else {
                fputs("\n", stdout);
-
                fflush(stdout);
        }
 }