-/* toolbox/logging.c - contains logging functions
+/* src/toolbox/logging.c - contains logging functions
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
- Institut f. Computersprachen, TU Wien
- R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser, M. Probst,
- S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich,
- J. Wenninger
+ 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
This file is part of CACAO.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
- Contact: cacao@complang.tuwien.ac.at
+ Contact: cacao@cacaojvm.org
Authors: Reinhard Grafl
- $Id: logging.c 1621 2004-11-30 13:06:55Z twisti $
+ Changes: Christian Thalinger
+
+ $Id: logging.c 4357 2006-01-22 23:33:38Z twisti $
*/
#include <stdlib.h>
#include <string.h>
+#include "config.h"
+#include "vm/types.h"
+
+#include "mm/memory.h"
#include "toolbox/logging.h"
+#include "toolbox/util.h"
#include "vm/global.h"
-#include "vm/tables.h"
#include "vm/statistics.h"
+#if defined(USE_THREADS)
+# if defined(NATIVE_THREADS)
+# include "threads/native/threads.h"
+# endif
+#endif
+
/***************************************************************************
LOG FILE HANDLING
FILE *logfile = NULL;
-
-void log_init(char *fname)
+void log_init(const char *fname)
{
if (fname) {
if (fname[0]) {
}
-/*********************** Function: dolog ************************************
+/* dolog ***********************************************************************
-Writes logtext to the protocol file (if opened) or to stdout.
+ Writes logtext to the protocol file (if opened) or to stdout.
-**************************************************************************/
+*******************************************************************************/
-void dolog(char *txt, ...)
+void dolog(const char *text, ...)
{
- char logtext[MAXLOGTEXT];
va_list ap;
- va_start(ap, txt);
- vsprintf(logtext, txt, ap);
- va_end(ap);
-
if (logfile) {
- fprintf(logfile, "%s\n",logtext);
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ fprintf(logfile, "[%p] ", (void *) THREADOBJECT);
+#endif
+
+ va_start(ap, text);
+ vfprintf(logfile, text, ap);
+ va_end(ap);
+
fflush(logfile);
} else {
- fprintf(stdout,"LOG: %s\n",logtext);
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+ fprintf(stdout, "LOG: [%p] ", (void *) THREADOBJECT);
+#else
+ fputs("LOG: ", stdout);
+#endif
+
+ va_start(ap, text);
+ vfprintf(stdout, text, ap);
+ va_end(ap);
+
+ fprintf(stdout, "\n");
+
fflush(stdout);
}
}
**************************************************************************/
-void dolog_plain(char *txt, ...)
+void dolog_plain(const char *txt, ...)
{
char logtext[MAXLOGTEXT];
va_list ap;
/********************* Function: log_text ********************************/
-void log_text(char *text)
+void log_text(const char *text)
{
dolog("%s", text);
}
/******************** Function: log_plain *******************************/
-void log_plain(char *text)
+void log_plain(const char *text)
{
dolog_plain("%s", text);
}
/****************** Function: get_logfile *******************************/
-FILE *get_logfile()
+FILE *get_logfile(void)
{
return (logfile) ? logfile : stdout;
}
/****************** Function: log_flush *********************************/
-void log_flush()
+void log_flush(void)
{
fflush(get_logfile());
}
/********************* Function: log_nl *********************************/
-void log_nl()
+void log_nl(void)
{
log_plain("\n");
fflush(get_logfile());
}
-/********************* Function: log_cputime ****************************/
+/* log_message_utf *************************************************************
+
+ Outputs log text like this:
+
+ LOG: Creating class: java/lang/Object
+
+*******************************************************************************/
-void log_cputime()
+void log_message_utf(const char *msg, utf *u)
{
- s8 t;
- int sec, usec;
- char logtext[MAXLOGTEXT];
+ char *buf;
+ s4 len;
+
+ len = strlen(msg) + utf_strlen(u) + strlen("0");
+
+ buf = MNEW(char, len);
+
+ strcpy(buf, msg);
+ utf_strcat(buf, u);
- t = getcputime();
- sec = t / 1000000;
- usec = t % 1000000;
+ log_text(buf);
- sprintf(logtext, "Total CPU usage: %d seconds and %d milliseconds",
- sec, usec / 1000);
- log_text(logtext);
+ MFREE(buf, char, len);
}
-/* log_message_method **********************************************************
+/* log_message_class ***********************************************************
- outputs log text like this:
+ Outputs log text like this:
- LOG: Loading class: java.lang.Object
+ LOG: Loading class: java/lang/Object
*******************************************************************************/
-void log_message_class(char *msg, classinfo *c)
+void log_message_class(const char *msg, classinfo *c)
{
- char logtext[MAXLOGTEXT];
-
- sprintf(logtext, msg);
- utf_sprint_classname(logtext + strlen(logtext), c->name);
-
- log_text(logtext);
+ log_message_utf(msg, c->name);
}
-/* log_message_method **********************************************************
+/* log_message_class_message_class *********************************************
- outputs log text like this:
+ Outputs log text like this:
- LOG: Compiling: java.lang.Object.clone()Ljava.lang.Object;
+ LOG: Initialize super class java/lang/Object from java/lang/VMThread
*******************************************************************************/
-void log_message_method(char *msg, methodinfo *m)
+void log_message_class_message_class(const char *msg1, classinfo *c1,
+ const char *msg2, classinfo *c2)
{
- char logtext[MAXLOGTEXT];
+ char *buf;
+ s4 len;
+
+ len =
+ strlen(msg1) + utf_strlen(c1->name) +
+ strlen(msg2) + utf_strlen(c2->name) + strlen("0");
- sprintf(logtext, msg);
- utf_sprint_classname(logtext + strlen(logtext), m->class->name);
- strcpy(logtext + strlen(logtext), ".");
- utf_sprint(logtext + strlen(logtext), m->name);
- utf_sprint_classname(logtext + strlen(logtext), m->descriptor);
+ buf = MNEW(char, len);
- log_text(logtext);
+ strcpy(buf, msg1);
+ utf_strcat(buf, c1->name);
+ strcat(buf, msg2);
+ utf_strcat(buf, c2->name);
+
+ log_text(buf);
+
+ MFREE(buf, char, len);
}
-/************************** Function: error *******************************
+/* log_message_method **********************************************************
+
+ Outputs log text like this:
-Like dolog(), but terminates the program immediately.
+ LOG: Compiling: java.lang.Object.clone()Ljava/lang/Object;
-**************************************************************************/
+*******************************************************************************/
-void error(char *txt, ...)
+void log_message_method(const char *msg, methodinfo *m)
{
- char logtext[MAXLOGTEXT];
- va_list ap;
+ char *buf;
+ s4 len;
- va_start(ap, txt);
- vsprintf(logtext, txt, ap);
- va_end(ap);
+ len = strlen(msg) + utf_strlen(m->class->name) + strlen(".") +
+ utf_strlen(m->name) + utf_strlen(m->descriptor) + strlen("0");
- if (logfile) {
- fprintf(logfile, "ERROR: %s\n", logtext);
- }
+ buf = MNEW(char, len);
+
+ strcpy(buf, msg);
+ utf_strcat_classname(buf, m->class->name);
+ strcat(buf, ".");
+ utf_strcat(buf, m->name);
+ utf_strcat(buf, m->descriptor);
- fprintf(stderr, "ERROR: %s\n", logtext);
+ log_text(buf);
- exit(1);
+ MFREE(buf, char, len);
}
-/************************ Function: panic (txt) ****************************
+/* log_utf *********************************************************************
- Like error(), takes the text to output as an argument
+ Log utf symbol.
-***************************************************************************/
+*******************************************************************************/
+
+void log_utf(utf *u)
+{
+ char buf[MAXLOGTEXT];
+ utf_sprint(buf, u);
+ dolog("%s", buf);
+}
+
+
+/* log_plain_utf ***************************************************************
+
+ Log utf symbol (without printing "LOG: " and newline).
+
+*******************************************************************************/
-void panic(char *txt)
+void log_plain_utf(utf *u)
{
- error("%s", txt);
+ char buf[MAXLOGTEXT];
+ utf_sprint(buf, u);
+ dolog_plain("%s", buf);
}
projects / cacao.git / blobdiff