Herman Venter
6afb27bf50
Set the stopped flag for the debugger proxy when it receives a quit command, so that the proxy exits a bit quicker and cleaner. Add a timeout to the cleanup quite of test_debugger, so that it does not hang when a test goes wrong. Add some more tracing.
76 linhas
2.7 KiB
C++
76 linhas
2.7 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| HipHop for PHP |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 2010- Facebook, Inc. (http://www.facebook.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#include <runtime/eval/debugger/cmd/cmd_run.h>
|
|
|
|
namespace HPHP { namespace Eval {
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
TRACE_SET_MOD(debugger);
|
|
|
|
void CmdRun::sendImpl(DebuggerThriftBuffer &thrift) {
|
|
DebuggerCommand::sendImpl(thrift);
|
|
thrift.write(*m_args);
|
|
}
|
|
|
|
void CmdRun::recvImpl(DebuggerThriftBuffer &thrift) {
|
|
DebuggerCommand::recvImpl(thrift);
|
|
m_args = StringVecPtr(new StringVec());
|
|
thrift.read(*m_args);
|
|
}
|
|
|
|
void CmdRun::list(DebuggerClient *client) {
|
|
client->addCompletion(DebuggerClient::AutoCompleteFileNames);
|
|
}
|
|
|
|
bool CmdRun::help(DebuggerClient *client) {
|
|
client->helpTitle("Run Command");
|
|
client->helpCmds(
|
|
"[r]un", "restarts program",
|
|
"[r]un {file} {arg1} {arg2} ...", "starts a new program",
|
|
nullptr
|
|
);
|
|
client->helpBody(
|
|
"Aborts current execution and restarts program with specified arguments. "
|
|
"If no arguments are specified, it will reuse the PHP file and old "
|
|
"arguments. If arguments are to be changed, please include file name, "
|
|
"even if it is the same, as the first one.\n"
|
|
"\n"
|
|
"In server mode, this command will simply abort current page handling "
|
|
"without restarting anything."
|
|
);
|
|
return true;
|
|
}
|
|
|
|
bool CmdRun::onClient(DebuggerClient *client) {
|
|
if (DebuggerCommand::onClient(client)) return true;
|
|
|
|
m_args = StringVecPtr(client->args(), null_deleter());
|
|
m_smallStep = client->getDebuggerSmallStep();
|
|
client->sendToServer(this);
|
|
client->clearCachedLocal();
|
|
client->setFrame(0);
|
|
throw DebuggerConsoleExitException();
|
|
}
|
|
|
|
bool CmdRun::onServer(DebuggerProxy *proxy) {
|
|
g_context->setDebuggerSmallStep(m_smallStep);
|
|
throw DebuggerRestartException(m_args);
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
}}
|