You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 07:29:58 UTC
svn commit: r1131790 - in /incubator/mesos/trunk/src: gc.cpp launcher.hpp
local.cpp lxc_isolation_module.cpp
Author: benh
Date: Sun Jun 5 05:29:58 2011
New Revision: 1131790
URL: http://svn.apache.org/viewvc?rev=1131790&view=rev
Log:
Replace tabs with spaces.
Modified:
incubator/mesos/trunk/src/gc.cpp
incubator/mesos/trunk/src/launcher.hpp
incubator/mesos/trunk/src/local.cpp
incubator/mesos/trunk/src/lxc_isolation_module.cpp
Modified: incubator/mesos/trunk/src/gc.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/gc.cpp?rev=1131790&r1=1131789&r2=1131790&view=diff
==============================================================================
--- incubator/mesos/trunk/src/gc.cpp (original)
+++ incubator/mesos/trunk/src/gc.cpp Sun Jun 5 05:29:58 2011
@@ -29,10 +29,10 @@ protected:
while(true) {
switch(receive()) {
case CLEANUP: {
-// SchedulerProcess *process;
+// SchedulerProcess *process;
// unpack<CLEANUP>(process);
// wait(process);
-// delete process;
+// delete process;
break;
}
}
Modified: incubator/mesos/trunk/src/launcher.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/launcher.hpp?rev=1131790&r1=1131789&r2=1131790&view=diff
==============================================================================
--- incubator/mesos/trunk/src/launcher.hpp (original)
+++ incubator/mesos/trunk/src/launcher.hpp Sun Jun 5 05:29:58 2011
@@ -37,8 +37,8 @@ protected:
public:
ExecutorLauncher(FrameworkID _frameworkId, const string& _executorUri,
- const string& _user, const string& _workDirectory,
- const string& _slavePid, bool _redirectIO,
+ const string& _user, const string& _workDirectory,
+ const string& _slavePid, bool _redirectIO,
const string_map& _params);
virtual ~ExecutorLauncher();
Modified: incubator/mesos/trunk/src/local.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/local.cpp?rev=1131790&r1=1131789&r2=1131790&view=diff
==============================================================================
--- incubator/mesos/trunk/src/local.cpp (original)
+++ incubator/mesos/trunk/src/local.cpp Sun Jun 5 05:29:58 2011
@@ -14,7 +14,7 @@ int main (int argc, char **argv)
{
if (argc == 2 && string("--help") == argv[1]) {
cerr << "Usage: " << argv[0]
- << " [--port PORT] [--slaves NUM] [--cpus NUM] [--mem NUM] [--quiet]"
+ << " [--port PORT] [--slaves NUM] [--cpus NUM] [--mem NUM] [--quiet]"
<< endl;
exit(1);
}
@@ -37,16 +37,16 @@ int main (int argc, char **argv)
while ((opt = getopt_long(argc, argv, "s:c:m:p:q", options, &index)) != -1) {
switch (opt) {
case 's':
- slaves = atoi(optarg);
+ slaves = atoi(optarg);
break;
case 'c':
- cpus = atoi(optarg);
+ cpus = atoi(optarg);
break;
case 'm':
- mem = atoll(optarg);
+ mem = atoll(optarg);
break;
case 'p':
- setenv("LIBPROCESS_PORT", optarg, true);
+ setenv("LIBPROCESS_PORT", optarg, true);
break;
case 'q':
quiet = true;
Modified: incubator/mesos/trunk/src/lxc_isolation_module.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/lxc_isolation_module.cpp?rev=1131790&r1=1131789&r2=1131790&view=diff
==============================================================================
--- incubator/mesos/trunk/src/lxc_isolation_module.cpp (original)
+++ incubator/mesos/trunk/src/lxc_isolation_module.cpp Sun Jun 5 05:29:58 2011
@@ -195,16 +195,16 @@ void LxcIsolationModule::Reaper::operato
pid_t pid;
int status;
if ((pid = waitpid((pid_t) -1, &status, WNOHANG)) > 0) {
- foreachpair (FrameworkID fid, pid_t& fwPid, module->lxcExecutePid) {
- if (fwPid == pid) {
- module->container[fid] = "";
- module->lxcExecutePid[fid] = -1;
- LOG(INFO) << "Telling slave of lost framework " << fid;
- // TODO(benh): This is broken if/when libprocess is parallel!
- module->slave->executorExited(fid, status);
- break;
- }
- }
+ foreachpair (FrameworkID fid, pid_t& fwPid, module->lxcExecutePid) {
+ if (fwPid == pid) {
+ module->container[fid] = "";
+ module->lxcExecutePid[fid] = -1;
+ LOG(INFO) << "Telling slave of lost framework " << fid;
+ // TODO(benh): This is broken if/when libprocess is parallel!
+ module->slave->executorExited(fid, status);
+ break;
+ }
+ }
}
break;
}