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

8035952: Remove use of JVM_Open, JVM_Read and JVM_Close functions from serviceability code

Browse Source 
Reviewed-by: chegar, mchung, alanb, sla
This commit is contained in:
Frederic Parain 2014-03-05 10:52:33 +00:00
parent 8a385b110f
commit ee1b7412a0
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jdk/src/solaris/native/sun/management/OperatingSystemImpl.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, 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
@ -196,7 +196,7 @@ Java_sun_management_OperatingSystemImpl_getCommittedVirtualMemorySize0
char* addr; char* addr;
int fd; int fd;
fd = JVM_Open("/proc/self/psinfo", O_RDONLY, 0); fd = open64("/proc/self/psinfo", O_RDONLY, 0);
if (fd < 0) { if (fd < 0) {
throw_internal_error(env, "Unable to open /proc/self/psinfo"); throw_internal_error(env, "Unable to open /proc/self/psinfo");
return -1; return -1;
@ -204,17 +204,20 @@ Java_sun_management_OperatingSystemImpl_getCommittedVirtualMemorySize0
addr = (char *)&psinfo; addr = (char *)&psinfo;
for (remaining = sizeof(psinfo_t); remaining > 0;) { for (remaining = sizeof(psinfo_t); remaining > 0;) {
result = JVM_Read(fd, addr, remaining); result = read(fd, addr, remaining);
if (result < 0) { if (result < 0) {
JVM_Close(fd); if (errno != EINTR) {
throw_internal_error(env, "Unable to read /proc/self/psinfo"); close(fd);
return -1; throw_internal_error(env, "Unable to read /proc/self/psinfo");
return -1;
}
} else {
remaining -= result;
addr += result;
} }
remaining -= result;
addr += result;
} }
JVM_Close(fd); close(fd);
return (jlong) psinfo.pr_size * 1024; return (jlong) psinfo.pr_size * 1024;
#elif defined(__linux__) #elif defined(__linux__)
FILE *fp; FILE *fp;