1.1 --- a/src/os/bsd/vm/perfMemory_bsd.cpp Thu Jun 13 11:16:38 2013 -0700
1.2 +++ b/src/os/bsd/vm/perfMemory_bsd.cpp Fri Jun 14 07:46:22 2013 -0700
1.3 @@ -120,7 +120,7 @@
1.4 addr += result;
1.5 }
1.6
1.7 - RESTARTABLE(::close(fd), result);
1.8 + result = ::close(fd);
1.9 if (PrintMiscellaneous && Verbose) {
1.10 if (result == OS_ERR) {
1.11 warning("Could not close %s: %s\n", destfile, strerror(errno));
1.12 @@ -632,7 +632,7 @@
1.13 if (PrintMiscellaneous && Verbose) {
1.14 warning("could not set shared memory file size: %s\n", strerror(errno));
1.15 }
1.16 - RESTARTABLE(::close(fd), result);
1.17 + ::close(fd);
1.18 return -1;
1.19 }
1.20
1.21 @@ -656,7 +656,7 @@
1.22 if (result != -1) {
1.23 return fd;
1.24 } else {
1.25 - RESTARTABLE(::close(fd), result);
1.26 + ::close(fd);
1.27 return -1;
1.28 }
1.29 }
1.30 @@ -734,9 +734,7 @@
1.31
1.32 mapAddress = (char*)::mmap((char*)0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
1.33
1.34 - // attempt to close the file - restart it if it was interrupted,
1.35 - // but ignore other failures
1.36 - RESTARTABLE(::close(fd), result);
1.37 + result = ::close(fd);
1.38 assert(result != OS_ERR, "could not close file");
1.39
1.40 if (mapAddress == MAP_FAILED) {
1.41 @@ -909,7 +907,7 @@
1.42
1.43 // attempt to close the file - restart if it gets interrupted,
1.44 // but ignore other failures
1.45 - RESTARTABLE(::close(fd), result);
1.46 + result = ::close(fd);
1.47 assert(result != OS_ERR, "could not close file");
1.48
1.49 if (mapAddress == MAP_FAILED) {
