Herman Venter
a8b31881f6
The variable command, along with its clients the global command and the = command, obtained variable names and values from the server by asking for an map of variable name to variable values in a single request. If one or more of these variables have really large values, the serialization of the map exceeds the serialization limit and the entire command fails. This makes it difficult pin-point which variable causes the trouble and breaks the client commands in unexpected ways. This diff changes the protocol of the variable command so that it first gets an array of variable names only and then separately gets the value of each variable. If such a separate get fails because of a serialization limit, the variable's value is printed as "...omitted". Reviewed By: @mikemag Differential Revision: D1021035
88 linhas
3.0 KiB
C++
88 linhas
3.0 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| HipHop for PHP |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 2010-2013 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 "hphp/runtime/debugger/cmd/cmd_global.h"
|
|
#include "hphp/runtime/debugger/cmd/cmd_variable.h"
|
|
#include "hphp/runtime/base/hphp-system.h"
|
|
|
|
namespace HPHP { namespace Eval {
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
TRACE_SET_MOD(debugger);
|
|
|
|
void CmdGlobal::sendImpl(DebuggerThriftBuffer &thrift) {
|
|
DebuggerCommand::sendImpl(thrift);
|
|
thrift.write(m_globals);
|
|
}
|
|
|
|
void CmdGlobal::recvImpl(DebuggerThriftBuffer &thrift) {
|
|
DebuggerCommand::recvImpl(thrift);
|
|
thrift.read(m_globals);
|
|
if (m_version == 1) m_version = 2;
|
|
}
|
|
|
|
void CmdGlobal::help(DebuggerClient &client) {
|
|
client.helpTitle("Global Command");
|
|
client.helpCmds(
|
|
"[g]lobal", "lists all global variables",
|
|
"[g]lobal {text}", "full-text search global variables",
|
|
nullptr
|
|
);
|
|
client.helpBody(
|
|
"This will print names and values of all global variables, if {text} is "
|
|
"not speified. Otherwise, it will print global variables that contain the "
|
|
"text in their names or values. The search is case-insensitive and "
|
|
"string-based."
|
|
);
|
|
}
|
|
|
|
void CmdGlobal::onClient(DebuggerClient &client) {
|
|
if (DebuggerCommand::displayedHelp(client)) return;
|
|
|
|
String text;
|
|
if (client.argCount() == 1) {
|
|
text = client.argValue(1);
|
|
} else if (client.argCount() != 0) {
|
|
help(client);
|
|
return;
|
|
}
|
|
|
|
CmdGlobalPtr cmd = client.xend<CmdGlobal>(this);
|
|
if (cmd->m_globals.empty()) {
|
|
client.info("(no global variable was found)");
|
|
} else {
|
|
CmdVariable::PrintVariables(client, cmd->m_globals, -1,
|
|
text, cmd->m_version);
|
|
}
|
|
}
|
|
|
|
bool CmdGlobal::onServer(DebuggerProxy &proxy) {
|
|
m_globals = CmdVariable::GetGlobalVariables();
|
|
if (m_version == 2) {
|
|
// Remove the values before sending to client.
|
|
ArrayInit ret(m_globals->size());
|
|
Variant v;
|
|
for (ArrayIter iter(m_globals); iter; ++iter) {
|
|
ret.add(iter.first().toString(), v);
|
|
}
|
|
m_globals = ret.toArray();
|
|
}
|
|
return proxy.sendToClient(this);
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
}}
|