diff options
author | Bryan Cantrill <bryan@joyent.com> | 2012-03-23 03:06:35 +0400 |
---|---|---|
committer | isaacs <i@izs.me> | 2012-03-23 03:18:11 +0400 |
commit | d1255914df46ac367d289614464cc249c3a4bb6c (patch) | |
tree | 9450376e84aba3063b306351f3580a794d079c32 | |
parent | ea44d3031d101b42b427e2b33355e27ec616e731 (diff) |
sunos: fix EMFILE on process.memoryUsage()
-rw-r--r-- | src/platform_sunos.cc | 21 | ||||
-rw-r--r-- | test/simple/test-memory-usage-emfile.js | 37 |
2 files changed, 45 insertions, 13 deletions
diff --git a/src/platform_sunos.cc b/src/platform_sunos.cc index 949e4e13f92..f71154f08d6 100644 --- a/src/platform_sunos.cc +++ b/src/platform_sunos.cc @@ -36,6 +36,7 @@ #include <net/if.h> #include <netinet/in.h> #include <arpa/inet.h> +#include <fcntl.h> #ifdef SUNOS_HAVE_IFADDRS # include <ifaddrs.h> @@ -80,25 +81,19 @@ const char* Platform::GetProcessTitle(int *len) { int Platform::GetMemory(size_t *rss) { - pid_t pid = getpid(); - - char pidpath[1024]; - sprintf(pidpath, "/proc/%d/psinfo", pid); - psinfo_t psinfo; - FILE *f = fopen(pidpath, "r"); - if (!f) return -1; + int fd; - if (fread(&psinfo, sizeof(psinfo_t), 1, f) != 1) { - fclose (f); + if ((fd = open("/proc/self/psinfo", O_RDONLY)) < 0) return -1; - } - /* XXX correct? */ + if (read(fd, &psinfo, sizeof (psinfo_t)) != sizeof (psinfo_t)) { + (void) close(fd); + return -1; + } *rss = (size_t) psinfo.pr_rssize * 1024; - - fclose (f); + (void) close(fd); return 0; } diff --git a/test/simple/test-memory-usage-emfile.js b/test/simple/test-memory-usage-emfile.js new file mode 100644 index 00000000000..aaed8995309 --- /dev/null +++ b/test/simple/test-memory-usage-emfile.js @@ -0,0 +1,37 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + + + + +var common = require('../common'); +var assert = require('assert'); + +var fs = require('fs'); + +var files = []; + +while (files.length < 256) + files.push(fs.openSync(__filename, 'r')); + +var r = process.memoryUsage(); +console.log(common.inspect(r)); +assert.equal(true, r['rss'] > 0); |