sunos: fix EMFILE on process.memoryUsage()

nodejs · Mar 22, 2012 · d125591 · d125591
1 parent ea44d30
commit d125591
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 13 deletions.
diff --git 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
@@ -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);