* src/vmcore/linker.c (build_display): Removed superfluous recursion; return

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

diff --git a/src/vmcore/classcache.c b/src/vmcore/classcache.c
index 1a9c7d8699e8ed896dd3f1f93021247a2b96f35c..76fc8255f7b7832f9584e6caa0e101e516d4536b 100644 (file)
--- a/src/vmcore/classcache.c
+++ b/src/vmcore/classcache.c
@@ -1,9 +1,7 @@
 /* src/vmcore/classcache.c - loaded class cache and loading constraints
 
-   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.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: classcache.c 7435 2007-03-02 19:45:42Z edwin $
-
 */
 
 
@@ -35,9 +31,7 @@
 
 #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"
@@ -45,6 +39,7 @@
 #include "vm/exceptions.h"
 
 #include "vmcore/classcache.h"
+#include "vmcore/options.h"
 #include "vmcore/utf8.h"
 
 
@@ -229,7 +224,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
 
 
@@ -257,6 +252,8 @@ static void classcache_remove_class_entry(classcache_name_entry *en,
 
 bool classcache_init(void)
 {
+       TRACESUBSYSTEMINITIALIZATION("classcache_init");
+
        /* create the hashtable */
 
        hashtable_create(&hashtable_classcache, CLASSCACHE_INIT_SIZE);
@@ -264,9 +261,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 */
@@ -289,7 +286,7 @@ bool classcache_init(void)
 *******************************************************************************/
 
 static classcache_loader_entry * classcache_new_loader_entry(
-                                                                       classloader * loader,
+                                                                       classloader_t * loader,
                                                                        classcache_loader_entry * next)
 {
        classcache_loader_entry *lden;
@@ -575,7 +572,7 @@ static classcache_name_entry *classcache_new_name(utf *name)
    
 *******************************************************************************/
 
-classinfo *classcache_lookup(classloader *initloader, utf *classname)
+classinfo *classcache_lookup(classloader_t *initloader, utf *classname)
 {
        classcache_name_entry *en;
        classcache_class_entry *clsen;
@@ -627,7 +624,7 @@ classinfo *classcache_lookup(classloader *initloader, utf *classname)
    
 *******************************************************************************/
 
-classinfo *classcache_lookup_defined(classloader *defloader, utf *classname)
+classinfo *classcache_lookup_defined(classloader_t *defloader, utf *classname)
 {
        classcache_name_entry *en;
        classcache_class_entry *clsen;
@@ -673,7 +670,7 @@ classinfo *classcache_lookup_defined(classloader *defloader, utf *classname)
    
 *******************************************************************************/
 
-classinfo *classcache_lookup_defined_or_initiated(classloader *loader, 
+classinfo *classcache_lookup_defined_or_initiated(classloader_t *loader, 
                                                                                                  utf *classname)
 {
        classcache_name_entry *en;
@@ -741,7 +738,7 @@ classinfo *classcache_lookup_defined_or_initiated(classloader *loader,
    
 *******************************************************************************/
 
-classinfo *classcache_store(classloader *initloader, classinfo *cls,
+classinfo *classcache_store(classloader_t *initloader, classinfo *cls,
                                                        bool mayfree)
 {
        classcache_name_entry *en;
@@ -1007,7 +1004,7 @@ return_success:
 
 static classcache_class_entry * classcache_find_loader(
                                                                        classcache_name_entry * entry,
-                                                                       classloader * loader)
+                                                                       classloader_t * loader)
 {
        classcache_class_entry *clsen;
        classcache_loader_entry *lden;
@@ -1166,8 +1163,8 @@ void classcache_free(void)
 *******************************************************************************/
 
 #if defined(ENABLE_VERIFIER)
-bool classcache_add_constraint(classloader * a,
-                                                          classloader * b,
+bool classcache_add_constraint(classloader_t * a,
+                                                          classloader_t * b,
                                                           utf * classname)
 {
        classcache_name_entry *en;
@@ -1177,9 +1174,11 @@ bool classcache_add_constraint(classloader * a,
        assert(classname);
 
 #ifdef CLASSCACHE_VERBOSE
-       fprintf(stdout, "classcache_add_constraint(%p,%p,", (void *) a, (void *) b);
+       log_start();
+       log_print("classcache_add_constraint(%p,%p,", (void *) a, (void *) b);
        utf_fprint_printable_ascii_classname(stdout, classname);
-       fprintf(stdout, ")\n");
+       log_print(")\n");
+       log_finish();
 #endif
 
        /* a constraint with a == b is trivially satisfied */
@@ -1282,8 +1281,8 @@ bool classcache_add_constraint(classloader * a,
 *******************************************************************************/
 
 #if defined(ENABLE_VERIFIER)
-bool classcache_add_constraints_for_params(classloader * a,
-                                                                                  classloader * b,
+bool classcache_add_constraints_for_params(classloader_t * a,
+                                                                                  classloader_t * b,
                                                                                   methodinfo *m)
 {
        methoddesc *md;
@@ -1521,10 +1520,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);
@@ -1543,20 +1542,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();
                        }
                }