* src/vmcore/classcache.c (toolbox/logging.h): Added.

(classcache_merge_class_entries): Replace log_text with log_println.
(classcache_store): Likewise.
(classcache_store_defined): Likewise.

diff --git a/src/vmcore/classcache.c b/src/vmcore/classcache.c
index c2d53ed455bfa0c3e9884667a7b5ed235edf3cb0..5ac92e03eb73d2be0c4e8276c82f397dbed8a3d9 100644 (file)
--- a/src/vmcore/classcache.c
+++ b/src/vmcore/classcache.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: classcache.c 7246 2007-01-29 18:49:05Z twisti $
+   $Id: classcache.c 7426 2007-02-28 23:57:39Z twisti $
 
 */
 
@@ -40,6 +40,7 @@
 #endif
 
 #include "toolbox/hashtable.h"
+#include "toolbox/logging.h"
 
 #include "vm/exceptions.h"
 
@@ -140,7 +141,7 @@
 /* DEBUG HELPERS                                                              */
 /*============================================================================*/
 
-/*#define CLASSCACHE_VERBOSE*/
+/* #define CLASSCACHE_VERBOSE */
 
 /*============================================================================*/
 /* STATISTICS                                                                 */
@@ -397,7 +398,7 @@ static void classcache_merge_class_entries(classcache_name_entry *en,
                utf_cat_classname(logbuffer, clsenA->classobj->name);
        if (clsenB->classobj)
                utf_cat_classname(logbuffer, clsenB->classobj->name);
-       log_text(logbuffer);
+       log_println(logbuffer);
 #endif
 
        CLASSCACHE_COUNT(stat_merge_class_entries);
@@ -760,7 +761,7 @@ classinfo *classcache_store(classloader *initloader, classinfo *cls,
        sprintf(logbuffer,"classcache_store (%p,%d,%p=", (void*)initloader,mayfree,(void*)cls);
        utf_cat_classname(logbuffer, cls->name);
        strcat(logbuffer,")");
-       log_text(logbuffer);
+       log_println(logbuffer);
 #endif
 
        en = classcache_new_name(cls->name);
@@ -777,7 +778,7 @@ classinfo *classcache_store(classloader *initloader, classinfo *cls,
                                        /* A class with the same (initloader,name) pair has been stored already. */
                                        /* We free the given class and return the earlier one.                   */
 #ifdef CLASSCACHE_VERBOSE
-                                       dolog("replacing %p with earlier loaded class %p",cls,clsen->classobj);
+                                       log_println("replacing %p with earlier loaded class %p",cls,clsen->classobj);
 #endif
                                        assert(clsen->classobj);
                                        if (mayfree)
@@ -944,7 +945,7 @@ classinfo *classcache_store_defined(classinfo *cls)
        sprintf(logbuffer,"classcache_store_defined (%p,", (void*)cls->classloader);
        utf_cat_classname(logbuffer, cls->name);
        strcat(logbuffer,")");
-       log_text(logbuffer);
+       log_println(logbuffer);
 #endif
 
        en = classcache_new_name(cls->name);
@@ -960,7 +961,7 @@ classinfo *classcache_store_defined(classinfo *cls)
                        /* (if it is a different classinfo)                     */
                        if (clsen->classobj != cls) {
 #ifdef CLASSCACHE_VERBOSE
-                               dolog("replacing %p with earlier defined class %p",cls,clsen->classobj);
+                               log_println("replacing %p with earlier defined class %p",cls,clsen->classobj);
 #endif
                                class_free(cls);
                                cls = clsen->classobj;