diff options
Diffstat (limited to 'src/messageparser.cc')
| -rw-r--r-- | src/messageparser.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/messageparser.cc b/src/messageparser.cc index 75593f9..82477b7 100644 --- a/src/messageparser.cc +++ b/src/messageparser.cc @@ -26,7 +26,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ #include "messageparser.h" -#include "taskmanager.h" +#include "nodemanager.h" #include <stdlib.h> #include <stdio.h> @@ -130,7 +130,7 @@ inline static void parse_into_msg_tokens(std::string& data, } -static taskid_t getId(std::map<std::string, taskid_t> &sym, std::string token) +static nodeid_t getId(std::map<std::string, nodeid_t> &sym, std::string token) { bool isnumeric = true; for(size_t i = 0; i < token.size(); i++) @@ -142,14 +142,14 @@ static taskid_t getId(std::map<std::string, taskid_t> &sym, std::string token) if(isnumeric) { - taskid_t id = atoi(token.c_str()); + nodeid_t id = atoi(token.c_str()); DEBUG(getid, "======= id: %d\n", id); return id; } if(sym.find(token) == sym.end()) { - sym[token] = task_manager.createId(); + sym[token] = node_manager.createId(); } return sym[token]; @@ -165,7 +165,7 @@ inline static void create_msg_list(MsgTokensList& msgTokensList, origin = 1; } - std::map<std::string, taskid_t> sym; + std::map<std::string, nodeid_t> sym; MsgTokensList::iterator it_msg; for(it_msg = msgTokensList.begin(); it_msg != msgTokensList.end(); it_msg++) @@ -364,7 +364,7 @@ std::string msg_tostring(message_t m) return r; } -message_t create_msg_create(task_t t) +message_t create_msg_create(node_t t) { message_t m; m.cmd = cmd::create; @@ -373,7 +373,7 @@ message_t create_msg_create(task_t t) return m; } -message_t create_msg_update(task_t t, const std::string &attr) +message_t create_msg_update(node_t t, const std::string &attr) { message_t m; m.cmd = cmd::update; @@ -383,7 +383,7 @@ message_t create_msg_update(task_t t, const std::string &attr) return m; } -message_t create_msg_remove(task_t t) +message_t create_msg_remove(node_t t) { message_t m; m.cmd = cmd::remove; @@ -391,7 +391,7 @@ message_t create_msg_remove(task_t t) return m; } -message_t create_msg_move(taskid_t id, taskid_t to) +message_t create_msg_move(nodeid_t id, nodeid_t to) { message_t m; m.cmd = cmd::move; |