diff options
| author | Alexey Ushakov <alexey.v.ushakov@gmail.com> | 2020-01-20 12:26:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-20 12:26:37 +0300 |
| commit | 63388d7cef8a6b2d2fd1c64ee4e612e514e21409 (patch) | |
| tree | 40924405498e32d269acb4295c9625efb5f471cc /src/share/vm/services/memBaseline.cpp | |
| parent | 9db779113bfae4bb0853a5d13c6114133ada6683 (diff) | |
| parent | 19256756bcd043698ee64bd800f3da39ddbef3a7 (diff) | |
| download | jdk8u_hotspot-63388d7cef8a6b2d2fd1c64ee4e612e514e21409.tar.gz | |
Merge pull request #6 from bell-sw/update_8u242jb8u242-b1644.3jb8u242-b1644jb8u242-b1641jb8u242-b1640jb8u232-b1644.2jetbrains-master-mirror
jdk8u242 update
Diffstat (limited to 'src/share/vm/services/memBaseline.cpp')
| -rw-r--r-- | src/share/vm/services/memBaseline.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/share/vm/services/memBaseline.cpp b/src/share/vm/services/memBaseline.cpp index f580aada2..1856749a7 100644 --- a/src/share/vm/services/memBaseline.cpp +++ b/src/share/vm/services/memBaseline.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -63,7 +63,7 @@ int compare_malloc_site(const MallocSite& s1, const MallocSite& s2) { int compare_malloc_site_and_type(const MallocSite& s1, const MallocSite& s2) { int res = compare_malloc_site(s1, s2); if (res == 0) { - res = (int)(s1.flags() - s2.flags()); + res = (int)(s1.flag() - s2.flag()); } return res; @@ -209,7 +209,7 @@ bool MemBaseline::aggregate_virtual_memory_allocation_sites() { const ReservedMemoryRegion* rgn; VirtualMemoryAllocationSite* site; while ((rgn = itr.next()) != NULL) { - VirtualMemoryAllocationSite tmp(*rgn->call_stack()); + VirtualMemoryAllocationSite tmp(*rgn->call_stack(), rgn->flag()); site = allocation_sites.find(tmp); if (site == NULL) { LinkedListNode<VirtualMemoryAllocationSite>* node = |