Author: [email protected]
Date: Tue Mar 31 05:45:33 2009
New Revision: 1650
Added:
branches/bleeding_edge/test/mjsunit/d8-os.js
Modified:
branches/bleeding_edge/src/d8-posix.cc
branches/bleeding_edge/src/d8-windows.cc
branches/bleeding_edge/src/d8.cc
branches/bleeding_edge/src/d8.h
Log:
* Add rmdir, mkdir -p and umask to d8 on Unix.
* Remove the non-working methods from the os object on d8 on Windows
so you can test for their presence with if (os.system).
* Add a test (not run by default since it only works on d8).
* Fix incorrect use of wait that left defunct processes (zombies).
Review URL: http://codereview.chromium.org/56107
Modified: branches/bleeding_edge/src/d8-posix.cc
==============================================================================
--- branches/bleeding_edge/src/d8-posix.cc (original)
+++ branches/bleeding_edge/src/d8-posix.cc Tue Mar 31 05:45:33 2009
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include <errno.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/time.h>
#include <time.h>
#include <unistd.h>
@@ -162,7 +163,7 @@
class ZombieProtector {
public:
explicit ZombieProtector(int pid): pid_(pid) { }
- ~ZombieProtector() { if (pid_ != 0) waitpid(pid_, NULL, WNOHANG); }
+ ~ZombieProtector() { if (pid_ != 0) waitpid(pid_, NULL, 0); }
void ChildIsDeadNow() { pid_ = 0; }
private:
int pid_;
@@ -394,7 +395,6 @@
return false;
}
}
- child_waiter.ChildIsDeadNow();
if (child_info.si_code == CLD_KILLED) {
char message[999];
snprintf(message,
@@ -417,7 +417,6 @@
#else // No waitid call.
int child_status;
- printf("waitpid");
waitpid(pid, &child_status, 0); // We hang here if the child doesn't
exit.
child_waiter.ChildIsDeadNow();
if (WIFSIGNALED(child_status)) {
@@ -538,6 +537,103 @@
}
+Handle<Value> Shell::SetUMask(const Arguments& args) {
+ if (args.Length() != 1) {
+ const char* message = "umask() takes one argument";
+ return ThrowException(String::New(message));
+ }
+ if (args[0]->IsNumber()) {
+ mode_t mask = args[0]->Int32Value();
+ int previous = umask(mask);
+ return Number::New(previous);
+ } else {
+ const char* message = "umask() argument must be numeric";
+ return ThrowException(String::New(message));
+ }
+}
+
+
+static bool CheckItsADirectory(char* directory) {
+ struct stat stat_buf;
+ int stat_result = stat(directory, &stat_buf);
+ if (stat_result != 0) {
+ ThrowException(String::New(strerror(errno)));
+ return false;
+ }
+ if ((stat_buf.st_mode & S_IFDIR) != 0) return true;
+ ThrowException(String::New(strerror(EEXIST)));
+ return false;
+}
+
+
+// Returns true for success. Creates intermediate directories as needed.
No
+// error if the directory exists already.
+static bool mkdirp(char* directory, mode_t mask) {
+ int result = mkdir(directory, mask);
+ if (result == 0) return true;
+ if (errno == EEXIST) {
+ return CheckItsADirectory(directory);
+ } else if (errno == ENOENT) { // Intermediate path element is missing.
+ char* last_slash = strrchr(directory, '/');
+ if (last_slash == NULL) {
+ ThrowException(String::New(strerror(errno)));
+ return false;
+ }
+ *last_slash = 0;
+ if (!mkdirp(directory, mask)) return false;
+ *last_slash = '/';
+ result = mkdir(directory, mask);
+ if (result == 0) return true;
+ if (errno == EEXIST) {
+ return CheckItsADirectory(directory);
+ }
+ ThrowException(String::New(strerror(errno)));
+ return false;
+ } else {
+ ThrowException(String::New(strerror(errno)));
+ return false;
+ }
+}
+
+
+Handle<Value> Shell::MakeDirectory(const Arguments& args) {
+ mode_t mask = 0777;
+ if (args.Length() == 2) {
+ if (args[1]->IsNumber()) {
+ mask = args[1]->Int32Value();
+ } else {
+ const char* message = "mkdirp() second argument must be numeric";
+ return ThrowException(String::New(message));
+ }
+ } else if (args.Length() != 1) {
+ const char* message = "mkdirp() takes one or two arguments";
+ return ThrowException(String::New(message));
+ }
+ String::Utf8Value directory(args[0]);
+ if (*directory == NULL) {
+ const char* message = "os.mkdirp(): String conversion of argument
failed.";
+ return ThrowException(String::New(message));
+ }
+ mkdirp(*directory, mask);
+ return v8::Undefined();
+}
+
+
+Handle<Value> Shell::RemoveDirectory(const Arguments& args) {
+ if (args.Length() != 1) {
+ const char* message = "rmdir() takes one or two arguments";
+ return ThrowException(String::New(message));
+ }
+ String::Utf8Value directory(args[0]);
+ if (*directory == NULL) {
+ const char* message = "os.rmdir(): String conversion of argument
failed.";
+ return ThrowException(String::New(message));
+ }
+ rmdir(*directory);
+ return v8::Undefined();
+}
+
+
Handle<Value> Shell::SetEnvironment(const Arguments& args) {
if (args.Length() != 2) {
const char* message = "setenv() takes two arguments";
@@ -559,5 +655,14 @@
return v8::Undefined();
}
+
+void Shell::AddOSMethods(Handle<ObjectTemplate> os_templ) {
+ os_templ->Set(String::New("system"), FunctionTemplate::New(System));
+ os_templ->Set(String::New("chdir"),
FunctionTemplate::New(ChangeDirectory));
+ os_templ->Set(String::New("setenv"),
FunctionTemplate::New(SetEnvironment));
+ os_templ->Set(String::New("umask"), FunctionTemplate::New(SetUMask));
+ os_templ->Set(String::New("mkdirp"),
FunctionTemplate::New(MakeDirectory));
+ os_templ->Set(String::New("rmdir"),
FunctionTemplate::New(RemoveDirectory));
+}
} // namespace v8
Modified: branches/bleeding_edge/src/d8-windows.cc
==============================================================================
--- branches/bleeding_edge/src/d8-windows.cc (original)
+++ branches/bleeding_edge/src/d8-windows.cc Tue Mar 31 05:45:33 2009
@@ -35,24 +35,7 @@
namespace v8 {
-Handle<Value> Shell::System(const Arguments& args) {
- Handle<String> error_message =
- String::New("system() is not yet supported on your OS");
- return ThrowException(error_message);
-}
-
-
-Handle<Value> Shell::ChangeDirectory(const Arguments& args) {
- Handle<String> error_message =
- String::New("chdir() is not yet supported on your OS");
- return ThrowException(error_message);
-}
-
-
-Handle<Value> Shell::SetEnvironment(const Arguments& args) {
- Handle<String> error_message =
- String::New("setenv() is not yet supported on your OS");
- return ThrowException(error_message);
+void Shell::AddOSMethods(Handle<ObjectTemplate> os_templ) {
}
Modified: branches/bleeding_edge/src/d8.cc
==============================================================================
--- branches/bleeding_edge/src/d8.cc (original)
+++ branches/bleeding_edge/src/d8.cc Tue Mar 31 05:45:33 2009
@@ -344,9 +344,7 @@
global_template->Set(String::New("version"),
FunctionTemplate::New(Version));
Handle<ObjectTemplate> os_templ = ObjectTemplate::New();
- os_templ->Set(String::New("system"), FunctionTemplate::New(System));
- os_templ->Set(String::New("chdir"),
FunctionTemplate::New(ChangeDirectory));
- os_templ->Set(String::New("setenv"),
FunctionTemplate::New(SetEnvironment));
+ AddOSMethods(os_templ);
global_template->Set(String::New("os"), os_templ);
utility_context_ = Context::New(NULL, global_template);
Modified: branches/bleeding_edge/src/d8.h
==============================================================================
--- branches/bleeding_edge/src/d8.h (original)
+++ branches/bleeding_edge/src/d8.h Tue Mar 31 05:45:33 2009
@@ -149,10 +149,22 @@
//
// os.setenv(variable, value) sets an environment variable. Repeated
calls to
// this method leak memory due to the API of setenv in the standard C
library.
+ //
+ // os.umask(alue) calls the umask system call and returns the old umask.
+ //
+ // os.mkdirp(name, mask) creates a directory. The mask (if present) is
anded
+ // with the current umask. Intermediate directories are created if
necessary.
+ // An exception is not thrown if the directory already exists.
Analogous to
+ // the "mkdir -p" command.
static Handle<Value> OSObject(const Arguments& args);
static Handle<Value> System(const Arguments& args);
static Handle<Value> ChangeDirectory(const Arguments& args);
static Handle<Value> SetEnvironment(const Arguments& args);
+ static Handle<Value> SetUMask(const Arguments& args);
+ static Handle<Value> MakeDirectory(const Arguments& args);
+ static Handle<Value> RemoveDirectory(const Arguments& args);
+
+ static void AddOSMethods(Handle<ObjectTemplate> os_template);
static Handle<Context> utility_context() { return utility_context_; }
Added: branches/bleeding_edge/test/mjsunit/d8-os.js
==============================================================================
--- (empty file)
+++ branches/bleeding_edge/test/mjsunit/d8-os.js Tue Mar 31 05:45:33 2009
@@ -0,0 +1,180 @@
+// Copyright 2009 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Test the OS module of d8. This test only makes sense with d8. It
+// only does non-trivial work on Unix since os.system() is not currently
+// implemented on Windows, and even if it were then many of the things
+// we are calling would not be available.
+
+function arg_error(str) {
+ try {
+ eval(str);
+ } catch (e) {
+ assertTrue(/rgument/.test(e), str);
+ }
+}
+
+
+function str_error(str) {
+ var e = new Object();
+ e.toString = function() { throw new Error("foo bar"); }
+ try {
+ eval(str);
+ } catch (exception) {
+ assertTrue(/tring conversion/.test(exception), str);
+ }
+}
+
+
+if (this.os && os.system) {
+ try {
+ // Delete the dir if it is lying around from last time.
+ os.system("ls", ["d8-os-test-directory"]);
+ os.system("rm", ["-r", "d8-os-test-directory"]);
+ } catch (e) {
+ }
+ os.mkdirp("d8-os-test-directory");
+ os.chdir("d8-os-test-directory");
+ // Check the chdir worked.
+ os.system('ls', ['../d8-os-test-directory']);
+ // Simple create dir.
+ os.mkdirp("dir");
+ // Create dir in dir.
+ os.mkdirp("dir/foo");
+ // Check that they are there.
+ os.system('ls', ['dir/foo']);
+ // Check that we can detect when something is not there.
+ assertThrows("os.system('ls', ['dir/bar']);", "dir not there");
+ // Check that mkdirp makes intermediate directories.
+ os.mkdirp("dir2/foo");
+ os.system("ls", ["dir2/foo"]);
+ // Check that mkdirp doesn't mind if the dir is already there.
+ os.mkdirp("dir2/foo");
+ os.mkdirp("dir2/foo/");
+ // Check that mkdirp can cope with trailing /
+ os.mkdirp("dir3/");
+ os.system("ls", ["dir3"]);
+ // Check that we get an error if the name is taken by a file.
+ os.system("sh", ["-c", "echo foo > file1"]);
+ os.system("ls", ["file1"]);
+ assertThrows("os.mkdirp('file1');", "mkdir over file1");
+ assertThrows("os.mkdirp('file1/foo');", "mkdir over file2");
+ assertThrows("os.mkdirp('file1/');", "mkdir over file3");
+ assertThrows("os.mkdirp('file1/foo/');", "mkdir over file4");
+ // Create a dir we cannot read.
+ os.mkdirp("dir4", 0);
+ // This test fails if you are root since root can read any dir.
+ assertThrows("os.chdir('dir4');", "chdir dir4 I");
+ os.rmdir("dir4");
+ assertThrows("os.chdir('dir4');", "chdir dir4 II");
+ // Set umask.
+ var old_umask = os.umask(0777);
+ // Create a dir we cannot read.
+ os.mkdirp("dir5");
+ // This test fails if you are root since root can read any dir.
+ assertThrows("os.chdir('dir5');", "cd dir5 I");
+ os.rmdir("dir5");
+ assertThrows("os.chdir('dir5');", "chdir dir5 II");
+ os.umask(old_umask);
+
+ os.mkdirp("hest/fisk/../fisk/ged");
+ os.system("ls", ["hest/fisk/ged"]);
+
+ os.setenv("FOO", "bar");
+ var environment = os.system("printenv");
+ assertTrue(/FOO=bar/.test(environment));
+
+ // Check we time out.
+ var have_sleep = true;
+ var have_echo = true;
+ try {
+ os.system("ls", ["/bin/sleep"]);
+ } catch (e) {
+ have_sleep = false;
+ }
+ try {
+ os.system("ls", ["/bin/echo"]);
+ } catch (e) {
+ have_echo = false;
+ }
+ if (have_sleep) {
+ assertThrows("os.system('sleep', ['2000'], 200);", "sleep 1");
+
+ // Check we time out with total time.
+ assertThrows("os.system('sleep', ['2000'], -1, 200);", "sleep 2");
+
+ // Check that -1 means no timeout.
+ os.system('sleep', ['1'], -1, -1);
+
+ }
+
+ // Check that we don't fill up the process table with zombies.
+ // Disabled because it's too slow.
+ if (have_echo) {
+ //for (var i = 0; i < 65536; i++) {
+ assertEquals("baz\n", os.system("echo", ["baz"]));
+ //}
+ }
+
+ os.chdir("..");
+ os.system("rm", ["-r", "d8-os-test-directory"]);
+
+ // Too few args.
+ arg_error("os.umask();");
+ arg_error("os.system();");
+ arg_error("os.mkdirp();");
+ arg_error("os.chdir();");
+ arg_error("os.setenv();");
+ arg_error("os.rmdir();");
+
+ // Too many args.
+ arg_error("os.setenv('FOO=bar');");
+ arg_error("os.umask(0, 0);");
+ arg_error("os.system('ls', [], -1, -1, -1);");
+ arg_error("os.mkdirp('foo', 0, 0)");
+ arg_error("os.chdir('foo', 'bar')");
+ arg_error("os.rmdir('foo', 'bar');");
+
+ // Wrong kind of args.
+ arg_error("os.umask([]);");
+ arg_error("os.system('ls', 'foo');");
+ arg_error("os.system('ls', 123);");
+ arg_error("os.system('ls', [], 'foo');");
+ arg_error("os.system('ls', [], -1, 'foo');");
+ arg_error("os.mkdirp('foo', 'bar');");
+
+ // Test broken toString().
+ str_error("os.system(e);");
+ str_error("os.system('ls', [e]);");
+ str_error("os.system('ls', ['.', e]);");
+ str_error("os.system('ls', [e, '.']);");
+ str_error("os.mkdirp(e);");
+ str_error("os.setenv(e, 'goo');");
+ str_error("os.setenv('goo', e);");
+ str_error("os.chdir(e);");
+ str_error("os.rmdir(e);");
+}
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
