Merge branch 'master' of https://github.com/andrastantos/cray-sim
This commit is contained in:
@@ -243,7 +243,7 @@ void Console_c::AcceptHandler(const boost::system::error_code& aError) {
|
||||
SendOptionString(TelnetCodes_e::WONT, TelnetOptions_e::LINEMODE, true);
|
||||
// SendOptionString(TelnetCodes_e::DO, TelnetOptions_e::SGA, true);
|
||||
SendFromQueue();
|
||||
mIoService.poll();
|
||||
// mIoService.poll();
|
||||
}
|
||||
catch (boost::system::system_error &) {
|
||||
CloseSocket();
|
||||
@@ -399,25 +399,17 @@ void Console_c::ReadHandler(const boost::system::error_code& aError) {
|
||||
|
||||
|
||||
void Console_c::WriteHandler(const boost::system::error_code& aError) {
|
||||
const BitRange_s TypeRange(56, 63);
|
||||
const BitRange_s FlagsRange(48, 55);
|
||||
const BitRange_s RequestRange(40, 47);
|
||||
const BitRange_s ResponseRange(32, 39);
|
||||
const BitRange_s CharCountRange(23, 31); // character count
|
||||
const BitRange_s DevRange(16, 22); // device identification
|
||||
const BitRange_s SeqRange(8, 15); // sequence number of this packet
|
||||
const BitRange_s AckRange(0, 7); // seq. number of last packet received
|
||||
|
||||
// std::cout << "w" << std::flush;
|
||||
if (aError) {
|
||||
CloseSocket();
|
||||
return;
|
||||
}
|
||||
CRAY_ASSERT(!mTransmitQueue.empty());
|
||||
bool DoNotify = mTransmitQueue.front().mDoNotify;
|
||||
mTransmitQueue.pop();
|
||||
SendFromQueue();
|
||||
if (DoNotify) SendHandlerDetail();
|
||||
if (!mTransmitQueue.empty()) {
|
||||
bool DoNotify = mTransmitQueue.front().mDoNotify;
|
||||
mTransmitQueue.pop();
|
||||
SendFromQueue();
|
||||
if (DoNotify) SendHandlerDetail();
|
||||
}
|
||||
}
|
||||
|
||||
void Console_c::AcceptIfNeeded(bool aSilent) {
|
||||
|
||||
Reference in New Issue
Block a user