stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8198311: Avoid uses of global malloc and free

Browse Source 
Reviewed-by: kvn, kbarrett, dcubed, zgu
This commit is contained in:
Coleen Phillimore 2018-02-18 13:48:01 -05:00
parent 853ed9b9e3
commit 28f0646ef1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hotspot/share/aot/aotCodeHeap.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -194,7 +194,7 @@ void AOTLib::verify_config() {
} }
AOTLib::~AOTLib() { AOTLib::~AOTLib() {
free((void*) _name); os::free((void*) _name);
} }
AOTCodeHeap::~AOTCodeHeap() { AOTCodeHeap::~AOTCodeHeap() {
@ -207,7 +207,7 @@ AOTCodeHeap::~AOTCodeHeap() {
} }
AOTLib::AOTLib(void* handle, const char* name, int dso_id) : _valid(true), _dl_handle(handle), _dso_id(dso_id) { AOTLib::AOTLib(void* handle, const char* name, int dso_id) : _valid(true), _dl_handle(handle), _dso_id(dso_id) {
_name = (const char*) strdup(name); _name = (const char*) os::strdup(name);
// Verify that VM runs with the same parameters as AOT tool. // Verify that VM runs with the same parameters as AOT tool.
_config = (AOTConfiguration*) load_symbol("A.config"); _config = (AOTConfiguration*) load_symbol("A.config");

6
src/hotspot/share/runtime/objectMonitor.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -2328,7 +2328,7 @@ void ObjectMonitor::DeferredInitialize() {
if (SyncKnobs == NULL) SyncKnobs = ""; if (SyncKnobs == NULL) SyncKnobs = "";
size_t sz = strlen(SyncKnobs); size_t sz = strlen(SyncKnobs);
char * knobs = (char *) malloc(sz + 2); char * knobs = (char *) os::malloc(sz + 2, mtInternal);
if (knobs == NULL) { if (knobs == NULL) {
vm_exit_out_of_memory(sz + 2, OOM_MALLOC_ERROR, "Parse SyncKnobs"); vm_exit_out_of_memory(sz + 2, OOM_MALLOC_ERROR, "Parse SyncKnobs");
guarantee(0, "invariant"); guarantee(0, "invariant");
@ -2393,7 +2393,7 @@ void ObjectMonitor::DeferredInitialize() {
ObjectMonitor::_sync_FailedSpins = NULL; ObjectMonitor::_sync_FailedSpins = NULL;
} }
free(knobs); os::free(knobs);
OrderAccess::fence(); OrderAccess::fence();
InitDone = 1; InitDone = 1;
} }