Mercurial > hg > truffle

comparison src/os/linux/vm/perfMemory_linux.cpp @ 17765:91dc38ae09f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8033464: Linux code cleanup 8033931: Several nightly tests failing with assert(imin < imax) failed: Unexpected page size Summary: cleaned up warnings in linux specific os code. Reviewed-by: dcubed, hseigel, coleenp, dsamersoff Contributed-by: gerald.thornbrugh@oracle.com
author dcubed
date Mon, 24 Mar 2014 13:36:32 -0700
parents 1f4355cee9a2
children 4ca6dc0799b6 78bbf4d43a14
comparison
equal deleted inserted replaced
17763:6e7e363c5a8f 17765:91dc38ae09f3
1 /* 1 /*
2 * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
889 if (luser != user) FREE_C_HEAP_ARRAY(char, luser, mtInternal); 889 if (luser != user) FREE_C_HEAP_ARRAY(char, luser, mtInternal);
890 FREE_C_HEAP_ARRAY(char, dirname, mtInternal); 890 FREE_C_HEAP_ARRAY(char, dirname, mtInternal);
891 FREE_C_HEAP_ARRAY(char, filename, mtInternal); 891 FREE_C_HEAP_ARRAY(char, filename, mtInternal);
892 892
893 // open the shared memory file for the give vmid 893 // open the shared memory file for the give vmid
894 fd = open_sharedmem_file(rfilename, file_flags, CHECK); 894 fd = open_sharedmem_file(rfilename, file_flags, THREAD);
895 assert(fd != OS_ERR, "unexpected value"); 895
896 if (fd == OS_ERR) {
897 return;
898 }
899
900 if (HAS_PENDING_EXCEPTION) {
901 ::close(fd);
902 return;
903 }
896 904
897 if (*sizep == 0) { 905 if (*sizep == 0) {
898 size = sharedmem_filesize(fd, CHECK); 906 size = sharedmem_filesize(fd, CHECK);
899 } else { 907 } else {
900 size = *sizep; 908 size = *sizep;