mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Try reading multiple times from IPC.
This commit is contained in:
parent
d2c79bf8e9
commit
4305ecb0e7
@ -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,23 @@ 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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user