From 1d6efdcbb4e6ad478fa62645e0fc4bb0589396a8 Mon Sep 17 00:00:00 2001 From: Herman Venter Date: Tue, 23 Apr 2013 15:59:18 -0700 Subject: [PATCH] Rename DebuggerProxy::send, DebuggerClient::send and DebuggerClient::recv I found myself getting confused, thinking that proxy->send(cmd) sends a command to the proxy, when in fact it causes the proxy to send the command to the client. These are now named sendToClient, sendToServer and recvFromServer so that future readers (including my future self) will not make this mistake again. --- hphp/runtime/eval/debugger/cmd/cmd_break.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_constant.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_eval.cpp | 8 ++++---- hphp/runtime/eval/debugger/cmd/cmd_example.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_extension.cpp | 4 ++-- .../runtime/eval/debugger/cmd/cmd_flow_control.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_global.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_info.cpp | 4 ++-- hphp/runtime/eval/debugger/cmd/cmd_instrument.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_interrupt.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_jump.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_list.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_machine.cpp | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_print.cpp | 4 ++-- hphp/runtime/eval/debugger/cmd/cmd_quit.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_run.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_shell.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_signal.cpp | 4 ++-- hphp/runtime/eval/debugger/cmd/cmd_thread.cpp | 12 ++++++------ hphp/runtime/eval/debugger/cmd/cmd_variable.cpp | 2 +- hphp/runtime/eval/debugger/cmd/cmd_where.cpp | 2 +- hphp/runtime/eval/debugger/debugger_client.cpp | 14 +++++++------- hphp/runtime/eval/debugger/debugger_client.h | 10 ++++++---- hphp/runtime/eval/debugger/debugger_proxy.cpp | 4 ++-- hphp/runtime/eval/debugger/debugger_proxy.h | 2 +- hphp/runtime/ext/ext_debugger.cpp | 4 ++-- 26 files changed, 53 insertions(+), 51 deletions(-) diff --git a/hphp/runtime/eval/debugger/cmd/cmd_break.cpp b/hphp/runtime/eval/debugger/cmd/cmd_break.cpp index 3d825d7be..ab41e5f3e 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_break.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_break.cpp @@ -452,7 +452,7 @@ bool CmdBreak::onServer(DebuggerProxy *proxy) { if (m_body == "update") { proxy->setBreakPoints(m_bps); m_breakpoints = &m_bps; - return proxy->send(this); + return proxy->sendToClient(this); } return false; } diff --git a/hphp/runtime/eval/debugger/cmd/cmd_constant.cpp b/hphp/runtime/eval/debugger/cmd/cmd_constant.cpp index 207bea446..ce1bcbb5b 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_constant.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_constant.cpp @@ -114,7 +114,7 @@ bool CmdConstant::onServer(DebuggerProxy *proxy) { try { m_constants = ClassInfo::GetConstants(); } catch (...) {} - return proxy->send(this); + return proxy->sendToClient(this); } /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/eval/debugger/cmd/cmd_eval.cpp b/hphp/runtime/eval/debugger/cmd/cmd_eval.cpp index 9e748a2e7..1236e1adf 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_eval.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_eval.cpp @@ -38,8 +38,8 @@ bool CmdEval::onClient(DebuggerClient *client) { m_body = client->getCode(); m_frame = client->getFrame(); m_bypassAccessCheck = client->getDebuggerBypassCheck(); - client->send(this); - DebuggerCommandPtr res = client->recv(m_type); + client->sendToServer(this); + DebuggerCommandPtr res = client->recvFromServer(m_type); if (!res->is(m_type)) { assert(client->isApiMode()); m_incomplete = true; @@ -66,7 +66,7 @@ bool CmdEval::onServer(DebuggerProxy *proxy) { g_context->setDebuggerBypassCheck(m_bypassAccessCheck); DebuggerProxy::ExecutePHP(m_body, m_output, !proxy->isLocal(), m_frame); g_context->setDebuggerBypassCheck(false); - return proxy->send(this); + return proxy->sendToClient(this); } bool CmdEval::onServerVM(DebuggerProxy *proxy) { @@ -77,7 +77,7 @@ bool CmdEval::onServerVM(DebuggerProxy *proxy) { g_vmContext->setDebuggerBypassCheck(false); delete g_vmContext->m_lastLocFilter; g_vmContext->m_lastLocFilter = locSave; - return proxy->send(this); + return proxy->sendToClient(this); } /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/eval/debugger/cmd/cmd_example.cpp b/hphp/runtime/eval/debugger/cmd/cmd_example.cpp index 1ac5b249e..cc3154fe0 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_example.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_example.cpp @@ -67,7 +67,7 @@ bool CmdExample::onClient(DebuggerClient *client) { bool CmdExample::onServer(DebuggerProxy *proxy) { m_output = m_input.size(); - return proxy->send(this); + return proxy->sendToClient(this); } /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/eval/debugger/cmd/cmd_extension.cpp b/hphp/runtime/eval/debugger/cmd/cmd_extension.cpp index 0cdbb069a..b5be0f4b5 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_extension.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_extension.cpp @@ -122,7 +122,7 @@ bool CmdExtension::processList(DebuggerProxy *proxy) { for (int i = 0; i < hrLen; i++) sb.append(BOX_H); sb.append("\n"); m_out = sb.detach(); - return proxy->send(this); + return proxy->sendToClient(this); } bool CmdExtension::onServer(DebuggerProxy *proxy) { @@ -165,7 +165,7 @@ bool CmdExtension::onServer(DebuggerProxy *proxy) { m_err = "Unable to find the specified extension: "; m_err += String(name); } - return proxy->send(this); + return proxy->sendToClient(this); } /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/eval/debugger/cmd/cmd_flow_control.cpp b/hphp/runtime/eval/debugger/cmd/cmd_flow_control.cpp index 7efbf2680..70bb72fcd 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_flow_control.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_flow_control.cpp @@ -54,7 +54,7 @@ bool CmdFlowControl::onClient(DebuggerClient *client) { } } m_smallStep = client->getDebuggerSmallStep(); - client->send(this); + client->sendToServer(this); throw DebuggerConsoleExitException(); } diff --git a/hphp/runtime/eval/debugger/cmd/cmd_global.cpp b/hphp/runtime/eval/debugger/cmd/cmd_global.cpp index 34ef06e80..a1e0b6073 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_global.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_global.cpp @@ -84,7 +84,7 @@ void CmdGlobal::setClientOutput(DebuggerClient *client) { bool CmdGlobal::onServer(DebuggerProxy *proxy) { m_globals = CmdVariable::GetGlobalVariables(); - return proxy->send(this); + return proxy->sendToClient(this); } /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/eval/debugger/cmd/cmd_info.cpp b/hphp/runtime/eval/debugger/cmd/cmd_info.cpp index d8e2d0f71..3ae3f708a 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_info.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_info.cpp @@ -227,7 +227,7 @@ bool CmdInfo::onServer(DebuggerProxy *proxy) { vars.push_back("$" + iter.first().toString()->toCPPString()); } - return proxy->send(this); + return proxy->sendToClient(this); } if (m_type == KindOfUnknown || m_type == KindOfClass) { @@ -246,7 +246,7 @@ bool CmdInfo::onServer(DebuggerProxy *proxy) { } } catch (...) {} } - return proxy->send(this); + return proxy->sendToClient(this); } /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/eval/debugger/cmd/cmd_instrument.cpp b/hphp/runtime/eval/debugger/cmd/cmd_instrument.cpp index 137e791e9..6207a8092 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_instrument.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_instrument.cpp @@ -140,7 +140,7 @@ bool CmdInstrument::onServerVM(DebuggerProxy *proxy) { } else if (m_type == ActionWrite) { validateAndWriteToTable(proxyVM); } - return proxy->send(this); + return proxy->sendToClient(this); } void CmdInstrument::readFromTable(DebuggerProxyVM *proxy) { diff --git a/hphp/runtime/eval/debugger/cmd/cmd_interrupt.cpp b/hphp/runtime/eval/debugger/cmd/cmd_interrupt.cpp index b9bb45607..8d29de4f4 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_interrupt.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_interrupt.cpp @@ -278,7 +278,7 @@ void CmdInterrupt::setClientOutput(DebuggerClient *client) { } bool CmdInterrupt::onServer(DebuggerProxy *proxy) { - return proxy->send(this); + return proxy->sendToClient(this); } bool CmdInterrupt::shouldBreak(const BreakPointInfoPtrVec &bps) { diff --git a/hphp/runtime/eval/debugger/cmd/cmd_jump.cpp b/hphp/runtime/eval/debugger/cmd/cmd_jump.cpp index dfcc2577f..c0fc2aed7 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_jump.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_jump.cpp @@ -91,7 +91,7 @@ bool CmdJump::onClient(DebuggerClient *client) { } } - client->send(this); + client->sendToServer(this); throw DebuggerConsoleExitException(); } diff --git a/hphp/runtime/eval/debugger/cmd/cmd_list.cpp b/hphp/runtime/eval/debugger/cmd/cmd_list.cpp index 50ca4529c..5c53f5772 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_list.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_list.cpp @@ -284,7 +284,7 @@ bool CmdList::onServer(DebuggerProxy *proxy) { m_code = f_file_get_contents(full_path.c_str()); } } - return proxy->send(this); + return proxy->sendToClient(this); } Variant CmdList::GetSourceFile(DebuggerClient *client, diff --git a/hphp/runtime/eval/debugger/cmd/cmd_machine.cpp b/hphp/runtime/eval/debugger/cmd/cmd_machine.cpp index 758805b80..2bd7914e0 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_machine.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_machine.cpp @@ -295,11 +295,11 @@ bool CmdMachine::onServer(DebuggerProxy *proxy) { LibEventHttpClient::SetCache(host.data(), port, 1); register_intercept("", "fb_rpc_intercept_handler", m_rpcConfig); } - return proxy->send(this); + return proxy->sendToClient(this); } if (m_body == "list") { Debugger::GetRegisteredSandboxes(m_sandboxes); - return proxy->send(this); + return proxy->sendToClient(this); } if (m_body == "attach" && !m_sandboxes.empty()) { m_succeed = proxy->switchSandbox(m_sandboxes[0]->id(), m_force); @@ -307,7 +307,7 @@ bool CmdMachine::onServer(DebuggerProxy *proxy) { proxy->notifyDummySandbox(); m_exitInterrupt = true; } - return proxy->send(this); + return proxy->sendToClient(this); } return false; } diff --git a/hphp/runtime/eval/debugger/cmd/cmd_print.cpp b/hphp/runtime/eval/debugger/cmd/cmd_print.cpp index d660e93a1..c0c1038e3 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_print.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_print.cpp @@ -370,7 +370,7 @@ bool CmdPrint::onServer(DebuggerProxy *proxy) { m_ret = DebuggerProxy::ExecutePHP(DebuggerProxy::MakePHPReturn(m_body), m_output, !proxy->isLocal(), m_frame); g_context->setDebuggerBypassCheck(false); - return proxy->send(this); + return proxy->sendToClient(this); } bool CmdPrint::onServerVM(DebuggerProxy *proxy) { @@ -385,7 +385,7 @@ bool CmdPrint::onServerVM(DebuggerProxy *proxy) { g_vmContext->setDebuggerBypassCheck(false); delete g_vmContext->m_lastLocFilter; g_vmContext->m_lastLocFilter = locSave; - return proxy->send(this); + return proxy->sendToClient(this); } /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/eval/debugger/cmd/cmd_quit.cpp b/hphp/runtime/eval/debugger/cmd/cmd_quit.cpp index 0094a2b4c..3075d0f27 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_quit.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_quit.cpp @@ -35,7 +35,7 @@ bool CmdQuit::onClient(DebuggerClient *client) { if (DebuggerCommand::onClient(client)) return true; if (client->argCount() == 0) { - client->send(this); + client->sendToServer(this); client->quit(); return true; } diff --git a/hphp/runtime/eval/debugger/cmd/cmd_run.cpp b/hphp/runtime/eval/debugger/cmd/cmd_run.cpp index 714aeb0e4..c324c67aa 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_run.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_run.cpp @@ -58,7 +58,7 @@ bool CmdRun::onClient(DebuggerClient *client) { m_args = StringVecPtr(client->args(), null_deleter()); m_smallStep = client->getDebuggerSmallStep(); - client->send(this); + client->sendToServer(this); client->clearCachedLocal(); client->setFrame(0); throw DebuggerConsoleExitException(); diff --git a/hphp/runtime/eval/debugger/cmd/cmd_shell.cpp b/hphp/runtime/eval/debugger/cmd/cmd_shell.cpp index b3ae158ed..652471788 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_shell.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_shell.cpp @@ -69,7 +69,7 @@ bool CmdShell::onServer(DebuggerProxy *proxy) { argv[m_args.size()] = nullptr; Process::Exec(argv[0], argv, nullptr, m_out, &m_out, true); free(argv); - return proxy->send(this); + return proxy->sendToClient(this); } /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/eval/debugger/cmd/cmd_signal.cpp b/hphp/runtime/eval/debugger/cmd/cmd_signal.cpp index fa663c1e3..483714913 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_signal.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_signal.cpp @@ -31,12 +31,12 @@ void CmdSignal::recvImpl(DebuggerThriftBuffer &thrift) { bool CmdSignal::onClient(DebuggerClient *client) { m_signum = client->pollSignal(); - client->send(this); + client->sendToServer(this); return true; } bool CmdSignal::onServer(DebuggerProxy *proxy) { - return proxy->send(this); + return proxy->sendToClient(this); } /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/eval/debugger/cmd/cmd_thread.cpp b/hphp/runtime/eval/debugger/cmd/cmd_thread.cpp index cf37c476d..be3a5ef63 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_thread.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_thread.cpp @@ -113,18 +113,18 @@ bool CmdThread::onClient(DebuggerClient *client) { processList(client); } else if (client->arg(1, "normal")) { m_body = "normal"; - client->send(this); + client->sendToServer(this); client->info("Thread is running in normal mode now. Other threads will " "interleave when they hit breakpoints as well."); } else if (client->arg(1, "sticky")) { m_body = "sticky"; - client->send(this); + client->sendToServer(this); client->info("Thread is running in sticky mode now. All other threads " "will wait until this thread finishes, when they hit " "breakpoints."); } else if (client->arg(1, "exclusive")) { m_body = "exclusive"; - client->send(this); + client->sendToServer(this); client->info("Thread is running in exclusive mode now. All other threads " "will not break, even when they hit breakpoints."); } else { @@ -160,7 +160,7 @@ bool CmdThread::onClient(DebuggerClient *client) { m_body = "switch"; m_threads.push_back(thread); - client->send(this); + client->sendToServer(this); throw DebuggerConsoleExitException(); } @@ -189,12 +189,12 @@ bool CmdThread::onServer(DebuggerProxy *proxy) { g_context->debuggerInfo(info); m_out = DebuggerClient::FormatInfoVec(info); - return proxy->send(this); + return proxy->sendToClient(this); } if (m_body == "list") { proxy->getThreads(m_threads); - return proxy->send(this); + return proxy->sendToClient(this); } if (m_body == "switch") { if (!m_threads.empty()) { diff --git a/hphp/runtime/eval/debugger/cmd/cmd_variable.cpp b/hphp/runtime/eval/debugger/cmd/cmd_variable.cpp index e4ede0afb..73e779c2b 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_variable.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_variable.cpp @@ -154,7 +154,7 @@ Array CmdVariable::GetGlobalVariables() { bool CmdVariable::onServerVM(DebuggerProxy *proxy) { m_variables = g_vmContext->getLocalDefinedVariables(m_frame); - return proxy->send(this); + return proxy->sendToClient(this); } /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/eval/debugger/cmd/cmd_where.cpp b/hphp/runtime/eval/debugger/cmd/cmd_where.cpp index 89dda7f4f..3d6647cf1 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_where.cpp +++ b/hphp/runtime/eval/debugger/cmd/cmd_where.cpp @@ -162,7 +162,7 @@ bool CmdWhere::onServerVM(DebuggerProxy *proxy) { if (!m_stackArgs) { processStackTrace(); } - return proxy->send(this); + return proxy->sendToClient(this); } /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/eval/debugger/debugger_client.cpp b/hphp/runtime/eval/debugger/debugger_client.cpp index 72def0cf4..32d9f6f72 100644 --- a/hphp/runtime/eval/debugger/debugger_client.cpp +++ b/hphp/runtime/eval/debugger/debugger_client.cpp @@ -1787,20 +1787,20 @@ std::string DebuggerClient::lineRest(int index) { DebuggerCommandPtr DebuggerClient::xend(DebuggerCommand *cmd) { TRACE(2, "DebuggerClient::xend\n"); - send(cmd); - return recv(cmd->getType()); + sendToServer(cmd); + return recvFromServer(cmd->getType()); } -void DebuggerClient::send(DebuggerCommand *cmd) { - TRACE(2, "DebuggerClient::send\n"); +void DebuggerClient::sendToServer(DebuggerCommand *cmd) { + TRACE(2, "DebuggerClient::sendToServer\n"); if (!cmd->send(m_machine->m_thrift)) { throw DebuggerProtocolException(); } } -DebuggerCommandPtr DebuggerClient::recv(int expected) { - TRACE(2, "DebuggerClient::recv\n"); - const char *func = "DebuggerClient::recv()"; +DebuggerCommandPtr DebuggerClient::recvFromServer(int expected) { + TRACE(2, "DebuggerClient::recvFromServer\n"); + const char *func = "DebuggerClient::recvFromServer ()"; DebuggerCommandPtr res; while (true) { diff --git a/hphp/runtime/eval/debugger/debugger_client.h b/hphp/runtime/eval/debugger/debugger_client.h index ad630ab7f..e886fc242 100644 --- a/hphp/runtime/eval/debugger/debugger_client.h +++ b/hphp/runtime/eval/debugger/debugger_client.h @@ -109,7 +109,7 @@ public: static String FormatTitle(const char *title); public: - DebuggerClient(std::string name = ""); // name only for api usage + explicit DebuggerClient(std::string name = ""); // name only for api usage ~DebuggerClient(); void reset(); @@ -184,13 +184,15 @@ public: StringVec *args() { return &m_args;} /** - * Send the commmand to DebuggerProxy and expect same type of command back. + * Send the commmand to server's DebuggerProxy + * and expect same type of command back. */ template boost::shared_ptr xend(DebuggerCommand *cmd) { return boost::static_pointer_cast(xend(cmd)); } - void send(DebuggerCommand *cmd); - DebuggerCommandPtr recv(int expected); + + void sendToServer(DebuggerCommand *cmd); + DebuggerCommandPtr recvFromServer(int expected); /** * Machine functions. True if we're switching to a machine that's not diff --git a/hphp/runtime/eval/debugger/debugger_proxy.cpp b/hphp/runtime/eval/debugger/debugger_proxy.cpp index 29379518e..5aeaa61d1 100644 --- a/hphp/runtime/eval/debugger/debugger_proxy.cpp +++ b/hphp/runtime/eval/debugger/debugger_proxy.cpp @@ -277,8 +277,8 @@ void DebuggerProxy::interrupt(CmdInterrupt &cmd) { } } -bool DebuggerProxy::send(DebuggerCommand *cmd) { - TRACE(2, "DebuggerProxy::send\n"); +bool DebuggerProxy::sendToClient(DebuggerCommand *cmd) { + TRACE(2, "DebuggerProxy::sendToClient\n"); return cmd->send(m_thrift); } diff --git a/hphp/runtime/eval/debugger/debugger_proxy.h b/hphp/runtime/eval/debugger/debugger_proxy.h index 41a7845f2..e70c31d5f 100644 --- a/hphp/runtime/eval/debugger/debugger_proxy.h +++ b/hphp/runtime/eval/debugger/debugger_proxy.h @@ -92,7 +92,7 @@ public: bool needInterrupt(); bool needInterruptForNonBreak(); virtual void interrupt(CmdInterrupt &cmd); - bool send(DebuggerCommand *cmd); + bool sendToClient(DebuggerCommand *cmd); void startSignalThread(); void pollSignal(); // for signal polling thread diff --git a/hphp/runtime/ext/ext_debugger.cpp b/hphp/runtime/ext/ext_debugger.cpp index eb93b32dd..95f359286 100644 --- a/hphp/runtime/ext/ext_debugger.cpp +++ b/hphp/runtime/ext/ext_debugger.cpp @@ -172,7 +172,7 @@ bool c_DebuggerProxyCmdUser::t_islocal() { Variant c_DebuggerProxyCmdUser::t_send(CObjRef cmd) { CmdUser cmdUser(cmd); - return m_proxy->send(&cmdUser); + return m_proxy->sendToClient(&cmdUser); } /////////////////////////////////////////////////////////////////////////////// @@ -307,7 +307,7 @@ Array c_DebuggerClientCmdUser::t_args() { Variant c_DebuggerClientCmdUser::t_send(CObjRef cmd) { CmdUser cmdUser(cmd); - m_client->send(&cmdUser); + m_client->sendToServer(&cmdUser); return true; }