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

Merge

Browse Source
This commit is contained in:
Daniel D. Daugherty 2016-07-15 18:09:33 +00:00
commit 9c028ad227
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hotspot/src/os/solaris/vm/os_solaris.cpp
View File

@ -79,7 +79,6 @@
# include <link.h> # include <link.h>
# include <poll.h> # include <poll.h>
# include <pthread.h> # include <pthread.h>
# include <pwd.h>
# include <schedctl.h> # include <schedctl.h>
# include <setjmp.h> # include <setjmp.h>
# include <signal.h> # include <signal.h>

24
hotspot/src/os/solaris/vm/perfMemory_solaris.cpp
View File

@ -34,16 +34,18 @@
#include "utilities/exceptions.hpp" #include "utilities/exceptions.hpp"
// put OS-includes here // put OS-includes here
# include <sys/types.h> #include <sys/types.h>
# include <sys/mman.h> #include <sys/mman.h>
# include <errno.h> #include <errno.h>
# include <stdio.h> #include <stdio.h>
# include <unistd.h> #include <unistd.h>
# include <sys/stat.h> #include <sys/stat.h>
# include <signal.h> #include <signal.h>
# include <pwd.h> #include <procfs.h>
# include <procfs.h>
/* For POSIX-compliant getpwuid_r on Solaris */
#define _POSIX_PTHREAD_SEMANTICS
#include <pwd.h>
static char* backing_store_file_name = NULL; // name of the backing store static char* backing_store_file_name = NULL; // name of the backing store
// file, if successfully created. // file, if successfully created.
@ -453,12 +455,8 @@ static char* get_user_name(uid_t uid) {
char* pwbuf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal); char* pwbuf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
#ifdef _GNU_SOURCE
struct passwd* p = NULL; struct passwd* p = NULL;
int result = getpwuid_r(uid, &pwent, pwbuf, (size_t)bufsize, &p); int result = getpwuid_r(uid, &pwent, pwbuf, (size_t)bufsize, &p);
#else // _GNU_SOURCE
struct passwd* p = getpwuid_r(uid, &pwent, pwbuf, (int)bufsize);
#endif // _GNU_SOURCE
if (p == NULL || p->pw_name == NULL || *(p->pw_name) == '\0') { if (p == NULL || p->pw_name == NULL || *(p->pw_name) == '\0') {
if (PrintMiscellaneous && Verbose) { if (PrintMiscellaneous && Verbose) {

1
hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp
View File

@ -74,7 +74,6 @@
# include <sys/systeminfo.h> # include <sys/systeminfo.h>
# include <sys/socket.h> # include <sys/socket.h>
# include <sys/lwp.h> # include <sys/lwp.h>
# include <pwd.h>
# include <poll.h> # include <poll.h>
# include <sys/lwp.h> # include <sys/lwp.h>

1
hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp
View File

@ -74,7 +74,6 @@
# include <sys/socket.h> # include <sys/socket.h>
# include <sys/trap.h> # include <sys/trap.h>
# include <sys/lwp.h> # include <sys/lwp.h>
# include <pwd.h>
# include <poll.h> # include <poll.h>
# include <sys/lwp.h> # include <sys/lwp.h>
# include <procfs.h> // see comment in <sys/procfs.h> # include <procfs.h> // see comment in <sys/procfs.h>