comparison src/share/vm/runtime/arguments.cpp @ 21513:d760a7d64801

Graal loader: load all .jar files (regardless of graal prefix)
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Wed, 06 May 2015 16:54:59 +0200
parents e121783a0df9
children 28cbfacd0518
comparison
equal deleted inserted replaced
21512:d1baf7d5230a 21513:d760a7d64801
3619 // This must be done after all -D arguments have been processed. 3619 // This must be done after all -D arguments have been processed.
3620 scp_p->expand_endorsed(); 3620 scp_p->expand_endorsed();
3621 3621
3622 #ifdef GRAAL 3622 #ifdef GRAAL
3623 if (!UseGraalClassLoader) { 3623 if (!UseGraalClassLoader) {
3624 // Append lib/graal/graal*.jar to boot class path 3624 // Append lib/graal/*.jar to boot class path
3625 char graalDir[JVM_MAXPATHLEN]; 3625 char graalDir[JVM_MAXPATHLEN];
3626 const char* fileSep = os::file_separator(); 3626 const char* fileSep = os::file_separator();
3627 jio_snprintf(graalDir, sizeof(graalDir), "%s%slib%sgraal", Arguments::get_java_home(), fileSep, fileSep); 3627 jio_snprintf(graalDir, sizeof(graalDir), "%s%slib%sgraal", Arguments::get_java_home(), fileSep, fileSep);
3628 DIR* dir = os::opendir(graalDir); 3628 DIR* dir = os::opendir(graalDir);
3629 if (dir != NULL) { 3629 if (dir != NULL) {
3630 struct dirent *entry; 3630 struct dirent *entry;
3631 char *dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(graalDir), mtInternal); 3631 char *dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(graalDir), mtInternal);
3632 while ((entry = os::readdir(dir, (dirent *) dbuf)) != NULL) { 3632 while ((entry = os::readdir(dir, (dirent *) dbuf)) != NULL) {
3633 const char* name = entry->d_name; 3633 const char* name = entry->d_name;
3634 const char* ext = name + strlen(name) - 4; 3634 const char* ext = name + strlen(name) - 4;
3635 if (ext > name && strcmp(ext, ".jar") == 0 3635 if (ext > name && strcmp(ext, ".jar") == 0) {
3636 && strlen(name) > strlen("graal")
3637 && strncmp(name, "graal", strlen("graal")) == 0) {
3638 char fileName[JVM_MAXPATHLEN]; 3636 char fileName[JVM_MAXPATHLEN];
3639 jio_snprintf(fileName, sizeof(fileName), "%s%s%s", graalDir, fileSep, name); 3637 jio_snprintf(fileName, sizeof(fileName), "%s%s%s", graalDir, fileSep, name);
3640 scp_p->add_suffix(fileName); 3638 scp_p->add_suffix(fileName);
3641 scp_assembly_required = true; 3639 scp_assembly_required = true;
3642 } 3640 }