Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/os/linux/vm/os_linux.cpp	Tue Mar 18 19:07:22 2014 +0100
     1.2 +++ b/src/os/linux/vm/os_linux.cpp	Mon Mar 24 14:20:49 2014 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -3014,7 +3014,9 @@
    1.11  
    1.12    unsigned char vec[1];
    1.13    unsigned imin = 1, imax = pages + 1, imid;
    1.14 -  int mincore_return_value;
    1.15 +  int mincore_return_value = 0;
    1.16 +
    1.17 +  assert(imin <= imax, "Unexpected page size");
    1.18  
    1.19    while (imin < imax) {
    1.20      imid = (imax + imin) / 2;

     2.1 --- a/src/os/linux/vm/perfMemory_linux.cpp	Tue Mar 18 19:07:22 2014 +0100
     2.2 +++ b/src/os/linux/vm/perfMemory_linux.cpp	Mon Mar 24 14:20:49 2014 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -891,8 +891,16 @@
    2.11    FREE_C_HEAP_ARRAY(char, filename, mtInternal);
    2.12  
    2.13    // open the shared memory file for the give vmid
    2.14 -  fd = open_sharedmem_file(rfilename, file_flags, CHECK);
    2.15 -  assert(fd != OS_ERR, "unexpected value");
    2.16 +  fd = open_sharedmem_file(rfilename, file_flags, THREAD);
    2.17 +
    2.18 +  if (fd == OS_ERR) {
    2.19 +    return;
    2.20 +  }
    2.21 +
    2.22 +  if (HAS_PENDING_EXCEPTION) {
    2.23 +    ::close(fd);
    2.24 +    return;
    2.25 +  }
    2.26  
    2.27    if (*sizep == 0) {
    2.28      size = sharedmem_filesize(fd, CHECK);