hotspot/src/share/vm/classfile/modules.cpp
author hseigel
Fri, 20 Jan 2017 16:09:56 -0500
changeset 43471 bfb383279a16
parent 43466 add500644443
child 44326 6c59cca7ff07
child 46289 1904e7ec236e
permissions -rw-r--r--
8171971: Fix timing bug in JVM management of package export lists Summary: Reduce the number of fields that maintain export state and use Module_lock to access these fields Reviewed-by: acorn, sspitsyn, lfoltan
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
     1
/*
43471
bfb383279a16 8171971: Fix timing bug in JVM management of package export lists
hseigel
parents: 43466
diff changeset
     2
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
     3
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
     4
*
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
     5
* This code is free software; you can redistribute it and/or modify it
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
     6
* under the terms of the GNU General Public License version 2 only, as
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
     7
* published by the Free Software Foundation.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
     8
*
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
     9
* This code is distributed in the hope that it will be useful, but WITHOUT
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    10
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    11
* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    12
* version 2 for more details (a copy is included in the LICENSE file that
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    13
* accompanied this code).
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    14
*
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    15
* You should have received a copy of the GNU General Public License version
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    16
* 2 along with this work; if not, write to the Free Software Foundation,
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    17
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    18
*
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    19
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    20
* or visit www.oracle.com if you need additional information or have any
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    21
* questions.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    22
*
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    23
*/
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    24
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    25
#include "precompiled.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    26
#include "classfile/classFileParser.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    27
#include "classfile/classLoader.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    28
#include "classfile/classLoaderData.inline.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    29
#include "classfile/javaAssertions.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    30
#include "classfile/javaClasses.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    31
#include "classfile/javaClasses.inline.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    32
#include "classfile/moduleEntry.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    33
#include "classfile/modules.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    34
#include "classfile/packageEntry.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    35
#include "classfile/stringTable.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    36
#include "classfile/symbolTable.hpp"
42307
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
    37
#include "classfile/systemDictionary.hpp"
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    38
#include "classfile/vmSymbols.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    39
#include "logging/log.hpp"
37248
11a660dbbb8e 8132524: Missing includes to resourceArea.hpp
jprovino
parents: 37242
diff changeset
    40
#include "memory/resourceArea.hpp"
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    41
#include "oops/instanceKlass.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    42
#include "runtime/arguments.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    43
#include "runtime/handles.inline.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    44
#include "runtime/javaCalls.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    45
#include "runtime/reflection.hpp"
42307
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
    46
#include "utilities/stringUtils.hpp"
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    47
#include "utilities/utf8.hpp"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    48
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
    49
static bool verify_module_name(const char *module_name) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    50
  if (module_name == NULL) return false;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    51
  int len = (int)strlen(module_name);
42630
ae91fbc4b59f 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42307
diff changeset
    52
  return (len > 0 && len <= Symbol::max_length());
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    53
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    54
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
    55
bool Modules::verify_package_name(const char* package_name) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    56
  if (package_name == NULL) return false;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    57
  int len = (int)strlen(package_name);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    58
  return (len > 0 && len <= Symbol::max_length() &&
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
    59
    UTF8::is_legal_utf8((const unsigned char *)package_name, len, false) &&
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    60
    ClassFileParser::verify_unqualified_name(package_name, len,
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    61
    ClassFileParser::LegalClass));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    62
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    63
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    64
static char* get_module_name(oop module, TRAPS) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    65
  oop name_oop = java_lang_reflect_Module::name(module);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    66
  if (name_oop == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    67
    THROW_MSG_NULL(vmSymbols::java_lang_NullPointerException(), "Null module name");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    68
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    69
  char* module_name = java_lang_String::as_utf8_string(name_oop);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    70
  if (!verify_module_name(module_name)) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    71
    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    72
                   err_msg("Invalid module name: %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    73
                           module_name != NULL ? module_name : "NULL"));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    74
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    75
  return module_name;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    76
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    77
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    78
static const char* get_module_version(jstring version) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    79
  if (version == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    80
    return NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    81
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    82
  return java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(version));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    83
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    84
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    85
static ModuleEntryTable* get_module_entry_table(Handle h_loader, TRAPS) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    86
  // This code can be called during start-up, before the classLoader's classLoader data got
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    87
  // created.  So, call register_loader() to make sure the classLoader data gets created.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    88
  ClassLoaderData *loader_cld = SystemDictionary::register_loader(h_loader, CHECK_NULL);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    89
  return loader_cld->modules();
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    90
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    91
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    92
static PackageEntryTable* get_package_entry_table(Handle h_loader, TRAPS) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    93
  // This code can be called during start-up, before the classLoader's classLoader data got
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    94
  // created.  So, call register_loader() to make sure the classLoader data gets created.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    95
  ClassLoaderData *loader_cld = SystemDictionary::register_loader(h_loader, CHECK_NULL);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    96
  return loader_cld->packages();
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    97
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    98
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
    99
