/* src/toolbox/logging.c - contains logging functions
- 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
+ Copyright (C) 1996-2005, 2006, 2007, 2008
+ CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: logging.c 7685 2007-04-11 08:21:06Z twisti $
-
*/
#include "vm/types.h"
#include "mm/memory.h"
+
+#include "threads/thread.hpp"
+
#include "toolbox/logging.h"
#include "toolbox/util.h"
+
#include "vm/global.h"
#if defined(ENABLE_STATISTICS)
-# include "vmcore/statistics.h"
+# include "vm/statistics.h"
#endif
*******************************************************************************/
-/* 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 defined(ENABLE_THREADS)
char *buf;
s4 len;
- len = strlen(msg) + utf_bytes(m->class->name) + strlen(".") +
+ 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_cat_classname(buf, m->class->name);
+ utf_cat_classname(buf, m->clazz->name);
strcat(buf, ".");
utf_cat(buf, m->name);
utf_cat(buf, m->descriptor);