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 05:15:14 UTC
svn commit: r1131522 - in /incubator/mesos/trunk: include/nexus_types.hpp
src/Makefile.in src/nexus_exec.cpp src/nexus_sched.cpp
Author: benh
Date: Sun Jun 5 03:15:14 2011
New Revision: 1131522
URL: http://svn.apache.org/viewvc?rev=1131522&view=rev
Log:
SlaveID and slave_id should now always be strings
Modified:
incubator/mesos/trunk/include/nexus_types.hpp
incubator/mesos/trunk/src/Makefile.in
incubator/mesos/trunk/src/nexus_exec.cpp
incubator/mesos/trunk/src/nexus_sched.cpp
Modified: incubator/mesos/trunk/include/nexus_types.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/include/nexus_types.hpp?rev=1131522&r1=1131521&r2=1131522&view=diff
==============================================================================
--- incubator/mesos/trunk/include/nexus_types.hpp (original)
+++ incubator/mesos/trunk/include/nexus_types.hpp Sun Jun 5 03:15:14 2011
@@ -14,11 +14,6 @@ typedef std::string SlaveID; //
typedef offer_id OfferID; // Unique within master
typedef task_state TaskState;
-slave_id slaveID_CPP2C(SlaveID sid);
-SlaveID slaveID_C2CPP(slave_id sid);
-
}
-
-
#endif /* __NEXUS_TYPES_HPP__ */
Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1131522&r1=1131521&r2=1131522&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Sun Jun 5 03:15:14 2011
@@ -88,7 +88,7 @@ NEXUS_LIBS = $(SCHED_LIB) $(EXEC_LIB) $(
MASTER_OBJ = master.o allocator_factory.o simple_allocator.o
SLAVE_OBJ = slave.o launcher.o isolation_module_factory.o \
process_based_isolation_module.o
-COMMON_OBJ = fatal.o hash_pid.o messages.o getleader.o nexus_types.o
+COMMON_OBJ = fatal.o hash_pid.o messages.o getleader.o
EXEC_LIB_OBJ = nexus_exec.o
SCHED_LIB_OBJ = nexus_sched.o nexus_local.o params.o
TEST_OBJ = tests/main.o tests/test_master.o tests/test_resources.o
Modified: incubator/mesos/trunk/src/nexus_exec.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/nexus_exec.cpp?rev=1131522&r1=1131521&r2=1131522&view=diff
==============================================================================
--- incubator/mesos/trunk/src/nexus_exec.cpp (original)
+++ incubator/mesos/trunk/src/nexus_exec.cpp Sun Jun 5 03:15:14 2011
@@ -264,7 +264,7 @@ public:
virtual void init(const ExecutorArgs& args)
{
exec->init(exec,
- slaveID_CPP2C(args.slaveId),
+ args.slaveId.c_str(),
args.frameworkId,
args.frameworkName.c_str(),
args.data.data(),
@@ -277,7 +277,7 @@ public:
Params paramsObj(task.params);
string paramsStr = paramsObj.str();
nexus_task_desc td = { task.taskId,
- slaveID_CPP2C(task.slaveId),
+ task.slaveId.c_str(),
task.name.c_str(),
paramsStr.c_str(),
task.arg.data(),
@@ -292,7 +292,7 @@ public:
virtual void frameworkMessage(const FrameworkMessage& message)
{
- nexus_framework_message msg = { slaveID_CPP2C(message.slaveId),
+ nexus_framework_message msg = { message.slaveId.c_str(),
message.taskId,
message.data.data(),
message.data.size() };
@@ -348,7 +348,7 @@ int nexus_exec_send_message(struct nexus
}
string data((char*) msg->data, msg->data_len);
- FrameworkMessage message(slaveID_C2CPP(msg->sid), msg->tid, data);
+ FrameworkMessage message(string(msg->sid), msg->tid, data);
_executor->sendFrameworkMessage(message);
Modified: incubator/mesos/trunk/src/nexus_sched.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/nexus_sched.cpp?rev=1131522&r1=1131521&r2=1131522&view=diff
==============================================================================
--- incubator/mesos/trunk/src/nexus_sched.cpp (original)
+++ incubator/mesos/trunk/src/nexus_sched.cpp Sun Jun 5 03:15:14 2011
@@ -504,7 +504,7 @@ public:
// Create C offer structs
nexus_slot* c_offers = new nexus_slot[offers.size()];
for (size_t i = 0; i < offers.size(); i++) {
- nexus_slot offer = { slaveID_CPP2C(offers[i].slaveId),
+ nexus_slot offer = { offers[i].slaveId.c_str(),
offers[i].host.c_str(),
paramStrs[i].c_str() };
c_offers[i] = offer;
@@ -530,7 +530,7 @@ public:
virtual void frameworkMessage(SchedulerDriver*, FrameworkMessage &message)
{
- nexus_framework_message c_message = { slaveID_CPP2C(message.slaveId),
+ nexus_framework_message c_message = { message.slaveId.c_str(),
message.taskId,
message.data.data(),
message.data.size() };
@@ -539,7 +539,7 @@ public:
virtual void slaveLost(SchedulerDriver*, SlaveID sid)
{
- sched->slave_lost(sched, slaveID_CPP2C(sid));
+ sched->slave_lost(sched, sid.c_str());
}
virtual void error(SchedulerDriver*, int code, const std::string &message)
@@ -686,7 +686,7 @@ int nexus_sched_send_message(struct nexu
return -1;
}
- FrameworkMessage message(slaveID_C2CPP(msg->sid), msg->tid,
+ FrameworkMessage message(string(msg->sid), msg->tid,
string((char*) msg->data, msg->data_len));
CScheduler* csi = lookup(sched);
@@ -750,7 +750,7 @@ int nexus_sched_reply_to_offer(struct ne
string taskArg((char*) tasks[i].arg, tasks[i].arg_len);
wrapped_tasks[i] = TaskDescription(tasks[i].tid,
- slaveID_C2CPP(tasks[i].sid),
+ string(tasks[i].sid),
string(tasks[i].name),
params,
taskArg);