From 9df2bcaa5c50904777635c1afb45527e71a9c2d2 Mon Sep 17 00:00:00 2001 From: stefan Date: Tue, 18 May 2004 10:25:51 +0000 Subject: [PATCH] Renamed loging to logging --- builtin.c | 4 +- builtin.h | 4 +- headers.c | 4 +- jit/codegen.inc | 4 +- jit/inline.c | 4 +- jit/jit.c | 4 +- jit/loop/analyze.c | 4 +- jit/loop/loop.c | 4 +- jit/parse.c | 4 +- jit/parseRT.h | 4 +- jit/stack.c | 4 +- jit/typecheck.c | 4 +- jni.c | 4 +- loader.c | 4 +- main.c | 4 +- mm/boehm.c | 4 +- nat/Constructor.c | 4 +- nat/FileChannelImpl.c | 4 +- nat/Method.c | 4 +- nat/Proxy.c | 4 +- nat/Runtime.c | 4 +- nat/Thread.c | 4 +- nat/VMClass.c | 4 +- nat/VMClassLoader.c | 4 +- nat/VMObject.c | 4 +- nat/VMObjectStreamClass.c | 4 +- nat/VMSecurityManager.c | 4 +- nat/VMSystem.c | 4 +- native.c | 4 +- src/cacao/cacao.c | 4 +- src/cacaoh/headers.c | 4 +- src/mm/boehm.c | 4 +- src/mm/memory.c | 4 +- src/native/jni.c | 4 +- src/native/native.c | 4 +- src/native/vm/Constructor.c | 4 +- src/native/vm/FileChannelImpl.c | 4 +- src/native/vm/Method.c | 4 +- src/native/vm/Proxy.c | 4 +- src/native/vm/VMClass.c | 4 +- src/native/vm/VMClassLoader.c | 4 +- src/native/vm/VMObject.c | 4 +- src/native/vm/VMObjectStreamClass.c | 4 +- src/native/vm/VMRuntime.c | 4 +- src/native/vm/VMSecurityManager.c | 4 +- src/native/vm/VMSystem.c | 4 +- src/native/vm/VMThread.c | 4 +- src/threads/green/threads.c | 2 +- src/threads/native/threads.c | 2 +- src/toolbox/Makefile.am | 6 +- toolbox/loging.c => src/toolbox/logging.c | 6 +- toolbox/loging.h => src/toolbox/logging.h | 4 +- src/vm/builtin.c | 4 +- src/vm/builtin.h | 4 +- src/vm/jit/codegen.inc | 4 +- src/vm/jit/inline/inline.c | 4 +- src/vm/jit/inline/parseRT.h | 4 +- src/vm/jit/jit.c | 4 +- src/vm/jit/loop/analyze.c | 4 +- src/vm/jit/loop/loop.c | 4 +- src/vm/jit/parse.c | 4 +- src/vm/jit/stack.c | 4 +- src/vm/jit/verify/typecheck.c | 4 +- src/vm/jit/verify/typeinfo.c | 4 +- src/vm/loader.c | 4 +- src/vm/tables.c | 4 +- tables.c | 4 +- threads/nativethread.c | 2 +- threads/thread.c | 2 +- toolbox/Makefile.am | 6 +- toolbox/logging.c | 239 ++++++++++++++++++++++ toolbox/logging.h | 78 +++++++ toolbox/memory.c | 4 +- typeinfo.c | 4 +- 74 files changed, 460 insertions(+), 143 deletions(-) rename toolbox/loging.c => src/toolbox/logging.c (97%) rename toolbox/loging.h => src/toolbox/logging.h (95%) create mode 100644 toolbox/logging.c create mode 100644 toolbox/logging.h diff --git a/builtin.c b/builtin.c index 4e96a2d87..c205a4101 100644 --- a/builtin.c +++ b/builtin.c @@ -34,7 +34,7 @@ calls instead of machine instructions, using the C calling convention. - $Id: builtin.c 1027 2004-04-26 15:53:01Z twisti $ + $Id: builtin.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -52,7 +52,7 @@ #include "mm/boehm.h" #include "threads/thread.h" #include "threads/locks.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "nat/java_lang_Cloneable.h" #include "nat/java_lang_VMObject.h" diff --git a/builtin.h b/builtin.h index 4ecbac38b..111b8cc7c 100644 --- a/builtin.h +++ b/builtin.h @@ -28,7 +28,7 @@ Changes: Edwin Steiner - $Id: builtin.h 1027 2004-04-26 15:53:01Z twisti $ + $Id: builtin.h 1067 2004-05-18 10:25:51Z stefan $ */ @@ -37,7 +37,7 @@ #define _BUILTIN_H #include "config.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "threads/thread.h" diff --git a/headers.c b/headers.c index 03f24011e..0a27f1705 100644 --- a/headers.c +++ b/headers.c @@ -29,7 +29,7 @@ Changes: Mark Probst Philipp Tomsich - $Id: headers.c 1053 2004-05-05 12:27:04Z stefan $ + $Id: headers.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -45,7 +45,7 @@ #include "mm/boehm.h" #include "toolbox/chain.h" #include "toolbox/memory.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "nat/java_lang_String.h" diff --git a/jit/codegen.inc b/jit/codegen.inc index 7db7d61eb..7c5d65df9 100644 --- a/jit/codegen.inc +++ b/jit/codegen.inc @@ -48,14 +48,14 @@ memory. All functions writing values into the data area return the offset relative the begin of the code area (start of procedure). - $Id: codegen.inc 1049 2004-05-05 11:43:11Z stefan $ + $Id: codegen.inc 1067 2004-05-18 10:25:51Z stefan $ */ #include #include "toolbox/memory.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "threads/thread.h" diff --git a/jit/inline.c b/jit/inline.c index f4e98c5fe..a5bd6e385 100644 --- a/jit/inline.c +++ b/jit/inline.c @@ -26,7 +26,7 @@ Authors: Dieter Thuernbeck - $Id: inline.c 1009 2004-03-31 22:44:07Z edwin $ + $Id: inline.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -39,7 +39,7 @@ #include "parse.h" #include "loader.h" #include "tables.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" diff --git a/jit/jit.c b/jit/jit.c index 6516e4bd9..f9886b9c8 100644 --- a/jit/jit.c +++ b/jit/jit.c @@ -29,7 +29,7 @@ Changes: Edwin Steiner - $Id: jit.c 1038 2004-04-26 16:41:30Z twisti $ + $Id: jit.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -55,7 +55,7 @@ #include "loop/loop.h" #include "loop/graph.h" #include "loop/analyze.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" diff --git a/jit/loop/analyze.c b/jit/loop/analyze.c index 541ae6167..15f9aa283 100644 --- a/jit/loop/analyze.c +++ b/jit/loop/analyze.c @@ -32,7 +32,7 @@ bounds are never violated. The function to call is optimize_loops(). - $Id: analyze.c 665 2003-11-21 18:36:43Z jowenn $ + $Id: analyze.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -45,7 +45,7 @@ #include "loop.h" #include "graph.h" #include "tracing.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" diff --git a/jit/loop/loop.c b/jit/loop/loop.c index d122cbcc3..cce76ea46 100644 --- a/jit/loop/loop.c +++ b/jit/loop/loop.c @@ -30,7 +30,7 @@ algorithm that uses dominator trees (found eg. in modern compiler implementation by a.w. appel) - $Id: loop.c 665 2003-11-21 18:36:43Z jowenn $ + $Id: loop.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -42,7 +42,7 @@ #include "loop.h" #include "graph.h" #include "tracing.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" /* GLOBAL VARS */ diff --git a/jit/parse.c b/jit/parse.c index 3701403f5..ccaf00281 100644 --- a/jit/parse.c +++ b/jit/parse.c @@ -29,7 +29,7 @@ Changes: Carolyn Oates Edwin Steiner - $Id: parse.c 1045 2004-04-26 19:17:27Z twisti $ + $Id: parse.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -48,7 +48,7 @@ #include "native.h" #include "loader.h" #include "toolbox/memory.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" /* data about the currently parsed method */ diff --git a/jit/parseRT.h b/jit/parseRT.h index 4679e9ea3..0d322e275 100644 --- a/jit/parseRT.h +++ b/jit/parseRT.h @@ -26,7 +26,7 @@ Authors: Carolyn Oates - $Id: parseRT.h 907 2004-01-29 13:20:05Z carolyn $ + $Id: parseRT.h 1067 2004-05-18 10:25:51Z stefan $ */ @@ -48,7 +48,7 @@ #include "sets.h" #include "tables.h" -#include"toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "types.h" diff --git a/jit/stack.c b/jit/stack.c index 99fa4c8d0..dd0db0bf5 100644 --- a/jit/stack.c +++ b/jit/stack.c @@ -28,7 +28,7 @@ Changes: Edwin Steiner - $Id: stack.c 1038 2004-04-26 16:41:30Z twisti $ + $Id: stack.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -44,7 +44,7 @@ #include "reg.h" #include "tables.h" #include "types.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" diff --git a/jit/typecheck.c b/jit/typecheck.c index 801b4c097..82cce1556 100644 --- a/jit/typecheck.c +++ b/jit/typecheck.c @@ -26,7 +26,7 @@ Authors: Edwin Steiner - $Id: typecheck.c 1038 2004-04-26 16:41:30Z twisti $ + $Id: typecheck.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -41,7 +41,7 @@ #include "tables.h" #include "loader.h" #include "types.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" /****************************************************************************/ diff --git a/jni.c b/jni.c index 40826da3f..da6435e18 100644 --- a/jni.c +++ b/jni.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: jni.c 1030 2004-04-26 16:03:01Z twisti $ + $Id: jni.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -42,7 +42,7 @@ #include "native.h" #include "builtin.h" #include "threads/thread.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "nat/java_lang_Byte.h" #include "nat/java_lang_Character.h" diff --git a/loader.c b/loader.c index 96402ab61..55449bd2a 100644 --- a/loader.c +++ b/loader.c @@ -30,7 +30,7 @@ Mark Probst Edwin Steiner - $Id: loader.c 1058 2004-05-16 13:14:41Z twisti $ + $Id: loader.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -48,7 +48,7 @@ #include "jit.h" #include "asmpart.h" #include "toolbox/memory.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "threads/thread.h" #include "threads/locks.h" #include "nat/java_lang_Throwable.h" diff --git a/main.c b/main.c index 3365bf48c..a593d24a4 100644 --- a/main.c +++ b/main.c @@ -37,7 +37,7 @@ - Calling the class loader - Running the main method - $Id: main.c 1032 2004-04-26 16:09:10Z twisti $ + $Id: main.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -54,7 +54,7 @@ #include "native.h" #include "mm/boehm.h" #include "threads/thread.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "parseRTstats.h" #include "nat/java_lang_Throwable.h" diff --git a/mm/boehm.c b/mm/boehm.c index 51e747bef..e8a2c0946 100644 --- a/mm/boehm.c +++ b/mm/boehm.c @@ -26,7 +26,7 @@ Authors: Stefan Ring - $Id: boehm.c 1026 2004-04-25 21:45:48Z twisti $ + $Id: boehm.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -41,7 +41,7 @@ #include "asmpart.h" #include "builtin.h" #include "threads/thread.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "gc.h" diff --git a/nat/Constructor.c b/nat/Constructor.c index bb8f8f6a6..b7aecfc22 100644 --- a/nat/Constructor.c +++ b/nat/Constructor.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: Constructor.c 1042 2004-04-26 17:12:47Z twisti $ + $Id: Constructor.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -40,7 +40,7 @@ #include "native.h" #include "tables.h" #include "asmpart.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_Object.h" #include "java_lang_Class.h" #include "java_lang_reflect_Constructor.h" diff --git a/nat/FileChannelImpl.c b/nat/FileChannelImpl.c index d77b161ea..ffce92421 100644 --- a/nat/FileChannelImpl.c +++ b/nat/FileChannelImpl.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: FileChannelImpl.c 873 2004-01-11 20:59:29Z twisti $ + $Id: FileChannelImpl.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -36,7 +36,7 @@ #include #include "jni.h" #include "types.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "gnu_classpath_RawData.h" #include "java_nio_channels_FileChannelImpl.h" diff --git a/nat/Method.c b/nat/Method.c index fc47b9abb..159b008df 100644 --- a/nat/Method.c +++ b/nat/Method.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: Method.c 940 2004-03-06 14:04:15Z jowenn $ + $Id: Method.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -40,7 +40,7 @@ #include "types.h" #include "builtin.h" #include "native.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_Object.h" #include "java_lang_Class.h" #include "java_lang_reflect_Method.h" diff --git a/nat/Proxy.c b/nat/Proxy.c index 16f1cc255..d4742a379 100644 --- a/nat/Proxy.c +++ b/nat/Proxy.c @@ -28,13 +28,13 @@ Changes: Joseph Wenninger - $Id: Proxy.c 873 2004-01-11 20:59:29Z twisti $ + $Id: Proxy.c 1067 2004-05-18 10:25:51Z stefan $ */ #include "jni.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_Class.h" #include "java_lang_ClassLoader.h" diff --git a/nat/Runtime.c b/nat/Runtime.c index ea8f771c4..83de35979 100644 --- a/nat/Runtime.c +++ b/nat/Runtime.c @@ -29,7 +29,7 @@ Changes: Joseph Wenninger Christian Thalinger - $Id: Runtime.c 1042 2004-04-26 17:12:47Z twisti $ + $Id: Runtime.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -45,7 +45,7 @@ #include "tables.h" #include "asmpart.h" #include "mm/boehm.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "java_io_File.h" #include "java_lang_String.h" diff --git a/nat/Thread.c b/nat/Thread.c index ae83f5f5b..702bfe304 100644 --- a/nat/Thread.c +++ b/nat/Thread.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: Thread.c 1042 2004-04-26 17:12:47Z twisti $ + $Id: Thread.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -40,7 +40,7 @@ #include "loader.h" #include "tables.h" #include "threads/thread.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_ThreadGroup.h" #include "java_lang_Object.h" /* needed for java_lang_Thread.h */ #include "java_lang_Throwable.h" /* needed for java_lang_Thread.h */ diff --git a/nat/VMClass.c b/nat/VMClass.c index 6bad29b20..9209ab163 100644 --- a/nat/VMClass.c +++ b/nat/VMClass.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMClass.c 1042 2004-04-26 17:12:47Z twisti $ + $Id: VMClass.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -41,7 +41,7 @@ #include "loader.h" #include "native.h" #include "tables.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "java_lang_Object.h" #include "java_lang_Class.h" diff --git a/nat/VMClassLoader.c b/nat/VMClassLoader.c index 208af3bf4..23a83c4f9 100644 --- a/nat/VMClassLoader.c +++ b/nat/VMClassLoader.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMClassLoader.c 1042 2004-04-26 17:12:47Z twisti $ + $Id: VMClassLoader.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -37,7 +37,7 @@ #include "loader.h" #include "native.h" #include "builtin.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_Class.h" #include "java_lang_String.h" #include "java_lang_ClassLoader.h" diff --git a/nat/VMObject.c b/nat/VMObject.c index 865318ba6..174ef4566 100644 --- a/nat/VMObject.c +++ b/nat/VMObject.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMObject.c 1042 2004-04-26 17:12:47Z twisti $ + $Id: VMObject.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -41,7 +41,7 @@ #include "native.h" #include "mm/boehm.h" #include "threads/locks.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "java_lang_Cloneable.h" #include "java_lang_Object.h" diff --git a/nat/VMObjectStreamClass.c b/nat/VMObjectStreamClass.c index 8d2b97e4a..476d015cc 100644 --- a/nat/VMObjectStreamClass.c +++ b/nat/VMObjectStreamClass.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMObjectStreamClass.c 873 2004-01-11 20:59:29Z twisti $ + $Id: VMObjectStreamClass.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -36,7 +36,7 @@ #include "jni.h" #include "types.h" #include "loader.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_Class.h" diff --git a/nat/VMSecurityManager.c b/nat/VMSecurityManager.c index ed5207e17..dfcb05ac7 100644 --- a/nat/VMSecurityManager.c +++ b/nat/VMSecurityManager.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMSecurityManager.c 977 2004-03-25 18:37:52Z twisti $ + $Id: VMSecurityManager.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -37,7 +37,7 @@ #include "builtin.h" #include "native.h" #include "tables.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_ClassLoader.h" diff --git a/nat/VMSystem.c b/nat/VMSystem.c index 15b741563..00a9d3895 100644 --- a/nat/VMSystem.c +++ b/nat/VMSystem.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMSystem.c 1003 2004-03-30 22:56:04Z twisti $ + $Id: VMSystem.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -38,7 +38,7 @@ #include "jni.h" #include "builtin.h" #include "native.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_Object.h" diff --git a/native.c b/native.c index 1c7c816e4..785ba7372 100644 --- a/native.c +++ b/native.c @@ -31,7 +31,7 @@ The .hh files created with the header file generator are all included here as are the C functions implementing these methods. - $Id: native.c 1033 2004-04-26 16:18:56Z twisti $ + $Id: native.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -56,7 +56,7 @@ #include "tables.h" #include "loader.h" #include "jni.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "threads/thread.h" #include "threads/threadio.h" diff --git a/src/cacao/cacao.c b/src/cacao/cacao.c index 03737d894..6ffe2821b 100644 --- a/src/cacao/cacao.c +++ b/src/cacao/cacao.c @@ -37,7 +37,7 @@ - Calling the class loader - Running the main method - $Id: cacao.c 1032 2004-04-26 16:09:10Z twisti $ + $Id: cacao.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -54,7 +54,7 @@ #include "native.h" #include "mm/boehm.h" #include "threads/thread.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "parseRTstats.h" #include "nat/java_lang_Throwable.h" diff --git a/src/cacaoh/headers.c b/src/cacaoh/headers.c index 03f24011e..0a27f1705 100644 --- a/src/cacaoh/headers.c +++ b/src/cacaoh/headers.c @@ -29,7 +29,7 @@ Changes: Mark Probst Philipp Tomsich - $Id: headers.c 1053 2004-05-05 12:27:04Z stefan $ + $Id: headers.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -45,7 +45,7 @@ #include "mm/boehm.h" #include "toolbox/chain.h" #include "toolbox/memory.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "nat/java_lang_String.h" diff --git a/src/mm/boehm.c b/src/mm/boehm.c index 51e747bef..e8a2c0946 100644 --- a/src/mm/boehm.c +++ b/src/mm/boehm.c @@ -26,7 +26,7 @@ Authors: Stefan Ring - $Id: boehm.c 1026 2004-04-25 21:45:48Z twisti $ + $Id: boehm.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -41,7 +41,7 @@ #include "asmpart.h" #include "builtin.h" #include "threads/thread.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "gc.h" diff --git a/src/mm/memory.c b/src/mm/memory.c index c0c937b4c..4766f4c78 100644 --- a/src/mm/memory.c +++ b/src/mm/memory.c @@ -26,7 +26,7 @@ Authors: Reinhard Grafl - $Id: memory.c 799 2003-12-16 22:30:41Z edwin $ + $Id: memory.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -39,7 +39,7 @@ #include #include "global.h" -#include "loging.h" +#include "logging.h" #include "memory.h" diff --git a/src/native/jni.c b/src/native/jni.c index 40826da3f..da6435e18 100644 --- a/src/native/jni.c +++ b/src/native/jni.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: jni.c 1030 2004-04-26 16:03:01Z twisti $ + $Id: jni.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -42,7 +42,7 @@ #include "native.h" #include "builtin.h" #include "threads/thread.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "nat/java_lang_Byte.h" #include "nat/java_lang_Character.h" diff --git a/src/native/native.c b/src/native/native.c index 1c7c816e4..785ba7372 100644 --- a/src/native/native.c +++ b/src/native/native.c @@ -31,7 +31,7 @@ The .hh files created with the header file generator are all included here as are the C functions implementing these methods. - $Id: native.c 1033 2004-04-26 16:18:56Z twisti $ + $Id: native.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -56,7 +56,7 @@ #include "tables.h" #include "loader.h" #include "jni.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "threads/thread.h" #include "threads/threadio.h" diff --git a/src/native/vm/Constructor.c b/src/native/vm/Constructor.c index bb8f8f6a6..b7aecfc22 100644 --- a/src/native/vm/Constructor.c +++ b/src/native/vm/Constructor.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: Constructor.c 1042 2004-04-26 17:12:47Z twisti $ + $Id: Constructor.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -40,7 +40,7 @@ #include "native.h" #include "tables.h" #include "asmpart.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_Object.h" #include "java_lang_Class.h" #include "java_lang_reflect_Constructor.h" diff --git a/src/native/vm/FileChannelImpl.c b/src/native/vm/FileChannelImpl.c index d77b161ea..ffce92421 100644 --- a/src/native/vm/FileChannelImpl.c +++ b/src/native/vm/FileChannelImpl.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: FileChannelImpl.c 873 2004-01-11 20:59:29Z twisti $ + $Id: FileChannelImpl.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -36,7 +36,7 @@ #include #include "jni.h" #include "types.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "gnu_classpath_RawData.h" #include "java_nio_channels_FileChannelImpl.h" diff --git a/src/native/vm/Method.c b/src/native/vm/Method.c index fc47b9abb..159b008df 100644 --- a/src/native/vm/Method.c +++ b/src/native/vm/Method.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: Method.c 940 2004-03-06 14:04:15Z jowenn $ + $Id: Method.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -40,7 +40,7 @@ #include "types.h" #include "builtin.h" #include "native.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_Object.h" #include "java_lang_Class.h" #include "java_lang_reflect_Method.h" diff --git a/src/native/vm/Proxy.c b/src/native/vm/Proxy.c index 16f1cc255..d4742a379 100644 --- a/src/native/vm/Proxy.c +++ b/src/native/vm/Proxy.c @@ -28,13 +28,13 @@ Changes: Joseph Wenninger - $Id: Proxy.c 873 2004-01-11 20:59:29Z twisti $ + $Id: Proxy.c 1067 2004-05-18 10:25:51Z stefan $ */ #include "jni.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_Class.h" #include "java_lang_ClassLoader.h" diff --git a/src/native/vm/VMClass.c b/src/native/vm/VMClass.c index 6bad29b20..9209ab163 100644 --- a/src/native/vm/VMClass.c +++ b/src/native/vm/VMClass.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMClass.c 1042 2004-04-26 17:12:47Z twisti $ + $Id: VMClass.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -41,7 +41,7 @@ #include "loader.h" #include "native.h" #include "tables.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "java_lang_Object.h" #include "java_lang_Class.h" diff --git a/src/native/vm/VMClassLoader.c b/src/native/vm/VMClassLoader.c index 208af3bf4..23a83c4f9 100644 --- a/src/native/vm/VMClassLoader.c +++ b/src/native/vm/VMClassLoader.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMClassLoader.c 1042 2004-04-26 17:12:47Z twisti $ + $Id: VMClassLoader.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -37,7 +37,7 @@ #include "loader.h" #include "native.h" #include "builtin.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_Class.h" #include "java_lang_String.h" #include "java_lang_ClassLoader.h" diff --git a/src/native/vm/VMObject.c b/src/native/vm/VMObject.c index 865318ba6..174ef4566 100644 --- a/src/native/vm/VMObject.c +++ b/src/native/vm/VMObject.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMObject.c 1042 2004-04-26 17:12:47Z twisti $ + $Id: VMObject.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -41,7 +41,7 @@ #include "native.h" #include "mm/boehm.h" #include "threads/locks.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "java_lang_Cloneable.h" #include "java_lang_Object.h" diff --git a/src/native/vm/VMObjectStreamClass.c b/src/native/vm/VMObjectStreamClass.c index 8d2b97e4a..476d015cc 100644 --- a/src/native/vm/VMObjectStreamClass.c +++ b/src/native/vm/VMObjectStreamClass.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMObjectStreamClass.c 873 2004-01-11 20:59:29Z twisti $ + $Id: VMObjectStreamClass.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -36,7 +36,7 @@ #include "jni.h" #include "types.h" #include "loader.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_Class.h" diff --git a/src/native/vm/VMRuntime.c b/src/native/vm/VMRuntime.c index 6243b846c..df823e085 100644 --- a/src/native/vm/VMRuntime.c +++ b/src/native/vm/VMRuntime.c @@ -29,7 +29,7 @@ Changes: Joseph Wenninger Christian Thalinger - $Id: VMRuntime.c 1042 2004-04-26 17:12:47Z twisti $ + $Id: VMRuntime.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -45,7 +45,7 @@ #include "tables.h" #include "asmpart.h" #include "mm/boehm.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "java_io_File.h" #include "java_lang_String.h" diff --git a/src/native/vm/VMSecurityManager.c b/src/native/vm/VMSecurityManager.c index ed5207e17..dfcb05ac7 100644 --- a/src/native/vm/VMSecurityManager.c +++ b/src/native/vm/VMSecurityManager.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMSecurityManager.c 977 2004-03-25 18:37:52Z twisti $ + $Id: VMSecurityManager.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -37,7 +37,7 @@ #include "builtin.h" #include "native.h" #include "tables.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_ClassLoader.h" diff --git a/src/native/vm/VMSystem.c b/src/native/vm/VMSystem.c index 15b741563..00a9d3895 100644 --- a/src/native/vm/VMSystem.c +++ b/src/native/vm/VMSystem.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMSystem.c 1003 2004-03-30 22:56:04Z twisti $ + $Id: VMSystem.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -38,7 +38,7 @@ #include "jni.h" #include "builtin.h" #include "native.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_Object.h" diff --git a/src/native/vm/VMThread.c b/src/native/vm/VMThread.c index a35f046b8..a6f266f0f 100644 --- a/src/native/vm/VMThread.c +++ b/src/native/vm/VMThread.c @@ -28,7 +28,7 @@ Changes: Joseph Wenninger - $Id: VMThread.c 1042 2004-04-26 17:12:47Z twisti $ + $Id: VMThread.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -40,7 +40,7 @@ #include "loader.h" #include "tables.h" #include "threads/thread.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "java_lang_ThreadGroup.h" #include "java_lang_Object.h" /* needed for java_lang_Thread.h */ #include "java_lang_Throwable.h" /* needed for java_lang_Thread.h */ diff --git a/src/threads/green/threads.c b/src/threads/green/threads.c index 4a7b37e5c..3fd3ab1c2 100644 --- a/src/threads/green/threads.c +++ b/src/threads/green/threads.c @@ -34,7 +34,7 @@ #include "loader.h" #include "builtin.h" #include "asmpart.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "toolbox/avl.h" diff --git a/src/threads/native/threads.c b/src/threads/native/threads.c index 914092287..4309ca54d 100644 --- a/src/threads/native/threads.c +++ b/src/threads/native/threads.c @@ -21,7 +21,7 @@ #include "loader.h" #include "builtin.h" #include "asmpart.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "toolbox/avl.h" #include "mm/boehm.h" diff --git a/src/toolbox/Makefile.am b/src/toolbox/Makefile.am index 9a8f17084..0a225b779 100644 --- a/src/toolbox/Makefile.am +++ b/src/toolbox/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -# $Id: Makefile.am 882 2004-01-14 12:37:05Z stefan $ +# $Id: Makefile.am 1067 2004-05-18 10:25:51Z stefan $ noinst_LIBRARIES = libtoolbox.a @@ -9,8 +9,8 @@ libtoolbox_a_SOURCES = \ avl.h \ memory.c \ memory.h \ - loging.c \ - loging.h \ + logging.c \ + logging.h \ chain.c \ chain.h \ tree.c \ diff --git a/toolbox/loging.c b/src/toolbox/logging.c similarity index 97% rename from toolbox/loging.c rename to src/toolbox/logging.c index 79ea12d38..017850a3e 100644 --- a/toolbox/loging.c +++ b/src/toolbox/logging.c @@ -1,4 +1,4 @@ -/* toolbox/loging.c - contains loging functions +/* toolbox/logging.c - contains logging functions Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Institut f. Computersprachen, TU Wien @@ -27,7 +27,7 @@ Authors: Reinhard Grafl - $Id: loging.c 750 2003-12-13 22:17:44Z twisti $ + $Id: logging.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -38,7 +38,7 @@ #include #include "global.h" -#include "loging.h" +#include "logging.h" /*************************************************************************** diff --git a/toolbox/loging.h b/src/toolbox/logging.h similarity index 95% rename from toolbox/loging.h rename to src/toolbox/logging.h index 25b94bc5b..74e2f0b6a 100644 --- a/toolbox/loging.h +++ b/src/toolbox/logging.h @@ -1,4 +1,4 @@ -/* toolbox/loging.h - contains loging functions +/* toolbox/logging.h - contains logging functions Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Institut f. Computersprachen, TU Wien @@ -27,7 +27,7 @@ Authors: Reinhard Grafl - $Id: loging.h 750 2003-12-13 22:17:44Z twisti $ + $Id: logging.h 1067 2004-05-18 10:25:51Z stefan $ */ diff --git a/src/vm/builtin.c b/src/vm/builtin.c index 4e96a2d87..c205a4101 100644 --- a/src/vm/builtin.c +++ b/src/vm/builtin.c @@ -34,7 +34,7 @@ calls instead of machine instructions, using the C calling convention. - $Id: builtin.c 1027 2004-04-26 15:53:01Z twisti $ + $Id: builtin.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -52,7 +52,7 @@ #include "mm/boehm.h" #include "threads/thread.h" #include "threads/locks.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "nat/java_lang_Cloneable.h" #include "nat/java_lang_VMObject.h" diff --git a/src/vm/builtin.h b/src/vm/builtin.h index 4ecbac38b..111b8cc7c 100644 --- a/src/vm/builtin.h +++ b/src/vm/builtin.h @@ -28,7 +28,7 @@ Changes: Edwin Steiner - $Id: builtin.h 1027 2004-04-26 15:53:01Z twisti $ + $Id: builtin.h 1067 2004-05-18 10:25:51Z stefan $ */ @@ -37,7 +37,7 @@ #define _BUILTIN_H #include "config.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "threads/thread.h" diff --git a/src/vm/jit/codegen.inc b/src/vm/jit/codegen.inc index 7db7d61eb..7c5d65df9 100644 --- a/src/vm/jit/codegen.inc +++ b/src/vm/jit/codegen.inc @@ -48,14 +48,14 @@ memory. All functions writing values into the data area return the offset relative the begin of the code area (start of procedure). - $Id: codegen.inc 1049 2004-05-05 11:43:11Z stefan $ + $Id: codegen.inc 1067 2004-05-18 10:25:51Z stefan $ */ #include #include "toolbox/memory.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "threads/thread.h" diff --git a/src/vm/jit/inline/inline.c b/src/vm/jit/inline/inline.c index f4e98c5fe..a5bd6e385 100644 --- a/src/vm/jit/inline/inline.c +++ b/src/vm/jit/inline/inline.c @@ -26,7 +26,7 @@ Authors: Dieter Thuernbeck - $Id: inline.c 1009 2004-03-31 22:44:07Z edwin $ + $Id: inline.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -39,7 +39,7 @@ #include "parse.h" #include "loader.h" #include "tables.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" diff --git a/src/vm/jit/inline/parseRT.h b/src/vm/jit/inline/parseRT.h index 4679e9ea3..0d322e275 100644 --- a/src/vm/jit/inline/parseRT.h +++ b/src/vm/jit/inline/parseRT.h @@ -26,7 +26,7 @@ Authors: Carolyn Oates - $Id: parseRT.h 907 2004-01-29 13:20:05Z carolyn $ + $Id: parseRT.h 1067 2004-05-18 10:25:51Z stefan $ */ @@ -48,7 +48,7 @@ #include "sets.h" #include "tables.h" -#include"toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "types.h" diff --git a/src/vm/jit/jit.c b/src/vm/jit/jit.c index 6516e4bd9..f9886b9c8 100644 --- a/src/vm/jit/jit.c +++ b/src/vm/jit/jit.c @@ -29,7 +29,7 @@ Changes: Edwin Steiner - $Id: jit.c 1038 2004-04-26 16:41:30Z twisti $ + $Id: jit.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -55,7 +55,7 @@ #include "loop/loop.h" #include "loop/graph.h" #include "loop/analyze.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" diff --git a/src/vm/jit/loop/analyze.c b/src/vm/jit/loop/analyze.c index 541ae6167..15f9aa283 100644 --- a/src/vm/jit/loop/analyze.c +++ b/src/vm/jit/loop/analyze.c @@ -32,7 +32,7 @@ bounds are never violated. The function to call is optimize_loops(). - $Id: analyze.c 665 2003-11-21 18:36:43Z jowenn $ + $Id: analyze.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -45,7 +45,7 @@ #include "loop.h" #include "graph.h" #include "tracing.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" diff --git a/src/vm/jit/loop/loop.c b/src/vm/jit/loop/loop.c index d122cbcc3..cce76ea46 100644 --- a/src/vm/jit/loop/loop.c +++ b/src/vm/jit/loop/loop.c @@ -30,7 +30,7 @@ algorithm that uses dominator trees (found eg. in modern compiler implementation by a.w. appel) - $Id: loop.c 665 2003-11-21 18:36:43Z jowenn $ + $Id: loop.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -42,7 +42,7 @@ #include "loop.h" #include "graph.h" #include "tracing.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" /* GLOBAL VARS */ diff --git a/src/vm/jit/parse.c b/src/vm/jit/parse.c index 3701403f5..ccaf00281 100644 --- a/src/vm/jit/parse.c +++ b/src/vm/jit/parse.c @@ -29,7 +29,7 @@ Changes: Carolyn Oates Edwin Steiner - $Id: parse.c 1045 2004-04-26 19:17:27Z twisti $ + $Id: parse.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -48,7 +48,7 @@ #include "native.h" #include "loader.h" #include "toolbox/memory.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" /* data about the currently parsed method */ diff --git a/src/vm/jit/stack.c b/src/vm/jit/stack.c index 99fa4c8d0..dd0db0bf5 100644 --- a/src/vm/jit/stack.c +++ b/src/vm/jit/stack.c @@ -28,7 +28,7 @@ Changes: Edwin Steiner - $Id: stack.c 1038 2004-04-26 16:41:30Z twisti $ + $Id: stack.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -44,7 +44,7 @@ #include "reg.h" #include "tables.h" #include "types.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" diff --git a/src/vm/jit/verify/typecheck.c b/src/vm/jit/verify/typecheck.c index 801b4c097..82cce1556 100644 --- a/src/vm/jit/verify/typecheck.c +++ b/src/vm/jit/verify/typecheck.c @@ -26,7 +26,7 @@ Authors: Edwin Steiner - $Id: typecheck.c 1038 2004-04-26 16:41:30Z twisti $ + $Id: typecheck.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -41,7 +41,7 @@ #include "tables.h" #include "loader.h" #include "types.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" /****************************************************************************/ diff --git a/src/vm/jit/verify/typeinfo.c b/src/vm/jit/verify/typeinfo.c index 6fdbc2274..bc3d87163 100644 --- a/src/vm/jit/verify/typeinfo.c +++ b/src/vm/jit/verify/typeinfo.c @@ -26,7 +26,7 @@ Authors: Edwin Steiner - $Id: typeinfo.c 1035 2004-04-26 16:26:35Z twisti $ + $Id: typeinfo.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -36,7 +36,7 @@ #include "typeinfo.h" #include "tables.h" #include "loader.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "jit/jit.h" /* XXX move typeinfo.* into jit/ */ diff --git a/src/vm/loader.c b/src/vm/loader.c index 96402ab61..55449bd2a 100644 --- a/src/vm/loader.c +++ b/src/vm/loader.c @@ -30,7 +30,7 @@ Mark Probst Edwin Steiner - $Id: loader.c 1058 2004-05-16 13:14:41Z twisti $ + $Id: loader.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -48,7 +48,7 @@ #include "jit.h" #include "asmpart.h" #include "toolbox/memory.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "threads/thread.h" #include "threads/locks.h" #include "nat/java_lang_Throwable.h" diff --git a/src/vm/tables.c b/src/vm/tables.c index 537d8e88d..96891cbee 100644 --- a/src/vm/tables.c +++ b/src/vm/tables.c @@ -35,7 +35,7 @@ - the heap - additional support functions - $Id: tables.c 1034 2004-04-26 16:20:33Z twisti $ + $Id: tables.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -54,7 +54,7 @@ #include "asmpart.h" #include "threads/thread.h" #include "threads/locks.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" diff --git a/tables.c b/tables.c index 537d8e88d..96891cbee 100644 --- a/tables.c +++ b/tables.c @@ -35,7 +35,7 @@ - the heap - additional support functions - $Id: tables.c 1034 2004-04-26 16:20:33Z twisti $ + $Id: tables.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -54,7 +54,7 @@ #include "asmpart.h" #include "threads/thread.h" #include "threads/locks.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" diff --git a/threads/nativethread.c b/threads/nativethread.c index 914092287..4309ca54d 100644 --- a/threads/nativethread.c +++ b/threads/nativethread.c @@ -21,7 +21,7 @@ #include "loader.h" #include "builtin.h" #include "asmpart.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "toolbox/avl.h" #include "mm/boehm.h" diff --git a/threads/thread.c b/threads/thread.c index 4a7b37e5c..3fd3ab1c2 100644 --- a/threads/thread.c +++ b/threads/thread.c @@ -34,7 +34,7 @@ #include "loader.h" #include "builtin.h" #include "asmpart.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "toolbox/avl.h" diff --git a/toolbox/Makefile.am b/toolbox/Makefile.am index 9a8f17084..0a225b779 100644 --- a/toolbox/Makefile.am +++ b/toolbox/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -# $Id: Makefile.am 882 2004-01-14 12:37:05Z stefan $ +# $Id: Makefile.am 1067 2004-05-18 10:25:51Z stefan $ noinst_LIBRARIES = libtoolbox.a @@ -9,8 +9,8 @@ libtoolbox_a_SOURCES = \ avl.h \ memory.c \ memory.h \ - loging.c \ - loging.h \ + logging.c \ + logging.h \ chain.c \ chain.h \ tree.c \ diff --git a/toolbox/logging.c b/toolbox/logging.c new file mode 100644 index 000000000..017850a3e --- /dev/null +++ b/toolbox/logging.c @@ -0,0 +1,239 @@ +/* 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 + + This file is part of CACAO. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2, or (at + your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + 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. + + Contact: cacao@complang.tuwien.ac.at + + Authors: Reinhard Grafl + + $Id: logging.c 1067 2004-05-18 10:25:51Z stefan $ + +*/ + + +#include +#include +#include +#include + +#include "global.h" +#include "logging.h" + + +/*************************************************************************** + LOG FILE HANDLING +***************************************************************************/ + +FILE *logfile = NULL; + + + +void log_init(char *fname) +{ + if (fname) { + if (fname[0]) { + logfile = fopen(fname, "w"); + } + } +} + + +/*********************** Function: dolog ************************************ + +Writes logtext to the protocol file (if opened) or to stdout. + +**************************************************************************/ + +void dolog(char *txt, ...) +{ + char logtext[MAXLOGTEXT]; + va_list ap; + + va_start(ap, txt); + vsprintf(logtext, txt, ap); + va_end(ap); + + if (logfile) { + fprintf(logfile, "%s\n",logtext); + fflush(logfile); + + } else { + fprintf(stdout,"LOG: %s\n",logtext); + fflush(stdout); + } +} + + +/******************** Function: dolog_plain ******************************* + +Writes logtext to the protocol file (if opened) or to stdout. + +**************************************************************************/ + +void dolog_plain(char *txt, ...) +{ + char logtext[MAXLOGTEXT]; + va_list ap; + + va_start(ap, txt); + vsprintf(logtext, txt, ap); + va_end(ap); + + if (logfile) { + fprintf(logfile, "%s",logtext); + fflush(logfile); + + } else { + fprintf(stdout,"%s",logtext); + fflush(stdout); + } +} + + +/********************* Function: log_text ********************************/ + +void log_text(char *text) +{ + dolog("%s", text); +} + + +/******************** Function: log_plain *******************************/ + +void log_plain(char *text) +{ + dolog_plain("%s", text); +} + + +/****************** Function: get_logfile *******************************/ + +FILE *get_logfile() +{ + return (logfile) ? logfile : stdout; +} + + +/****************** Function: log_flush *********************************/ + +void log_flush() +{ + fflush(get_logfile()); +} + + +/********************* Function: log_nl *********************************/ + +void log_nl() +{ + log_plain("\n"); + fflush(get_logfile()); +} + + +/********************* Function: log_cputime ****************************/ + +void log_cputime() +{ + s8 t; + int sec, usec; + char logtext[MAXLOGTEXT]; + + t = getcputime(); + sec = t / 1000000; + usec = t % 1000000; + + sprintf(logtext, "Total CPU usage: %d seconds and %d milliseconds", + sec, usec / 1000); + log_text(logtext); +} + + +/************************** Function: error ******************************* + +Like dolog(), but terminates the program immediately. + +**************************************************************************/ + +void error(char *txt, ...) +{ + char logtext[MAXLOGTEXT]; + va_list ap; + + va_start(ap, txt); + vsprintf(logtext, txt, ap); + va_end(ap); + + if (logfile) { + fprintf(logfile, "ERROR: %s\n", logtext); + } + + fprintf(stderr, "ERROR: %s\n", logtext); + exit(10); +} + + +/************************ Function: panic (txt) **************************** + + Like error(), takes the text to output as an argument + +***************************************************************************/ + +void panic(char *txt) +{ + error("%s", txt); +} + + +/********************** Function: getcputime ******************************** + + Returns the used CPU time in microseconds + +****************************************************************************/ + +s8 getcputime() +{ + struct rusage ru; + int sec, usec; + + getrusage(RUSAGE_SELF, &ru); + sec = ru.ru_utime.tv_sec + ru.ru_stime.tv_sec; + usec = ru.ru_utime.tv_usec + ru.ru_stime.tv_usec; + + return sec * 1000000 + usec; +} + + +/* + * These are local overrides for various environment variables in Emacs. + * Please do not remove this and leave it at the end of the file, where + * Emacs will automagically detect them. + * --------------------------------------------------------------------- + * Local variables: + * mode: c + * indent-tabs-mode: t + * c-basic-offset: 4 + * tab-width: 4 + * End: + */ diff --git a/toolbox/logging.h b/toolbox/logging.h new file mode 100644 index 000000000..74e2f0b6a --- /dev/null +++ b/toolbox/logging.h @@ -0,0 +1,78 @@ +/* toolbox/logging.h - 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 + + This file is part of CACAO. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2, or (at + your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + 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. + + Contact: cacao@complang.tuwien.ac.at + + Authors: Reinhard Grafl + + $Id: logging.h 1067 2004-05-18 10:25:51Z stefan $ + +*/ + + +#ifndef _LOGGING_H +#define _LOGGING_H + +#include + + +#define PANICIF(when,txt) if(when)panic(txt) + +#define MAXLOGTEXT 500 + +/* function prototypes */ + +void log_init(char *fname); +void log_text(char *txt); +void log_plain(char *txt); /* same as log_text without "LOG: " and newline */ +void log_flush(); /* fflush logfile */ +void log_nl(); /* newline and fflush */ + +void log_cputime(); + +void dolog(char *txt, ...); +void dolog_plain(char *txt, ...); /* same as dolog without "LOG: " and newline */ +void error(char *txt, ...); +void panic(char *txt); + +FILE *get_logfile(); /* return the current logfile */ + +s8 getcputime(); + +#endif /* _LOGGING_H */ + + +/* + * These are local overrides for various environment variables in Emacs. + * Please do not remove this and leave it at the end of the file, where + * Emacs will automagically detect them. + * --------------------------------------------------------------------- + * Local variables: + * mode: c + * indent-tabs-mode: t + * c-basic-offset: 4 + * tab-width: 4 + * End: + */ diff --git a/toolbox/memory.c b/toolbox/memory.c index c0c937b4c..4766f4c78 100644 --- a/toolbox/memory.c +++ b/toolbox/memory.c @@ -26,7 +26,7 @@ Authors: Reinhard Grafl - $Id: memory.c 799 2003-12-16 22:30:41Z edwin $ + $Id: memory.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -39,7 +39,7 @@ #include #include "global.h" -#include "loging.h" +#include "logging.h" #include "memory.h" diff --git a/typeinfo.c b/typeinfo.c index 6fdbc2274..bc3d87163 100644 --- a/typeinfo.c +++ b/typeinfo.c @@ -26,7 +26,7 @@ Authors: Edwin Steiner - $Id: typeinfo.c 1035 2004-04-26 16:26:35Z twisti $ + $Id: typeinfo.c 1067 2004-05-18 10:25:51Z stefan $ */ @@ -36,7 +36,7 @@ #include "typeinfo.h" #include "tables.h" #include "loader.h" -#include "toolbox/loging.h" +#include "toolbox/logging.h" #include "toolbox/memory.h" #include "jit/jit.h" /* XXX move typeinfo.* into jit/ */ -- 2.25.1