cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1725 from ethereum/ipcreadloop

Browse Source 
Try reading multiple times from IPC.
This commit is contained in:
chriseth 2017-03-03 10:44:48 +01:00 committed by GitHub
commit 6bfd894f46
2 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
test/RPCSession.cpp
View File

@ -16,19 +16,20 @@
The Implementation originally from https://msdn.microsoft.com/en-us/library/windows/desktop/aa365592(v=vs.85).aspx
*/
/** @file RPCSession.cpp
* @author Dimtiry Khokhlov <dimitry@ethdev.com>
* @author Alex Beregszaszi
* @date 2016
*/
/// @file RPCSession.cpp
/// Low-level IPC communication between the test framework and the Ethereum node.
#include "RPCSession.h"
#include <libdevcore/CommonData.h>
#include <json/reader.h>
#include <json/writer.h>
#include <string>
#include <stdio.h>
#include <thread>
#include <libdevcore/CommonData.h>
#include <json/reader.h>
#include <json/writer.h>
#include "RPCSession.h"
#include <chrono>
using namespace std;
using namespace dev;
@ -107,13 +108,24 @@ string IPCSocket::sendRequest(string const& _req)
return string(m_readBuf, m_readBuf + cbRead);
#else
if (send(m_socket, _req.c_str(), _req.length(), 0) != (ssize_t)_req.length())
BOOST_FAIL("Writing on IPC failed");
BOOST_FAIL("Writing on IPC failed.");
ssize_t ret = recv(m_socket, m_readBuf, sizeof(m_readBuf), 0);
auto start = chrono::steady_clock::now();
ssize_t ret;
do
{
ret = recv(m_socket, m_readBuf, sizeof(m_readBuf), 0);
// Also consider closed socket an error.
if (ret < 0)
BOOST_FAIL("Reading on IPC failed.");
}
while (
ret == 0 &&
chrono::duration_cast<chrono::milliseconds>(chrono::steady_clock::now() - start).count() < m_readTimeOutMS
);
// Also consider closed socket an error.
if (ret <= 0)
BOOST_FAIL("Reading on IPC failed");
if (ret == 0)
BOOST_FAIL("Timeout reading on IPC.");
return string(m_readBuf, m_readBuf + ret);
#endif
@ -186,12 +198,17 @@ string RPCSession::eth_getStorageRoot(string const& _address, string const& _blo
void RPCSession::personal_unlockAccount(string const& _address, string const& _password, int _duration)
{
BOOST_REQUIRE(rpcCall("personal_unlockAccount", { quote(_address), quote(_password), to_string(_duration) }) == true);
BOOST_REQUIRE_MESSAGE(
rpcCall("personal_unlockAccount", { quote(_address), quote(_password), to_string(_duration) }),
"Error unlocking account " + _address
);
}
string RPCSession::personal_newAccount(string const& _password)
{
return rpcCall("personal_newAccount", { quote(_password) }).asString();
string addr = rpcCall("personal_newAccount", { quote(_password) }).asString();
BOOST_MESSAGE("Created account " + addr);
return addr;
}
void RPCSession::test_setChainParams(vector<string> const& _accounts)

10
test/RPCSession.h
View File

@ -28,11 +28,13 @@
#include <sys/un.h>
#endif
#include <json/value.h>
#include <boost/test/unit_test.hpp>
#include <string>
#include <stdio.h>
#include <map>
#include <json/value.h>
#include <boost/test/unit_test.hpp>
#if defined(_WIN32)
class IPCSocket : public boost::noncopyable
@ -60,8 +62,12 @@ public:
std::string const& path() const { return m_path; }
private:
std::string m_path;
int m_socket;
/// Socket read timeout in milliseconds. Needs to be large because the key generation routine
/// might take long.
unsigned static constexpr m_readTimeOutMS = 15000;
char m_readBuf[512000];
};
#endif