* Removed all Id tags.

[cacao.git] / src / vmcore / classcache.c

diff --git a/src/vmcore/classcache.c b/src/vmcore/classcache.c
index c2d53ed455bfa0c3e9884667a7b5ed235edf3cb0..91e51a3919e693cb503786cd3c2b18a2778fa19c 100644 (file)
--- a/src/vmcore/classcache.c
+++ b/src/vmcore/classcache.c
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: classcache.c 7246 2007-01-29 18:49:05Z twisti $
-
 */
 
 
@@ -35,11 +33,10 @@
 
 #include "mm/memory.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "threads/lock-common.h"
 
 #include "toolbox/hashtable.h"
+#include "toolbox/logging.h"
 
 #include "vm/exceptions.h"
 
@@ -140,7 +137,7 @@
 /* DEBUG HELPERS                                                              */
 /*============================================================================*/
 
-/*#define CLASSCACHE_VERBOSE*/
+/* #define CLASSCACHE_VERBOSE */
 
 /*============================================================================*/
 /* STATISTICS                                                                 */
@@ -228,7 +225,7 @@ void classcache_print_statistics(FILE *file) {
 hashtable hashtable_classcache;
 
 #if defined(ENABLE_THREADS)
-static java_objectheader *lock_hashtable_classcache;
+static java_object_t *lock_hashtable_classcache;
 #endif
 
 
@@ -263,9 +260,9 @@ bool classcache_init(void)
 #if defined(ENABLE_THREADS)
        /* create utf hashtable lock object */
 
-       lock_hashtable_classcache = NEW(java_objectheader);
+       lock_hashtable_classcache = NEW(java_object_t);
 
-       lock_init_object_lock(lock_hashtable_classcache);
+       LOCK_INIT_OBJECT_LOCK(lock_hashtable_classcache);
 #endif
 
        /* everything's ok */
@@ -397,7 +394,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 +757,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 +774,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)
@@ -863,7 +860,7 @@ classinfo *classcache_store(classloader *initloader, classinfo *cls,
 
   return_success:
 #ifdef CLASSCACHE_VERBOSE
-       classcache_debug_dump(stderr,cls->name);
+       classcache_debug_dump(stdout,cls->name);
 #endif
        CLASSCACHE_UNLOCK();
        return cls;
@@ -944,7 +941,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 +957,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;
@@ -983,7 +980,7 @@ classinfo *classcache_store_defined(classinfo *cls)
 
 return_success:
 #ifdef CLASSCACHE_VERBOSE
-       classcache_debug_dump(stderr,cls->name);
+       classcache_debug_dump(stdout,cls->name);
 #endif
        CLASSCACHE_UNLOCK();
        return cls;
@@ -1176,9 +1173,11 @@ bool classcache_add_constraint(classloader * a,
        assert(classname);
 
 #ifdef CLASSCACHE_VERBOSE
-       fprintf(stderr, "classcache_add_constraint(%p,%p,", (void *) a, (void *) b);
-       utf_fprint_printable_ascii_classname(stderr, classname);
-       fprintf(stderr, ")\n");
+       log_start();
+       log_print("classcache_add_constraint(%p,%p,", (void *) a, (void *) b);
+       utf_fprint_printable_ascii_classname(stdout, classname);
+       log_print(")\n");
+       log_finish();
 #endif
 
        /* a constraint with a == b is trivially satisfied */
@@ -1520,10 +1519,10 @@ void classcache_debug_dump(FILE * file,utf *only)
 
        CLASSCACHE_LOCK();
 
-       fprintf(file, "\n=== [loaded class cache] =====================================\n\n");
-       fprintf(file, "hash size   : %d\n", (int) hashtable_classcache.size);
-       fprintf(file, "hash entries: %d\n", (int) hashtable_classcache.entries);
-       fprintf(file, "\n");
+       log_println("=== [loaded class cache] =====================================");
+       log_println("hash size   : %d", (int) hashtable_classcache.size);
+       log_println("hash entries: %d", (int) hashtable_classcache.entries);
+       log_println("");
 
        if (only) {
                c = classcache_lookup_name(only);
@@ -1542,20 +1541,25 @@ dump_it:
                        /* iterate over all class entries */
                        for (clsen = c->classes; clsen; clsen = clsen->next) {
                                if (clsen->classobj) {
-                                       fprintf(file, "    loaded %p\n", (void *) clsen->classobj);
+                                       log_println("    loaded %p", (void *) clsen->classobj);
                                }
                                else {
-                                       fprintf(file, "    unresolved\n");
+                                       log_println("    unresolved");
                                }
-                               fprintf(file, "        loaders:");
+
+                               log_start();
+                               log_print("        loaders: ");
                                for (lden = clsen->loaders; lden; lden = lden->next) {
-                                       fprintf(file, "<%p> %p", (void *) lden, (void *) lden->loader);
+                                       log_print("<%p> %p ", (void *) lden, (void *) lden->loader);
                                }
-                               fprintf(file, "\n        constraints:");
+                               log_finish();
+
+                               log_start();
+                               log_print("        constraints: ");
                                for (lden = clsen->constraints; lden; lden = lden->next) {
-                                       fprintf(file, "<%p> %p", (void *) lden, (void *) lden->loader);
+                                       log_print("<%p> %p ", (void *) lden, (void *) lden->loader);
                                }
-                               fprintf(file, "\n");
+                               log_finish();
                        }
                }