static ModuleEntry* get_module_entry(jobject module, TRAPS) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   100
  Handle module_h(THREAD, JNIHandles::resolve(module));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   101
  if (!java_lang_reflect_Module::is_instance(module_h())) {
40020
20738e6bef83 8160487: JVM should validate a module by checking for an instance of java.lang.reflect.Module
lfoltan
parents: 40013
diff changeset
   102
    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
20738e6bef83 8160487: JVM should validate a module by checking for an instance of java.lang.reflect.Module
lfoltan
parents: 40013
diff changeset
   103
                   "module is not an instance of type java.lang.reflect.Module");
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   104
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   105
  return java_lang_reflect_Module::module_entry(module_h(), CHECK_NULL);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   106
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   107
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   108
static PackageEntry* get_package_entry(ModuleEntry* module_entry, const char* package_name, TRAPS) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   109
  ResourceMark rm(THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   110
  if (package_name == NULL) return NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   111
  TempNewSymbol pkg_symbol = SymbolTable::new_symbol(package_name, CHECK_NULL);
39616
f82b1f888578 8159262: Walking PackageEntry Export and ModuleEntry Reads Must Occur Only When Neccessary And Wait Until ClassLoader's Aliveness Determined
lfoltan
parents: 39290
diff changeset
   112
  PackageEntryTable* package_entry_table = module_entry->loader_data()->packages();
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   113
  assert(package_entry_table != NULL, "Unexpected null package entry table");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   114
  return package_entry_table->lookup_only(pkg_symbol);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   115
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   116
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   117
static PackageEntry* get_package_entry_by_name(Symbol* package,
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   118
                                               Handle h_loader,
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   119
                                               TRAPS) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   120
  if (package != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   121
    ResourceMark rm(THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   122
    if (Modules::verify_package_name(package->as_C_string())) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   123
      PackageEntryTable* const package_entry_table =
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   124
        get_package_entry_table(h_loader, CHECK_NULL);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   125
      assert(package_entry_table != NULL, "Unexpected null package entry table");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   126
      return package_entry_table->lookup_only(package);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   127
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   128
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   129
  return NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   130
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   131
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   132
bool Modules::is_package_defined(Symbol* package, Handle h_loader, TRAPS) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   133
  PackageEntry* res = get_package_entry_by_name(package, h_loader, CHECK_false);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   134
  return res != NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   135
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   136
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   137
static void define_javabase_module(jobject module, jstring version,
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   138
                                   jstring location, const char* const* packages,
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   139
                                   jsize num_packages, TRAPS) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   140
  ResourceMark rm(THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   141
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   142
  Handle module_handle(THREAD, JNIHandles::resolve(module));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   143
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   144
  // Obtain java.base's module version
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   145
  const char* module_version = get_module_version(version);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   146
  TempNewSymbol version_symbol;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   147
  if (module_version != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   148
    version_symbol = SymbolTable::new_symbol(module_version, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   149
  } else {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   150
    version_symbol = NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   151
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   152
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   153
  // Obtain java.base's location
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   154
  const char* module_location = NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   155
  TempNewSymbol location_symbol = NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   156
  if (location != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   157
    module_location =
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   158
      java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(location));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   159
    if (module_location != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   160
      location_symbol = SymbolTable::new_symbol(module_location, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   161
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   162
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   163
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   164
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   165
  // Check that the list of packages has no duplicates and that the
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   166
  // packages are syntactically ok.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   167
  GrowableArray<Symbol*>* pkg_list = new GrowableArray<Symbol*>(num_packages);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   168
  for (int x = 0; x < num_packages; x++) {
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   169
    const char *package_name = packages[x];
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   170
    if (!Modules::verify_package_name(package_name)) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   171
      THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
42636
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   172
                err_msg("Invalid package name: %s for module: " JAVA_BASE_NAME, package_name));
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   173
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   174
    Symbol* pkg_symbol = SymbolTable::new_symbol(package_name, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   175
    // append_if_missing() returns FALSE if entry already exists.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   176
    if (!pkg_list->append_if_missing(pkg_symbol)) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   177
      THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
42636
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   178
                err_msg("Duplicate package name: %s for module " JAVA_BASE_NAME,
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   179
                        package_name));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   180
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   181
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   182
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   183
  // Validate java_base's loader is the boot loader.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   184
  oop loader = java_lang_reflect_Module::loader(module_handle());
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   185
  if (loader != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   186
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   187
              "Class loader must be the boot class loader");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   188
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   189
  Handle h_loader = Handle(THREAD, loader);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   190
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   191
  // Ensure the boot loader's PackageEntryTable has been created
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   192
  PackageEntryTable* package_table = get_package_entry_table(h_loader, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   193
  assert(pkg_list->length() == 0 || package_table != NULL, "Bad package_table");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   194
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   195
  // Ensure java.base's ModuleEntry has been created
42636
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   196
  assert(ModuleEntryTable::javabase_moduleEntry() != NULL, "No ModuleEntry for " JAVA_BASE_NAME);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   197
38732
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   198
  bool duplicate_javabase = false;
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   199
  {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   200
    MutexLocker m1(Module_lock, THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   201
38014
8731fa11f766 8152949: Jigsaw crash when Klass in _fixup_module_field_list is unloaded
lfoltan
parents: 37248
diff changeset
   202
    if (ModuleEntryTable::javabase_defined()) {
38732
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   203
      duplicate_javabase = true;
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   204
    } else {
38014
8731fa11f766 8152949: Jigsaw crash when Klass in _fixup_module_field_list is unloaded
lfoltan
parents: 37248
diff changeset
   205
38732
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   206
      // Verify that all java.base packages created during bootstrapping are in
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   207
      // pkg_list.  If any are not in pkg_list, than a non-java.base class was
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   208
      // loaded erroneously pre java.base module definition.
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   209
      package_table->verify_javabase_packages(pkg_list);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   210
38732
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   211
      // loop through and add any new packages for java.base
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   212
      PackageEntry* pkg;
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   213
      for (int x = 0; x < pkg_list->length(); x++) {
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   214
        // Some of java.base's packages were added early in bootstrapping, ignore duplicates.
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   215
        if (package_table->lookup_only(pkg_list->at(x)) == NULL) {
41183
207b92e69457 8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents: 40020
diff changeset
   216
          pkg = package_table->locked_create_entry_or_null(pkg_list->at(x), ModuleEntryTable::javabase_moduleEntry());
42636
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   217
          assert(pkg != NULL, "Unable to create a " JAVA_BASE_NAME " package entry");
38732
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   218
        }
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   219
        // Unable to have a GrowableArray of TempNewSymbol.  Must decrement the refcount of
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   220
        // the Symbol* that was created above for each package. The refcount was incremented
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   221
        // by SymbolTable::new_symbol and as well by the PackageEntry creation.
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   222
        pkg_list->at(x)->decrement_refcount();
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   223
      }
38732
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   224
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   225
      // Finish defining java.base's ModuleEntry
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   226
      ModuleEntryTable::finalize_javabase(module_handle, version_symbol, location_symbol);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   227
    }
38732
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   228
  }
bb77e0dcc7e5 8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents: 38207
diff changeset
   229
  if (duplicate_javabase) {
43446
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   230
    THROW_MSG(vmSymbols::java_lang_InternalError(),
42636
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   231
              "Module " JAVA_BASE_NAME " is already defined");
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   232
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   233
41691
1be281ee5de4 8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents: 41183
diff changeset
   234
  // Only the thread that actually defined the base module will get here,
1be281ee5de4 8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents: 41183
diff changeset
   235
  // so no locking is needed.
1be281ee5de4 8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents: 41183
diff changeset
   236
1be281ee5de4 8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents: 41183
diff changeset
   237
  // Patch any previously loaded class's module field with java.base's java.lang.reflect.Module.
1be281ee5de4 8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents: 41183
diff changeset
   238
  ModuleEntryTable::patch_javabase_entries(module_handle);
1be281ee5de4 8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents: 41183
diff changeset
   239
42636
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   240
  log_debug(modules)("define_javabase_module(): Definition of module: "
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   241
                     JAVA_BASE_NAME ", version: %s, location: %s, package #: %d",
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   242
                     module_version != NULL ? module_version : "NULL",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   243
                     module_location != NULL ? module_location : "NULL",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   244
                     pkg_list->length());
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   245
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   246
  // packages defined to java.base
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   247
  for (int x = 0; x < pkg_list->length(); x++) {
42636
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   248
    log_trace(modules)("define_javabase_module(): creation of package %s for module " JAVA_BASE_NAME,
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   249
                       (pkg_list->at(x))->as_C_string());
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   250
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   251
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   252
43446
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   253
// Caller needs ResourceMark.
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   254
void throw_dup_pkg_exception(const char* module_name, PackageEntry* package, TRAPS) {
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   255
  const char* package_name = package->name()->as_C_string();
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   256
  if (package->module()->is_named()) {
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   257
    THROW_MSG(vmSymbols::java_lang_IllegalStateException(),
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   258
      err_msg("Package %s for module %s is already in another module, %s, defined to the class loader",
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   259
              package_name, module_name, package->module()->name()->as_C_string()));
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   260
  } else {
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   261
    THROW_MSG(vmSymbols::java_lang_IllegalStateException(),
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   262
      err_msg("Package %s for module %s is already in the unnamed module defined to the class loader",
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   263
              package_name, module_name));
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   264
  }
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   265
}
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   266
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   267
void Modules::define_module(jobject module, jstring version,
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   268
                            jstring location, const char* const* packages,
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   269
                            jsize num_packages, TRAPS) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   270
  ResourceMark rm(THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   271
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   272
  if (module == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   273
    THROW_MSG(vmSymbols::java_lang_NullPointerException(), "Null module object");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   274
  }
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   275
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   276
  if (num_packages < 0) {
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   277
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   278
              "num_packages must be >= 0");
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   279
  }
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   280
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   281
  if (packages == NULL && num_packages > 0) {
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   282
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   283
              "num_packages should be zero if packages is null");
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   284
  }
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   285
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   286
  Handle module_handle(THREAD, JNIHandles::resolve(module));
40020
20738e6bef83 8160487: JVM should validate a module by checking for an instance of java.lang.reflect.Module
lfoltan
parents: 40013
diff changeset
   287
  if (!java_lang_reflect_Module::is_instance(module_handle())) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   288
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
40020
20738e6bef83 8160487: JVM should validate a module by checking for an instance of java.lang.reflect.Module
lfoltan
parents: 40013
diff changeset
   289
              "module is not an instance of type java.lang.reflect.Module");
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   290
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   291
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   292
  char* module_name = get_module_name(module_handle(), CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   293
  if (module_name == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   294
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   295
              "Module name cannot be null");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   296
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   297
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   298
  // Special handling of java.base definition
42636
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   299
  if (strcmp(module_name, JAVA_BASE_NAME) == 0) {
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   300
    define_javabase_module(module, version, location, packages, num_packages, CHECK);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   301
    return;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   302
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   303
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   304
  const char* module_version = get_module_version(version);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   305
42307
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   306
  oop loader = java_lang_reflect_Module::loader(module_handle());
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   307
  // Make sure loader is not the jdk.internal.reflect.DelegatingClassLoader.
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   308
  if (loader != java_lang_ClassLoader::non_reflection_class_loader(loader)) {
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   309
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   310
              "Class loader is an invalid delegating class loader");
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   311
  }
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   312
  Handle h_loader = Handle(THREAD, loader);
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   313
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   314
  // Check that the list of packages has no duplicates and that the
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   315
  // packages are syntactically ok.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   316
  GrowableArray<Symbol*>* pkg_list = new GrowableArray<Symbol*>(num_packages);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   317
  for (int x = 0; x < num_packages; x++) {
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   318
    const char* package_name = packages[x];
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   319
    if (!verify_package_name(package_name)) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   320
      THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   321
                err_msg("Invalid package name: %s for module: %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   322
                        package_name, module_name));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   323
    }
42307
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   324
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   325
    // Only modules defined to either the boot or platform class loader, can define a "java/" package.
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   326
    if (!h_loader.is_null() &&
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   327
        !SystemDictionary::is_platform_class_loader(h_loader) &&
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   328
        strncmp(package_name, JAVAPKG, JAVAPKG_LEN) == 0) {
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   329
      const char* class_loader_name = SystemDictionary::loader_name(h_loader());
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   330
      size_t pkg_len = strlen(package_name);
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   331
      char* pkg_name = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, pkg_len);
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   332
      strncpy(pkg_name, package_name, pkg_len);
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   333
      StringUtils::replace_no_expand(pkg_name, "/", ".");
42307
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   334
      const char* msg_text1 = "Class loader (instance of): ";
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   335
      const char* msg_text2 = " tried to define prohibited package name: ";
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   336
      size_t len = strlen(msg_text1) + strlen(class_loader_name) + strlen(msg_text2) + pkg_len + 1;
42307
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   337
      char* message = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len);
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   338
      jio_snprintf(message, len, "%s%s%s%s", msg_text1, class_loader_name, msg_text2, pkg_name);
42307
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   339
      THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), message);
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   340
    }
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   341
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   342
    Symbol* pkg_symbol = SymbolTable::new_symbol(package_name, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   343
    // append_if_missing() returns FALSE if entry already exists.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   344
    if (!pkg_list->append_if_missing(pkg_symbol)) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   345
      THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   346
                err_msg("Duplicate package name: %s for module %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   347
                        package_name, module_name));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   348
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   349
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   350
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   351
  ModuleEntryTable* module_table = get_module_entry_table(h_loader, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   352
  assert(module_table != NULL, "module entry table shouldn't be null");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   353
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   354
  // Create symbol* entry for module name.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   355
  TempNewSymbol module_symbol = SymbolTable::new_symbol(module_name, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   356
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   357
  bool dupl_modules = false;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   358
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   359
  // Create symbol* entry for module version.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   360
  TempNewSymbol version_symbol;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   361
  if (module_version != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   362
    version_symbol = SymbolTable::new_symbol(module_version, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   363
  } else {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   364
    version_symbol = NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   365
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   366
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   367
  // Create symbol* entry for module location.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   368
  const char* module_location = NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   369
  TempNewSymbol location_symbol = NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   370
  if (location != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   371
    module_location =
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   372
      java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(location));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   373
    if (module_location != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   374
      location_symbol = SymbolTable::new_symbol(module_location, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   375
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   376
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   377
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   378
  ClassLoaderData* loader_data = ClassLoaderData::class_loader_data_or_null(h_loader());
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   379
  assert(loader_data != NULL, "class loader data shouldn't be null");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   380
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   381
  PackageEntryTable* package_table = NULL;
43446
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   382
  PackageEntry* existing_pkg = NULL;
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   383
  {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   384
    MutexLocker ml(Module_lock, THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   385
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   386
    if (num_packages > 0) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   387
      package_table = get_package_entry_table(h_loader, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   388
      assert(package_table != NULL, "Missing package_table");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   389
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   390
      // Check that none of the packages exist in the class loader's package table.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   391
      for (int x = 0; x < pkg_list->length(); x++) {
43446
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   392
        existing_pkg = package_table->lookup_only(pkg_list->at(x));
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   393
        if (existing_pkg != NULL) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   394
          // This could be because the module was already defined.  If so,
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   395
          // report that error instead of the package error.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   396
          if (module_table->lookup_only(module_symbol) != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   397
            dupl_modules = true;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   398
          }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   399
          break;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   400
        }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   401
      }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   402
    }  // if (num_packages > 0)...
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   403
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   404
    // Add the module and its packages.
43446
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   405
    if (!dupl_modules && existing_pkg == NULL) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   406
      // Create the entry for this module in the class loader's module entry table.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   407
      ModuleEntry* module_entry = module_table->locked_create_entry_or_null(module_handle, module_symbol,
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   408
                                    version_symbol, location_symbol, loader_data);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   409
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   410
      if (module_entry == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   411
        dupl_modules = true;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   412
      } else {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   413
        // Add the packages.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   414
        assert(pkg_list->length() == 0 || package_table != NULL, "Bad package table");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   415
        PackageEntry* pkg;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   416
        for (int y = 0; y < pkg_list->length(); y++) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   417
          pkg = package_table->locked_create_entry_or_null(pkg_list->at(y), module_entry);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   418
          assert(pkg != NULL, "Unable to create a module's package entry");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   419
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   420
          // Unable to have a GrowableArray of TempNewSymbol.  Must decrement the refcount of
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   421
          // the Symbol* that was created above for each package. The refcount was incremented
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   422
          // by SymbolTable::new_symbol and as well by the PackageEntry creation.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   423
          pkg_list->at(y)->decrement_refcount();
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   424
        }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   425
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   426
        // Store pointer to ModuleEntry record in java.lang.reflect.Module object.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   427
        java_lang_reflect_Module::set_module_entry(module_handle(), module_entry);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   428
      }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   429
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   430
  }  // Release the lock
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   431
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   432
  // any errors ?
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   433
  if (dupl_modules) {
43446
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   434
     THROW_MSG(vmSymbols::java_lang_IllegalStateException(),
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   435
               err_msg("Module %s is already defined", module_name));
43446
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   436
  } else if (existing_pkg != NULL) {
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   437
      throw_dup_pkg_exception(module_name, existing_pkg, CHECK);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   438
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   439
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   440
  if (log_is_enabled(Debug, modules)) {
37242
91e5f98fff6f 8152632: Rename LogHandle(...) to Log(...)
stefank
parents: 36508
diff changeset
   441
    outputStream* logst = Log(modules)::debug_stream();
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   442
    logst->print("define_module(): creation of module: %s, version: %s, location: %s, ",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   443
                 module_name, module_version != NULL ? module_version : "NULL",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   444
                 module_location != NULL ? module_location : "NULL");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   445
    loader_data->print_value_on(logst);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   446
    logst->print_cr(", package #: %d", pkg_list->length());
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   447
    for (int y = 0; y < pkg_list->length(); y++) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   448
      log_trace(modules)("define_module(): creation of package %s for module %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   449
                         (pkg_list->at(y))->as_C_string(), module_name);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   450
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   451
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   452
37773
e5b3e9732c3c 8154956: Module system implementation refresh (4/2016)
alanb
parents: 37248
diff changeset
   453
  // If the module is defined to the boot loader and an exploded build is being
e5b3e9732c3c 8154956: Module system implementation refresh (4/2016)
alanb
parents: 37248
diff changeset
   454
  // used, prepend <java.home>/modules/modules_name, if it exists, to the system boot class path.
e5b3e9732c3c 8154956: Module system implementation refresh (4/2016)
alanb
parents: 37248
diff changeset
   455
  if (loader == NULL &&
e5b3e9732c3c 8154956: Module system implementation refresh (4/2016)
alanb
parents: 37248
diff changeset
   456
      !Universe::is_module_initialized() &&
40013
943cf01a6b82 8154239: -Xbootclasspath/a breaks exploded build
lfoltan
parents: 39706
diff changeset
   457
      !ClassLoader::has_jrt_entry()) {
943cf01a6b82 8154239: -Xbootclasspath/a breaks exploded build
lfoltan
parents: 39706
diff changeset
   458
    ClassLoader::add_to_exploded_build_list(module_symbol, CHECK);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   459
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   460
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   461
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   462
void Modules::set_bootloader_unnamed_module(jobject module, TRAPS) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   463
  ResourceMark rm(THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   464
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   465
  if (module == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   466
    THROW_MSG(vmSymbols::java_lang_NullPointerException(), "Null module object");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   467
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   468
  Handle module_handle(THREAD, JNIHandles::resolve(module));
40020
20738e6bef83 8160487: JVM should validate a module by checking for an instance of java.lang.reflect.Module
lfoltan
parents: 40013
diff changeset
   469
  if (!java_lang_reflect_Module::is_instance(module_handle())) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   470
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
40020
20738e6bef83 8160487: JVM should validate a module by checking for an instance of java.lang.reflect.Module
lfoltan
parents: 40013
diff changeset
   471
              "module is not an instance of type java.lang.reflect.Module");
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   472
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   473
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   474
  // Ensure that this is an unnamed module
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   475
  oop name = java_lang_reflect_Module::name(module_handle());
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   476
  if (name != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   477
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   478
              "boot loader's unnamed module's java.lang.reflect.Module has a name");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   479
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   480
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   481
  // Validate java_base's loader is the boot loader.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   482
  oop loader = java_lang_reflect_Module::loader(module_handle());
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   483
  if (loader != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   484
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   485
              "Class loader must be the boot class loader");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   486
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   487
  Handle h_loader = Handle(THREAD, loader);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   488
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   489
  log_debug(modules)("set_bootloader_unnamed_module(): recording unnamed module for boot loader");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   490
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   491
  // Ensure the boot loader's PackageEntryTable has been created
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   492
  ModuleEntryTable* module_table = get_module_entry_table(h_loader, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   493
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   494
  // Set java.lang.reflect.Module for the boot loader's unnamed module
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   495
  ModuleEntry* unnamed_module = module_table->unnamed_module();
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   496
  assert(unnamed_module != NULL, "boot loader's unnamed ModuleEntry not defined");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   497
  unnamed_module->set_module(ClassLoaderData::the_null_class_loader_data()->add_handle(module_handle));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   498
  // Store pointer to the ModuleEntry in the unnamed module's java.lang.reflect.Module object.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   499
  java_lang_reflect_Module::set_module_entry(module_handle(), unnamed_module);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   500
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   501
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   502
void Modules::add_module_exports(jobject from_module, const char* package_name, jobject to_module, TRAPS) {
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   503
  if (package_name == NULL) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   504
    THROW_MSG(vmSymbols::java_lang_NullPointerException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   505
              "package is null");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   506
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   507
  if (from_module == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   508
    THROW_MSG(vmSymbols::java_lang_NullPointerException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   509
              "from_module is null");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   510
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   511
  ModuleEntry* from_module_entry = get_module_entry(from_module, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   512
  if (from_module_entry == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   513
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   514
              "from_module cannot be found");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   515
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   516
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   517
  // All packages in unnamed are exported by default.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   518
  if (!from_module_entry->is_named()) return;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   519
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   520
  ModuleEntry* to_module_entry;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   521
  if (to_module == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   522
    to_module_entry = NULL;  // It's an unqualified export.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   523
  } else {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   524
    to_module_entry = get_module_entry(to_module, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   525
    if (to_module_entry == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   526
      THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   527
                "to_module is invalid");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   528
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   529
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   530
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   531
  PackageEntry *package_entry = get_package_entry(from_module_entry, package_name, CHECK);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   532
  ResourceMark rm(THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   533
  if (package_entry == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   534
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   535
              err_msg("Package %s not found in from_module %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   536
                      package_name != NULL ? package_name : "",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   537
                      from_module_entry->name()->as_C_string()));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   538
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   539
  if (package_entry->module() != from_module_entry) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   540
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   541
              err_msg("Package: %s found in module %s, not in from_module: %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   542
                      package_entry->name()->as_C_string(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   543
                      package_entry->module()->name()->as_C_string(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   544
                      from_module_entry->name()->as_C_string()));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   545
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   546
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   547
  log_debug(modules)("add_module_exports(): package %s in module %s is exported to module %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   548
                     package_entry->name()->as_C_string(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   549
                     from_module_entry->name()->as_C_string(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   550
                     to_module_entry == NULL ? "NULL" :
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   551
                      to_module_entry->is_named() ?
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   552
                        to_module_entry->name()->as_C_string() : UNNAMED_MODULE);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   553
39290
0cc9f5028562 8156871: Possible concurrency issue with JVM_AddModuleExports
lfoltan
parents: 38733
diff changeset
   554
  // Do nothing if modules are the same.
0cc9f5028562 8156871: Possible concurrency issue with JVM_AddModuleExports
lfoltan
parents: 38733
diff changeset
   555
  if (from_module_entry != to_module_entry) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   556
    package_entry->set_exported(to_module_entry);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   557
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   558
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   559
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   560
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   561
void Modules::add_module_exports_qualified(jobject from_module, const char* package,
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   562
                                           jobject to_module, TRAPS) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   563
  if (to_module == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   564
    THROW_MSG(vmSymbols::java_lang_NullPointerException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   565
              "to_module is null");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   566
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   567
  add_module_exports(from_module, package, to_module, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   568
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   569
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   570
void Modules::add_reads_module(jobject from_module, jobject to_module, TRAPS) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   571
  if (from_module == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   572
    THROW_MSG(vmSymbols::java_lang_NullPointerException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   573
              "from_module is null");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   574
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   575
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   576
  ModuleEntry* from_module_entry = get_module_entry(from_module, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   577
  if (from_module_entry == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   578
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   579
              "from_module is not valid");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   580
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   581
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   582
  ModuleEntry* to_module_entry;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   583
  if (to_module != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   584
    to_module_entry = get_module_entry(to_module, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   585
    if (to_module_entry == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   586
      THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   587
                "to_module is invalid");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   588
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   589
  } else {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   590
    to_module_entry = NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   591
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   592
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   593
  ResourceMark rm(THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   594
  log_debug(modules)("add_reads_module(): Adding read from module %s to module %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   595
                     from_module_entry->is_named() ?
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   596
                     from_module_entry->name()->as_C_string() : UNNAMED_MODULE,
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   597
                     to_module_entry == NULL ? "all unnamed" :
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   598
                       (to_module_entry->is_named() ?
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   599
                        to_module_entry->name()->as_C_string() : UNNAMED_MODULE));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   600
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   601
  // if modules are the same or if from_module is unnamed then no need to add the read.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   602
  if (from_module_entry != to_module_entry && from_module_entry->is_named()) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   603
    from_module_entry->add_read(to_module_entry);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   604
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   605
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   606
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   607
// This method is called by JFR and JNI.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   608
jobject Modules::get_module(jclass clazz, TRAPS) {
42636
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   609
  assert(ModuleEntryTable::javabase_defined(),
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   610
         "Attempt to call get_module before " JAVA_BASE_NAME " is defined");
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   611
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   612
  if (clazz == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   613
    THROW_MSG_(vmSymbols::java_lang_NullPointerException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   614
               "class is null", JNI_FALSE);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   615
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   616
  oop mirror = JNIHandles::resolve_non_null(clazz);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   617
  if (mirror == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   618
    log_debug(modules)("get_module(): no mirror, returning NULL");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   619
    return NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   620
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   621
  if (!java_lang_Class::is_instance(mirror)) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   622
    THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   623
               "Invalid class", JNI_FALSE);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   624
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   625
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   626
  oop module = java_lang_Class::module(mirror);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   627
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   628
  assert(module != NULL, "java.lang.Class module field not set");
40020
20738e6bef83 8160487: JVM should validate a module by checking for an instance of java.lang.reflect.Module
lfoltan
parents: 40013
diff changeset
   629
  assert(java_lang_reflect_Module::is_instance(module), "module is not an instance of type java.lang.reflect.Module");
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   630
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   631
  if (log_is_enabled(Debug, modules)) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   632
    ResourceMark rm(THREAD);
37242
91e5f98fff6f 8152632: Rename LogHandle(...) to Log(...)
stefank
parents: 36508
diff changeset
   633
    outputStream* logst = Log(modules)::debug_stream();
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   634
    Klass* klass = java_lang_Class::as_Klass(mirror);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   635
    oop module_name = java_lang_reflect_Module::name(module);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   636
    if (module_name != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   637
      logst->print("get_module(): module ");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   638
      java_lang_String::print(module_name, tty);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   639
    } else {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   640
      logst->print("get_module(): Unamed Module");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   641
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   642
    if (klass != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   643
      logst->print_cr(" for class %s", klass->external_name());
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   644
    } else {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   645
      logst->print_cr(" for primitive class");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   646
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   647
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   648
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   649
  return JNIHandles::make_local(THREAD, module);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   650
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   651
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   652
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   653
jobject Modules::get_module_by_package_name(jobject loader, const char* package_name, TRAPS) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   654
  ResourceMark rm(THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   655
  assert(ModuleEntryTable::javabase_defined(),
42636
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   656
         "Attempt to call get_module_from_pkg before " JAVA_BASE_NAME " is defined");
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   657
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   658
  if (package_name == NULL) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   659
    THROW_MSG_(vmSymbols::java_lang_NullPointerException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   660
               "package is null", JNI_FALSE);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   661
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   662
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   663
  Handle h_loader (THREAD, JNIHandles::resolve(loader));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   664
  // Check that loader is a subclass of java.lang.ClassLoader.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   665
  if (loader != NULL && !java_lang_ClassLoader::is_subclass(h_loader->klass())) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   666
    THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   667
               "Class loader is not a subclass of java.lang.ClassLoader", JNI_FALSE);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   668
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   669
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   670
  if (strlen(package_name) == 0) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   671
    // Return the unnamed module
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   672
    ModuleEntryTable* module_table = get_module_entry_table(h_loader, CHECK_NULL);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   673
    if (NULL == module_table) return NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   674
    const ModuleEntry* const unnamed_module = module_table->unnamed_module();
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   675
    return JNIHandles::make_local(THREAD, JNIHandles::resolve(unnamed_module->module()));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   676
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   677
  } else {
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   678
    TempNewSymbol package_sym = SymbolTable::new_symbol(package_name, CHECK_NULL);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   679
    return get_module(package_sym, h_loader, CHECK_NULL);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   680
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   681
  return NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   682
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   683
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   684
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   685
jobject Modules::get_named_module(Handle h_loader, const char* package_name, TRAPS) {
39706
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   686
  assert(ModuleEntryTable::javabase_defined(),
42636
aafc434ba580 8169734: Update uses of string "java.base" to macro
rprotacio
parents: 41691
diff changeset
   687
         "Attempt to call get_named_module before " JAVA_BASE_NAME " is defined");
39706
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   688
  assert(h_loader.is_null() || java_lang_ClassLoader::is_subclass(h_loader->klass()),
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   689
         "Class loader is not a subclass of java.lang.ClassLoader");
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   690
  assert(package_name != NULL, "the package_name should not be NULL");
39706
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   691
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   692
  if (strlen(package_name) == 0) {
39706
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   693
    return NULL;
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   694
  }
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   695
  TempNewSymbol package_sym = SymbolTable::new_symbol(package_name, CHECK_NULL);
39706
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   696
  const PackageEntry* const pkg_entry =
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   697
    get_package_entry_by_name(package_sym, h_loader, THREAD);
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   698
  const ModuleEntry* const module_entry = (pkg_entry != NULL ? pkg_entry->module() : NULL);
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   699
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   700
  if (module_entry != NULL && module_entry->module() != NULL && module_entry->is_named()) {
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   701
    return JNIHandles::make_local(THREAD, JNIHandles::resolve(module_entry->module()));
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   702
  }
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   703
  return NULL;
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   704
}
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   705
8b8fd966478b 8159145: Add JVMTI function GetNamedModule
sspitsyn
parents: 39616
diff changeset
   706
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   707
// This method is called by JFR and by the above method.
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   708
jobject Modules::get_module(Symbol* package_name, Handle h_loader, TRAPS) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   709
  const PackageEntry* const pkg_entry =
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   710
    get_package_entry_by_name(package_name, h_loader, THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   711
  const ModuleEntry* const module_entry = (pkg_entry != NULL ? pkg_entry->module() : NULL);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   712
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   713
  if (module_entry != NULL &&
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   714
      module_entry->module() != NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   715
    return JNIHandles::make_local(THREAD, JNIHandles::resolve(module_entry->module()));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   716
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   717
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   718
  return NULL;
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   719
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   720
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   721
void Modules::add_module_package(jobject module, const char* package_name, TRAPS) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   722
  ResourceMark rm(THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   723
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   724
  if (module == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   725
    THROW_MSG(vmSymbols::java_lang_NullPointerException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   726
              "module is null");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   727
  }
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   728
  if (package_name == NULL) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   729
    THROW_MSG(vmSymbols::java_lang_NullPointerException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   730
              "package is null");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   731
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   732
  ModuleEntry* module_entry = get_module_entry(module, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   733
  if (module_entry == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   734
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   735
              "module is invalid");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   736
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   737
  if (!module_entry->is_named()) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   738
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   739
              "module cannot be an unnamed module");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   740
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   741
  if (!verify_package_name(package_name)) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   742
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   743
              err_msg("Invalid package name: %s", package_name));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   744
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   745
42307
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   746
  ClassLoaderData *loader_data = module_entry->loader_data();
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   747
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   748
  // Only modules defined to either the boot or platform class loader, can define a "java/" package.
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   749
  if (!loader_data->is_the_null_class_loader_data() &&
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   750
      !loader_data->is_platform_class_loader_data() &&
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   751
      strncmp(package_name, JAVAPKG, JAVAPKG_LEN) == 0) {
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   752
    const char* class_loader_name = SystemDictionary::loader_name(loader_data);
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   753
    size_t pkg_len = strlen(package_name);
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   754
    char* pkg_name = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, pkg_len);
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   755
    strncpy(pkg_name, package_name, pkg_len);
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   756
    StringUtils::replace_no_expand(pkg_name, "/", ".");
42307
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   757
    const char* msg_text1 = "Class loader (instance of): ";
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   758
    const char* msg_text2 = " tried to define prohibited package name: ";
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   759
    size_t len = strlen(msg_text1) + strlen(class_loader_name) + strlen(msg_text2) + pkg_len + 1;
42307
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   760
    char* message = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len);
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   761
    jio_snprintf(message, len, "%s%s%s%s", msg_text1, class_loader_name, msg_text2, pkg_name);
42307
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   762
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), message);
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   763
  }
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   764
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   765
  log_debug(modules)("add_module_package(): Adding package %s to module %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   766
                     package_name, module_entry->name()->as_C_string());
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   767
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   768
  TempNewSymbol pkg_symbol = SymbolTable::new_symbol(package_name, CHECK);
42307
cefc81dc1d52 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41691
diff changeset
   769
  PackageEntryTable* package_table = loader_data->packages();
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   770
  assert(package_table != NULL, "Missing package_table");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   771
43446
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   772
  PackageEntry* existing_pkg = NULL;
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   773
  {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   774
    MutexLocker ml(Module_lock, THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   775
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   776
    // Check that the package does not exist in the class loader's package table.
43446
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   777
    existing_pkg = package_table->lookup_only(pkg_symbol);
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   778
    if (existing_pkg == NULL) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   779
      PackageEntry* pkg = package_table->locked_create_entry_or_null(pkg_symbol, module_entry);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   780
      assert(pkg != NULL, "Unable to create a module's package entry");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   781
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   782
  }
43446
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   783
  if (existing_pkg != NULL) {
4f9ac7ab99d9 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents: 42656
diff changeset
   784
    throw_dup_pkg_exception(module_entry->name()->as_C_string(), existing_pkg, CHECK);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   785
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   786
}
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   787
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   788
// Export package in module to all unnamed modules.
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   789
void Modules::add_module_exports_to_all_unnamed(jobject module, const char* package_name, TRAPS) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   790
  if (module == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   791
    THROW_MSG(vmSymbols::java_lang_NullPointerException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   792
              "module is null");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   793
  }
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   794
  if (package_name == NULL) {
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   795
    THROW_MSG(vmSymbols::java_lang_NullPointerException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   796
              "package is null");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   797
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   798
  ModuleEntry* module_entry = get_module_entry(module, CHECK);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   799
  if (module_entry == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   800
    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   801
              "module is invalid");
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   802
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   803
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   804
  if (module_entry->is_named()) { // No-op for unnamed module.
43466
add500644443 8171855: Move package name transformations during module bootstrap into native code
redestad
parents: 43446
diff changeset
   805
    PackageEntry *package_entry = get_package_entry(module_entry, package_name, CHECK);
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   806
    ResourceMark rm(THREAD);
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   807
    if (package_entry == NULL) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   808
      THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   809
                err_msg("Package %s not found in module %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   810
                        package_name != NULL ? package_name : "",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   811
                        module_entry->name()->as_C_string()));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   812
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   813
    if (package_entry->module() != module_entry) {
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   814
      THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   815
                err_msg("Package: %s found in module %s, not in module: %s",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   816
                        package_entry->name()->as_C_string(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   817
                        package_entry->module()->name()->as_C_string(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   818
                        module_entry->name()->as_C_string()));
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   819
    }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   820
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   821
    log_debug(modules)("add_module_exports_to_all_unnamed(): package %s in module"
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   822
                       " %s is exported to all unnamed modules",
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   823
                       package_entry->name()->as_C_string(),
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   824
                       module_entry->name()->as_C_string());
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   825
43471
bfb383279a16 8171971: Fix timing bug in JVM management of package export lists
hseigel
parents: 43466
diff changeset
   826
    // Mark package as exported to all unnamed modules.
bfb383279a16 8171971: Fix timing bug in JVM management of package export lists
hseigel
parents: 43466
diff changeset
   827
    package_entry->set_is_exported_allUnnamed();
36508
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   828
  }
5f9eee6b383b 8142968: Module System implementation
alanb
parents:
diff changeset
   829
}