From 386f242788a3d0189e6882466105c57ec1149d20 Mon Sep 17 00:00:00 2001 From: Yue Gan Date: Thu, 14 Apr 2016 08:27:41 +0000 Subject: Automated [] rollback of commit 525fa71b0d6f096e9bfb180f688a4418c4974eb4. *** Reason for rollback *** Contributor finds some bugs and after fixing some bugs there are more bugs to fix now. *** Original change description *** Mount whole directories into the sandbox when possible This halves the overhead with sandboxing enabled vs disabled for a test that basically only mounts a bunch of files out of a directory, and slows that same test with a single extra file added to the directory (but not mounted) by only ~4%. The test is with 30000 inputs moved to a subdirectory and on... *** ROLLBACK_OF=119138157 -- MOS_MIGRATED_REVID=119828267 --- src/main/tools/namespace-sandbox.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/tools') diff --git a/src/main/tools/namespace-sandbox.c b/src/main/tools/namespace-sandbox.c index a454a70ebe..04f1c9c734 100644 --- a/src/main/tools/namespace-sandbox.c +++ b/src/main/tools/namespace-sandbox.c @@ -134,10 +134,9 @@ static void Usage(int argc, char *const *argv, const char *fmt, ...) { " -t in case timeout occurs, how long to wait before killing " "the child with SIGKILL\n" " -d create an empty directory in the sandbox\n" - " -M/-m system file or directory to mount inside the " - "sandbox\n" - " Multiple files or directories can be specified and each of them " - "will be mounted readonly.\n" + " -M/-m system directory to mount inside the sandbox\n" + " Multiple directories can be specified and each of them will be " + "mounted readonly.\n" " The -M option specifies which directory to mount, the -m option " "specifies where to\n" " mount it in the sandbox.\n" -- cgit v1.2.3