Merge from subtype.

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

diff --git a/src/toolbox/logging.c b/src/toolbox/logging.c
index 362ea885ed74a0fb52ae7c4b8af35006d29b411c..7ff7f1b69fafe369178fa28fa28f77f1d6bb440a 100644 (file)
--- a/src/toolbox/logging.c
+++ b/src/toolbox/logging.c
@@ -1,9 +1,7 @@
 /* src/toolbox/logging.c - contains logging functions
 
-   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,35 +20,28 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Reinhard Grafl
-
-   Changes: Christian Thalinger
-
-   $Id: logging.c 4879 2006-05-05 17:34:49Z edwin $
-
 */
 
 
+#include "config.h"
+
 #include <stdio.h>
-#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "vm/types.h"
 
 #include "mm/memory.h"
+
+#include "threads/thread.hpp"
+
 #include "toolbox/logging.h"
 #include "toolbox/util.h"
+
 #include "vm/global.h"
-#include "vm/statistics.h"
 
-#if defined(USE_THREADS)
-# if defined(NATIVE_THREADS)
-#  include "threads/native/threads.h"
-# endif
+#if defined(ENABLE_STATISTICS)
+# include "vm/statistics.h"
 #endif
 
 
@@ -80,14 +71,28 @@ void log_init(const char *fname)
 
 void log_start(void)
 {
-       if (logfile) {
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-               fprintf(logfile, "[%p] ", (void *) THREADOBJECT);
+#if defined(ENABLE_THREADS)
+       ptrint tid;
+
+       tid = threads_get_current_tid();
 #endif
 
-       } else {
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
-               fprintf(stdout, "LOG: [%p] ", (void *) THREADOBJECT);
+       if (logfile) {
+#if defined(ENABLE_THREADS)
+# 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 +106,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 +161,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);
        }
 }
@@ -179,12 +184,12 @@ void log_message_utf(const char *msg, utf *u)
        char *buf;
        s4    len;
 
-       len = strlen(msg) + utf_get_number_of_u2s(u) + strlen("0");
+       len = strlen(msg) + utf_bytes(u) + strlen("0");
 
        buf = MNEW(char, len);
 
        strcpy(buf, msg);
-       utf_strcat_convert_to_latin1(buf, u);
+       utf_cat(buf, u);
 
        log_text(buf);
 
@@ -221,15 +226,15 @@ void log_message_class_message_class(const char *msg1, classinfo *c1,
        s4    len;
 
        len =
-               strlen(msg1) + utf_get_number_of_u2s(c1->name) +
-               strlen(msg2) + utf_get_number_of_u2s(c2->name) + strlen("0");
+               strlen(msg1) + utf_bytes(c1->name) +
+               strlen(msg2) + utf_bytes(c2->name) + strlen("0");
 
        buf = MNEW(char, len);
 
        strcpy(buf, msg1);
-       utf_strcat_convert_to_latin1(buf, c1->name);
+       utf_cat_classname(buf, c1->name);
        strcat(buf, msg2);
-       utf_strcat_convert_to_latin1(buf, c2->name);
+       utf_cat_classname(buf, c2->name);
 
        log_text(buf);
 
@@ -250,16 +255,16 @@ void log_message_method(const char *msg, methodinfo *m)
        char *buf;
        s4    len;
 
-       len = strlen(msg) + utf_get_number_of_u2s(m->class->name) + strlen(".") +
-               utf_get_number_of_u2s(m->name) + utf_get_number_of_u2s(m->descriptor) + strlen("0");
+       len = strlen(msg) + utf_bytes(m->clazz->name) + strlen(".") +
+               utf_bytes(m->name) + utf_bytes(m->descriptor) + strlen("0");
 
        buf = MNEW(char, len);
 
        strcpy(buf, msg);
-       utf_strcat_convert_to_latin1_classname(buf, m->class->name);
+       utf_cat_classname(buf, m->clazz->name);
        strcat(buf, ".");
-       utf_strcat_convert_to_latin1(buf, m->name);
-       utf_strcat_convert_to_latin1(buf, m->descriptor);
+       utf_cat(buf, m->name);
+       utf_cat(buf, m->descriptor);
 
        log_text(buf);
 
@@ -278,4 +283,5 @@ void log_message_method(const char *msg, methodinfo *m)
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */